diff options
Diffstat (limited to 'sci-libs')
220 files changed, 3779 insertions, 6472 deletions
diff --git a/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild b/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild index 0a02ea5ce21e..73905610fde2 100644 --- a/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild +++ b/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-any-r1 CommitId=c07e3a0400713d546e0dea2d5466dd22ea389c73 @@ -13,6 +13,8 @@ HOMEPAGE="https://github.com/Maratyszcza/NNPACK/" SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64" @@ -32,16 +34,14 @@ BDEPEND=" ${PYTHON_DEPS} test? ( dev-cpp/gtest ) $(python_gen_any_dep ' - dev-python/PeachPy[${PYTHON_USEDEP}] + dev-python/peachpy[${PYTHON_USEDEP}] ') " -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) python_check_deps() { - python_has_version "dev-python/PeachPy[${PYTHON_USEDEP}]" + python_has_version "dev-python/peachpy[${PYTHON_USEDEP}]" } src_prepare() { diff --git a/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild b/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild index 3f4751f7b98e..6cf32190a7b0 100644 --- a/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild +++ b/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,6 +11,8 @@ HOMEPAGE="https://github.com/google/XNNPACK/" SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -29,8 +31,6 @@ BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( static-libs )" -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild b/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild index c30a840eaf57..5fdc3ebf2dd9 100644 --- a/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild +++ b/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,6 +11,8 @@ HOMEPAGE="https://github.com/google/XNNPACK/" SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -29,8 +31,6 @@ BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( static-libs )" -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( "${FILESDIR}"/${PN}-2022.02.17-gentoo.patch ) diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild index d2cd69a71f36..6a835776f837 100644 --- a/sci-libs/amd/amd-2.4.6-r1.ebuild +++ b/sci-libs/amd/amd-2.4.6-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="doc fortran" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest index 5f4bfd4d93d3..af9a44e3a35f 100644 --- a/sci-libs/avogadrolibs/Manifest +++ b/sci-libs/avogadrolibs/Manifest @@ -1,6 +1,4 @@ -DIST avogadrolibs-1.95.1.tar.gz 11015910 BLAKE2B 27cb43a22e489c0279e1ed912b1e81f3c850983f367ffb89bef3a63d11204cbf761f2bce6501988ed5ef9b21b44cc5194dad4367da3ae6af65efd0cec5e7d711 SHA512 b4734c732b1686eba74055c4834fef2f9fb66d4a67cd1199c84e81965c3f6e783911e7c7c8d09386c4ff9f1322bab91fe490d3606784ae49acf5531a65a58beb DIST avogadrolibs-1.97.0.tar.gz 11456702 BLAKE2B 2f9229a0525dc151ef636c4c101ea21d3713efb033f6a007c43689bfd078b07081d695bb3ec32715c3ccf9d67e7bb85a617a08eeb0e6fc8c80e479a3cb3f1553 SHA512 a0ad3ba294db5f0fff35087ff0f616fdcaefc7b4abfa470c9fd26326ad14f73e3584c18a7111b671998d8a23a50091307520f01f79295fc7ea52ae2d78716c7e DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B 0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223 SHA512 c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650 DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B 70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218 SHA512 06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2 -DIST linux64-genXrdPattern-avogadrolibs-1.95.1 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 DIST linux64-genXrdPattern-avogadrolibs-1.97.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild deleted file mode 100644 index 330bb74633f7..000000000000 --- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries" -HOMEPAGE="https://www.openchemistry.org/ https://github.com/OpenChemistry/avogadrolibs" -SRC_URI=" - https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/OpenChemistry/molecules/archive/refs/tags/1.0.0.tar.gz -> ${PN}-molecules-1.0.0.tar.gz - https://github.com/OpenChemistry/crystals/archive/refs/tags/1.0.1.tar.gz -> ${PN}-crystals-1.0.1.tar.gz - vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern -> linux64-genXrdPattern-${P} )" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="archive doc hdf5 qt5 test vtk" -RESTRICT="!test? ( test )" -REQUIRED_USE="vtk? ( qt5 )" - -# TODO: Not yet packaged: -# sci-libs/libmsym (https://github.com/mcodev31/libmsym) -RDEPEND=" - >=sci-chemistry/molequeue-0.7 - archive? ( app-arch/libarchive:= ) - hdf5? ( sci-libs/hdf5:= ) - qt5? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/glew:0= - virtual/opengl - ) - vtk? ( sci-libs/vtk[qt5,views] )" -DEPEND="${RDEPEND} - dev-cpp/eigen:3 - test? ( dev-cpp/gtest )" -BDEPEND=" - doc? ( app-text/doxygen ) - qt5? ( dev-qt/linguist-tools:5 )" - -PATCHES=( - "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch - "${FILESDIR}/"${PN}-1.95.1-tests.patch - "${FILESDIR}/"${PN}-1.95.1-usability_backport.patch -) - -src_unpack() { - default - - if use vtk; then - cp "${DISTDIR}"/linux64-genXrdPattern-${P} "${WORKDIR}/genXrdPattern" || die - fi - - # hardcoded assumptions in - # avogadro/qtplugins/insertfragment/CMakeLists.txt - mv crystals-1.0.1 crystals || die - mv molecules-1.0.0 molecules || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_LIBARCHIVE=$(usex archive) - -DBUILD_DOCUMENTATION=$(usex doc) - -DUSE_HDF5=$(usex hdf5) - -DENABLE_TRANSLATIONS=$(usex qt5) - -DUSE_OPENGL=$(usex qt5) - -DUSE_QT=$(usex qt5) - -DENABLE_TESTING=$(usex test) - -DUSE_VTK=$(usex vtk) - # disabled libraries - -DUSE_PYTHON=OFF - -DUSE_PROTOCALL=OFF - -DUSE_MMTF=OFF - -DUSE_LIBMSYM=OFF - # find_package(Spglib) completely broken - -DUSE_SPGLIB=OFF - ) - use qt5 && mycmakeargs+=( - -DBUILD_GPL_PLUGINS=ON - -DBUILD_STATIC_PLUGINS=ON - -DOpenGL_GL_PREFERENCE=GLVND - ) - use vtk && mycmakeargs+=( - -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern" - ) - - cmake_src_configure -} diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch deleted file mode 100644 index 07a32023600e..000000000000 --- a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 56c67fff7dd7ec84b2f2b5c2e5beaec13981e408 Mon Sep 17 00:00:00 2001 -From: Aritz Erkiaga <aerkiaga3@gmail.com> -Date: Sat, 3 Sep 2022 16:54:55 +0200 -Subject: [PATCH 1/3] Fix erratic editing behavior - -Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com> ---- - avogadro/qtgui/rwmolecule_undo.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/avogadro/qtgui/rwmolecule_undo.h b/avogadro/qtgui/rwmolecule_undo.h -index de5bdd33..20768066 100644 ---- a/avogadro/qtgui/rwmolecule_undo.h -+++ b/avogadro/qtgui/rwmolecule_undo.h -@@ -89,7 +89,7 @@ public: - { - assert(m_molecule.atomCount() == m_atomId); - if (m_usingPositions) -- m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomId); -+ m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomUid); - else - m_molecule.addAtom(m_atomicNumber, m_atomUid); - m_molecule.layer().addAtom(m_layer, m_atomId); --- -2.34.1 - - -From 5159ea1a9629ad82130670767cc25c5065f9627c Mon Sep 17 00:00:00 2001 -From: Aritz Erkiaga <aerkiaga3@gmail.com> -Date: Sat, 3 Sep 2022 16:55:26 +0200 -Subject: [PATCH 2/3] Fix Manipulator Tool not working at all - -Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com> ---- - avogadro/qtplugins/manipulator/manipulator.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/avogadro/qtplugins/manipulator/manipulator.cpp b/avogadro/qtplugins/manipulator/manipulator.cpp -index 19dc51ac..29559dd0 100644 ---- a/avogadro/qtplugins/manipulator/manipulator.cpp -+++ b/avogadro/qtplugins/manipulator/manipulator.cpp -@@ -129,7 +129,7 @@ QUndoCommand* Manipulator::mouseMoveEvent(QMouseEvent* e) - Vector2f windowPos(e->localPos().x(), e->localPos().y()); - - if (mol->isSelectionEmpty() && m_object.type == Rendering::AtomType && -- m_object.molecule == mol) { -+ m_object.molecule == &m_molecule->molecule()) { - // translate single atom position - RWAtom atom = m_molecule->atom(m_object.index); - Vector3f oldPos(atom.position3d().cast<float>()); --- -2.34.1 - - -From f38bfbc88f0722a66ab298ff26073874b5f73634 Mon Sep 17 00:00:00 2001 -From: Aritz Erkiaga <aerkiaga3@gmail.com> -Date: Sat, 3 Sep 2022 16:55:59 +0200 -Subject: [PATCH 3/3] Fix Bond Centric Tool not working at all - -Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com> ---- - avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp -index 79112899..3a853057 100644 ---- a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp -+++ b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp -@@ -342,8 +342,7 @@ QUndoCommand* BondCentricTool::mousePressEvent(QMouseEvent* e) - Rendering::Identifier ident = m_renderer->hit(e->pos().x(), e->pos().y()); - - // If no hits, return. Also ensure that the hit molecule is the one we expect. -- const Core::Molecule* mol = &m_molecule->molecule(); -- if (!ident.isValid() || ident.molecule != mol) -+ if (!ident.isValid() || ident.molecule != &m_molecule->molecule()) - return nullptr; - - // If the hit is a left click on a bond, make it the selected bond and map --- -2.34.1 - diff --git a/sci-libs/bliss/bliss-0.77-r1.ebuild b/sci-libs/bliss/bliss-0.77-r1.ebuild index af5467295b07..19c3cb3354c7 100644 --- a/sci-libs/bliss/bliss-0.77-r1.ebuild +++ b/sci-libs/bliss/bliss-0.77-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://users.aalto.fi/~tjunttil/bliss/index.html" LICENSE="LGPL-3" SLOT="0/1" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="gmp" RDEPEND="gmp? ( dev-libs/gmp:0= )" diff --git a/sci-libs/branca/branca-0.7.0-r2.ebuild b/sci-libs/branca/branca-0.7.0-r2.ebuild index 530dc31506f2..7536daf7d341 100644 --- a/sci-libs/branca/branca-0.7.0-r2.ebuild +++ b/sci-libs/branca/branca-0.7.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} inherit distutils-r1 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) -RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +RDEPEND="dev-python/jinja2[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="dev-python/setuptools-scm test? ( diff --git a/sci-libs/branca/branca-0.7.1.ebuild b/sci-libs/branca/branca-0.7.1.ebuild index 530dc31506f2..7536daf7d341 100644 --- a/sci-libs/branca/branca-0.7.1.ebuild +++ b/sci-libs/branca/branca-0.7.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} inherit distutils-r1 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) -RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +RDEPEND="dev-python/jinja2[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="dev-python/setuptools-scm test? ( diff --git a/sci-libs/branca/branca-0.7.2.ebuild b/sci-libs/branca/branca-0.7.2.ebuild index 6fbc4495a341..e85a29c30f31 100644 --- a/sci-libs/branca/branca-0.7.2.ebuild +++ b/sci-libs/branca/branca-0.7.2.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) -RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +RDEPEND="dev-python/jinja2[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="dev-python/setuptools-scm test? ( diff --git a/sci-libs/branca/branca-0.8.0.ebuild b/sci-libs/branca/branca-0.8.0.ebuild index 6fbc4495a341..e85a29c30f31 100644 --- a/sci-libs/branca/branca-0.8.0.ebuild +++ b/sci-libs/branca/branca-0.8.0.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) -RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +RDEPEND="dev-python/jinja2[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="dev-python/setuptools-scm test? ( diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild index b90bffc4df0f..e8998953c67b 100644 --- a/sci-libs/btf/btf-1.2.6.ebuild +++ b/sci-libs/btf/btf-1.2.6.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" DEPEND="sci-libs/suitesparseconfig" RDEPEND="${DEPEND}" diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 8233a46783dc..7f0b51661b1b 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,5 +1,4 @@ DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b -DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c -DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587 DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631 +DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289 diff --git a/sci-libs/caffe2/caffe2-2.3.1.ebuild b/sci-libs/caffe2/caffe2-2.3.1.ebuild deleted file mode 100644 index ff2a9caebd59..000000000000 --- a/sci-libs/caffe2/caffe2-2.3.1.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -ROCM_VERSION=6.1 -inherit python-single-r1 cmake cuda flag-o-matic prefix rocm - -MYPN=pytorch -MYP=${MYPN}-${PV} - -DESCRIPTION="A deep learning framework" -HOMEPAGE="https://pytorch.org/" -SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz - -> ${MYP}.tar.gz - https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz" - -S="${WORKDIR}"/${MYP} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg flash gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" -RESTRICT="test" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ffmpeg? ( opencv ) - mpi? ( distributed ) - gloo? ( distributed ) - ?? ( cuda rocm ) - rocm? ( - || ( ${ROCM_REQUIRED_USE} ) - !flash - ) -" - -# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags:= - >=dev-cpp/glog-0.5.0 - dev-libs/cpuinfo - dev-libs/libfmt - dev-libs/protobuf:= - dev-libs/pthreadpool - dev-libs/sleef - virtual/lapack - sci-libs/onnx - sci-libs/foxi - cuda? ( - dev-libs/cudnn - >=dev-libs/cudnn-frontend-1.0.3:0/8 - <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] - ) - fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) - ffmpeg? ( media-video/ffmpeg:= ) - gloo? ( sci-libs/gloo[cuda?] ) - mpi? ( virtual/mpi ) - nnpack? ( sci-libs/NNPACK ) - numpy? ( $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') ) - onednn? ( dev-libs/oneDNN ) - opencl? ( virtual/opencl ) - opencv? ( media-libs/opencv:= ) - qnnpack? ( sci-libs/QNNPACK ) - rocm? ( - =dev-util/hip-6.1* - =dev-libs/rccl-6.1*[${ROCM_USEDEP}] - =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}] - =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}] - =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}] - =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}] - =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}] - =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}] - =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}] - =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}] - =sci-libs/miopen-6.1*[${ROCM_USEDEP}] - =dev-util/roctracer-6.1*[${ROCM_USEDEP}] - - amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] ) - amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] ) - amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] ) - amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] ) - ) - distributed? ( sci-libs/tensorpipe[cuda?] ) - xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) - mkl? ( sci-libs/mkl ) - openblas? ( sci-libs/openblas ) -" -DEPEND=" - ${RDEPEND} - cuda? ( >=dev-libs/cutlass-3.4.1 ) - onednn? ( sci-libs/ideep ) - dev-libs/psimd - dev-libs/FP16 - dev-libs/FXdiv - dev-libs/pocketfft - dev-libs/flatbuffers - >=sci-libs/kineto-0.4.0_p20231031 - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - ') -" - -PATCHES=( - ../patches/${PN}-2.2.1-gentoo.patch - ../patches/${PN}-1.13.0-install-dirs.patch - ../patches/${PN}-1.12.0-glog-0.6.0.patch - ../patches/${PN}-1.13.1-tensorpipe.patch - ../patches/${PN}-2.3.0-cudnn_include_fix.patch - ../patches/${PN}-2.1.2-fix-rpath.patch - ../patches/${PN}-2.1.2-fix-openmp-link.patch - ../patches/${PN}-2.3.0-rocm-fix-std-cpp17.patch - ../patches/${PN}-2.2.2-musl.patch - ../patches/${PN}-2.3.0-CMakeFix.patch - ../patches/${PN}-2.3.0-exclude-aotriton.patch - ../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch - ../patches/${PN}-2.3.0-optional-hipblaslt.patch - ../patches/${PN}-2.3.0-fix-libcpp.patch - ../patches/${PN}-2.3.0-fix-gcc-clang-abi-compat.patch -) - -src_prepare() { - filter-lto #bug 862672 - sed -i \ - -e "/third_party\/gloo/d" \ - cmake/Dependencies.cmake \ - || die - cmake_src_prepare - pushd torch/csrc/jit/serialization || die - flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die - popd - # prefixify the hardcoded paths, after all patches are applied - hprefixify \ - aten/CMakeLists.txt \ - caffe2/CMakeLists.txt \ - cmake/Metal.cmake \ - cmake/Modules/*.cmake \ - cmake/Modules_CUDA_fix/FindCUDNN.cmake \ - cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \ - cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \ - cmake/public/LoadHIP.cmake \ - cmake/public/cuda.cmake \ - cmake/Dependencies.cmake \ - torch/CMakeLists.txt \ - CMakeLists.txt - - if use rocm; then - sed -e "s:/opt/rocm:/usr:" \ - -e "s:lib/cmake:$(get_libdir)/cmake:g" \ - -e "s/HIP 1.0/HIP 1.0 REQUIRED/" \ - -i cmake/public/LoadHIP.cmake || die - - ebegin "HIPifying cuda sources" - ${EPYTHON} tools/amd_build/build_amd.py || die - eend $? - fi -} - -src_configure() { - if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then - ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0." - ewarn "These may not be optimal for your GPU." - ewarn "" - ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU," - ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5" - ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell" - ewarn "" - ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" - ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" - fi - - local mycmakeargs=( - -DBUILD_CUSTOM_PROTOBUF=OFF - -DBUILD_SHARED_LIBS=ON - - -DUSE_CCACHE=OFF - -DUSE_CUDA=$(usex cuda) - -DUSE_DISTRIBUTED=$(usex distributed) - -DUSE_MPI=$(usex mpi) - -DUSE_FAKELOWP=OFF - -DUSE_FBGEMM=$(usex fbgemm) - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_FLASH_ATTENTION=$(usex flash) - -DUSE_GFLAGS=ON - -DUSE_GLOG=ON - -DUSE_GLOO=$(usex gloo) - -DUSE_KINETO=OFF # TODO - -DUSE_LEVELDB=OFF - -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma - -DUSE_MKLDNN=$(usex onednn) - -DUSE_NNPACK=$(usex nnpack) - -DUSE_QNNPACK=$(usex qnnpack) - -DUSE_XNNPACK=$(usex xnnpack) - -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex distributed) - -DUSE_PYTORCH_QNNPACK=OFF - -DUSE_NUMPY=$(usex numpy) - -DUSE_OPENCL=$(usex opencl) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENMP=$(usex openmp) - -DUSE_ROCM=$(usex rocm) - -DUSE_SYSTEM_CPUINFO=ON - -DUSE_SYSTEM_PYBIND11=ON - -DUSE_UCC=OFF - -DUSE_VALGRIND=OFF - -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_ITT=OFF - -DUSE_SYSTEM_PTHREADPOOL=ON - -DUSE_SYSTEM_FXDIV=ON - -DUSE_SYSTEM_FP16=ON - -DUSE_SYSTEM_GLOO=ON - -DUSE_SYSTEM_ONNX=ON - -DUSE_SYSTEM_SLEEF=ON - -DUSE_METAL=OFF - - -Wno-dev - -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) - -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) - ) - - if use mkl; then - mycmakeargs+=(-DBLAS=MKL) - elif use openblas; then - mycmakeargs+=(-DBLAS=OpenBLAS) - else - mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=) - fi - - if use cuda; then - addpredict "/dev/nvidiactl" # bug 867706 - addpredict "/dev/char" - addpredict "/proc/self/task" # bug 926116 - - mycmakeargs+=( - -DUSE_CUDNN=ON - -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" - -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library - -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" - ) - elif use rocm; then - export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)" - local use_hipblaslt="OFF" - if use amdgpu_targets_gfx90a || use amdgpu_targets_gfx940 || use amdgpu_targets_gfx941 \ - || use amdgpu_targets_gfx942; then - use_hipblaslt="ON" - fi - - mycmakeargs+=( - -DUSE_NCCL=ON - -DUSE_SYSTEM_NCCL=ON - -DUSE_HIPBLASLT=${use_hipblaslt} - ) - - # ROCm libraries produce too much warnings - append-cxxflags -Wno-deprecated-declarations -Wno-unused-result - fi - - if use onednn; then - mycmakeargs+=( - -DUSE_MKLDNN=ON - -DMKLDNN_FOUND=ON - -DMKLDNN_LIBRARIES=dnnl - -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl" - ) - fi - - cmake_src_configure - - # do not rerun cmake and the build process in src_install - sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die -} - -src_install() { - cmake_src_install - - insinto "/var/lib/${PN}" - doins "${BUILD_DIR}"/CMakeCache.txt - - rm -rf python - mkdir -p python/torch/include || die - mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die - cp torch/version.py python/torch/ || die - python_domodule python/caffe2 - python_domodule python/torch - ln -s ../../../../../include/torch \ - "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269 -} diff --git a/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild index e990c18926b2..c705aa0bac11 100644 --- a/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild +++ b/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild @@ -96,7 +96,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - cuda? ( >=dev-libs/cutlass-3.4.1 ) + cuda? ( <=dev-libs/cutlass-3.4.1 ) onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 diff --git a/sci-libs/caffe2/caffe2-2.4.1-r1.ebuild b/sci-libs/caffe2/caffe2-2.4.1-r4.ebuild index 3db2675f2205..d52388df3770 100644 --- a/sci-libs/caffe2/caffe2-2.4.1-r1.ebuild +++ b/sci-libs/caffe2/caffe2-2.4.1-r4.ebuild @@ -37,6 +37,7 @@ REQUIRED_USE=" # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 RDEPEND=" ${PYTHON_DEPS} + dev-cpp/abseil-cpp:= dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo @@ -53,7 +54,7 @@ RDEPEND=" cuda? ( dev-libs/cudnn >=dev-libs/cudnn-frontend-1.0.3:0/8 - <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] + <dev-util/nvidia-cuda-toolkit-12.5:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) gloo? ( sci-libs/gloo[cuda?] ) @@ -98,7 +99,8 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - cuda? ( >=dev-libs/cutlass-3.4.1 ) + dev-libs/clog + cuda? ( <=dev-libs/cutlass-3.4.1 ) onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 diff --git a/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild index 7fe4818311cb..8f23871b42b1 100644 --- a/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild +++ b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) ROCM_VERSION=6.1 -inherit python-single-r1 cmake cuda flag-o-matic prefix rocm +inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs MYPN=pytorch MYP=${MYPN}-${PV} @@ -13,19 +13,17 @@ MYP=${MYPN}-${PV} DESCRIPTION="A deep learning framework" HOMEPAGE="https://pytorch.org/" SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz - -> ${MYP}.tar.gz - https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz" + -> ${MYP}.tar.gz" S="${WORKDIR}"/${MYP} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg flash gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" +IUSE="cuda distributed fbgemm flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack" RESTRICT="test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - ffmpeg? ( opencv ) mpi? ( distributed ) gloo? ( distributed ) ?? ( cuda rocm ) @@ -35,11 +33,13 @@ REQUIRED_USE=" ) " -# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 RDEPEND=" ${PYTHON_DEPS} + dev-cpp/abseil-cpp:= dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 + dev-cpp/nlohmann_json + dev-cpp/opentelemetry-cpp dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= @@ -51,10 +51,9 @@ RDEPEND=" cuda? ( dev-libs/cudnn >=dev-libs/cudnn-frontend-1.0.3:0/8 - <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] + dev-util/nvidia-cuda-toolkit:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) - ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) @@ -63,8 +62,10 @@ RDEPEND=" ') ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) - opencv? ( media-libs/opencv:= ) - qnnpack? ( sci-libs/QNNPACK ) + qnnpack? ( + !sci-libs/QNNPACK + dev-cpp/gemmlowp + ) rocm? ( =dev-util/hip-6.1* =dev-libs/rccl-6.1*[${ROCM_USEDEP}] @@ -79,26 +80,31 @@ RDEPEND=" =sci-libs/miopen-6.1*[${ROCM_USEDEP}] =dev-util/roctracer-6.1*[${ROCM_USEDEP}] + =sci-libs/hipBLASLt-6.1* amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] ) amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] ) amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] ) amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] ) ) - distributed? ( sci-libs/tensorpipe[cuda?] ) - xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) + distributed? ( + sci-libs/tensorpipe[cuda?] + dev-cpp/cpp-httplib + ) + xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) " + DEPEND=" ${RDEPEND} - cuda? ( >=dev-libs/cutlass-3.4.1 ) + cuda? ( <=dev-libs/cutlass-3.4.1 ) onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers - >=sci-libs/kineto-0.4.0_p20231031 + >=sci-libs/kineto-0.4.0_p20240525 $(python_gen_cond_dep ' dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] @@ -107,33 +113,40 @@ DEPEND=" " PATCHES=( - ../patches/${PN}-2.2.1-gentoo.patch - ../patches/${PN}-1.13.0-install-dirs.patch - ../patches/${PN}-1.12.0-glog-0.6.0.patch - ../patches/${PN}-1.13.1-tensorpipe.patch - ../patches/${P}-cudnn_include_fix.patch - ../patches/${PN}-2.1.2-fix-rpath.patch - ../patches/${PN}-2.1.2-fix-openmp-link.patch - ../patches/${P}-rocm-fix-std-cpp17.patch - ../patches/${PN}-2.2.2-musl.patch - ../patches/${P}-CMakeFix.patch - ../patches/${PN}-2.3.0-exclude-aotriton.patch - ../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch - ../patches/${PN}-2.3.0-optional-hipblaslt.patch - ../patches/${PN}-2.3.0-fix-libcpp.patch - ../patches/${PN}-2.3.0-fix-gcc-clang-abi-compat.patch + "${FILESDIR}"/${P}-unbundle_fmt.patch + "${FILESDIR}"/${P}-unbundle_kineto.patch + "${FILESDIR}"/${P}-cudnn_include_fix.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch + "${FILESDIR}"/${P}-glog-0.6.0.patch + "${FILESDIR}"/${P}-newfix-functorch-install.patch ) src_prepare() { filter-lto #bug 862672 + + # Unbundle fmt + sed -i \ + -e 's|::fmt-header-only||' \ + c10/CMakeLists.txt \ + cmake/Dependencies.cmake \ + torch/CMakeLists.txt \ + || die + + # Drop third_party from CMake tree sed -i \ - -e "/third_party\/gloo/d" \ + -e '/add_subdirectory.*third_party/d' \ + CMakeLists.txt \ cmake/Dependencies.cmake \ + cmake/ProtoBuf.cmake \ + aten/src/ATen/CMakeLists.txt \ || die + cmake_src_prepare pushd torch/csrc/jit/serialization || die flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die popd + # prefixify the hardcoded paths, after all patches are applied hprefixify \ aten/CMakeLists.txt \ @@ -177,52 +190,51 @@ src_configure() { local mycmakeargs=( -DBUILD_CUSTOM_PROTOBUF=OFF - -DBUILD_SHARED_LIBS=ON - + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + -DPython_EXECUTABLE="${PYTHON}" + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) -DUSE_CCACHE=OFF -DUSE_CUDA=$(usex cuda) -DUSE_DISTRIBUTED=$(usex distributed) - -DUSE_MPI=$(usex mpi) -DUSE_FAKELOWP=OFF -DUSE_FBGEMM=$(usex fbgemm) - -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_FLASH_ATTENTION=$(usex flash) -DUSE_GFLAGS=ON -DUSE_GLOG=ON -DUSE_GLOO=$(usex gloo) + -DUSE_ITT=OFF -DUSE_KINETO=OFF # TODO - -DUSE_LEVELDB=OFF -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MEM_EFF_ATTENTION=OFF -DUSE_MKLDNN=$(usex onednn) + -DUSE_MPI=$(usex mpi) + -DUSE_NCCL=OFF -DUSE_NNPACK=$(usex nnpack) - -DUSE_QNNPACK=$(usex qnnpack) - -DUSE_XNNPACK=$(usex xnnpack) - -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex distributed) - -DUSE_PYTORCH_QNNPACK=OFF + -DUSE_NUMA=OFF -DUSE_NUMPY=$(usex numpy) -DUSE_OPENCL=$(usex opencl) - -DUSE_OPENCV=$(usex opencv) -DUSE_OPENMP=$(usex openmp) + -DUSE_PYTORCH_QNNPACK=$(usex qnnpack) + -DUSE_PYTORCH_METAL=OFF -DUSE_ROCM=$(usex rocm) -DUSE_SYSTEM_CPUINFO=ON - -DUSE_SYSTEM_PYBIND11=ON - -DUSE_UCC=OFF - -DUSE_VALGRIND=OFF - -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_ITT=OFF - -DUSE_SYSTEM_PTHREADPOOL=ON - -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_EIGEN_INSTALL=ON -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_FXDIV=ON -DUSE_SYSTEM_GLOO=ON -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_PSIMD=ON + -DUSE_SYSTEM_PSIMD=ON + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_PYBIND11=ON -DUSE_SYSTEM_SLEEF=ON - -DUSE_METAL=OFF - + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex distributed) + -DUSE_UCC=OFF + -DUSE_VALGRIND=OFF + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_XPU=OFF -Wno-dev - -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) - -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) ) if use mkl; then @@ -246,25 +258,23 @@ src_configure() { ) elif use rocm; then export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)" - local use_hipblaslt="OFF" - if use amdgpu_targets_gfx90a || use amdgpu_targets_gfx940 || use amdgpu_targets_gfx941 \ - || use amdgpu_targets_gfx942; then - use_hipblaslt="ON" - fi mycmakeargs+=( -DUSE_NCCL=ON -DUSE_SYSTEM_NCCL=ON - -DUSE_HIPBLASLT=${use_hipblaslt} ) # ROCm libraries produce too much warnings append-cxxflags -Wno-deprecated-declarations -Wno-unused-result + + if tc-is-clang; then + # fix mangling in LLVM: https://github.com/llvm/llvm-project/issues/85656 + append-cxxflags -fclang-abi-compat=17 + fi fi if use onednn; then mycmakeargs+=( - -DUSE_MKLDNN=ON -DMKLDNN_FOUND=ON -DMKLDNN_LIBRARIES=dnnl -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl" @@ -272,23 +282,40 @@ src_configure() { fi cmake_src_configure +} - # do not rerun cmake and the build process in src_install - sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die +src_compile() { + PYTORCH_BUILD_VERSION=${PV} \ + PYTORCH_BUILD_NUMBER=0 \ + cmake_src_compile } src_install() { cmake_src_install + # Used by pytorch ebuild insinto "/var/lib/${PN}" doins "${BUILD_DIR}"/CMakeCache.txt + dostrip -x /var/lib/${PN}/functorch.so rm -rf python - mkdir -p python/torch/include || die - mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die + mkdir -p python/torch || die cp torch/version.py python/torch/ || die - python_domodule python/caffe2 python_domodule python/torch + + mkdir "${D}"$(python_get_sitedir)/torch/bin || die + mkdir "${D}"$(python_get_sitedir)/torch/lib || die + mkdir "${D}"$(python_get_sitedir)/torch/include || die + ln -s ../../../../../include/torch \ "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269 + + mv "${D}"/usr/bin/torch_shm_manager \ + "${D}"/$(python_get_sitedir)/torch/bin/ || die + + mv "${D}"/usr/$(get_libdir)/libtorch_global_deps.so \ + "${D}"/$(python_get_sitedir)/torch/lib/ || die + + mv "${D}"/usr/lib/libc10*.so \ + "${D}"/usr/$(get_libdir)/ || die } diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-cudnn_include_fix.patch b/sci-libs/caffe2/files/caffe2-2.5.1-cudnn_include_fix.patch new file mode 100644 index 000000000000..77905dbd1ac8 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-cudnn_include_fix.patch @@ -0,0 +1,11 @@ +--- a/cmake/Dependencies.cmake 2024-04-29 18:37:34.005639858 +0200 ++++ b/cmake/Dependencies.cmake 2024-04-29 18:39:29.126587738 +0200 +@@ -1235,7 +1235,7 @@ + if(CUDNN_VERSION VERSION_LESS 8.5) + message(FATAL_ERROR "PyTorch needs CuDNN-8.5 or above, but found ${CUDNN_VERSION}. Builds are still possible with `USE_CUDNN=0`") + endif() +- set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include) ++ set(CUDNN_FRONTEND_INCLUDE_DIR /opt/cuda/include) + target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR}) + endif() + diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch b/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch new file mode 100644 index 000000000000..340d6e45c95a --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch @@ -0,0 +1,22 @@ +Disables aotriton download when both USE_FLASH_ATTENTION and USE_MEM_EFF_ATTENTION cmake flags are OFF +Backports upstream PR to 2.3.0: https://github.com/pytorch/pytorch/pull/130197 +--- a/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp ++++ b/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp +@@ -659,7 +659,7 @@ bool can_use_mem_efficient_attention(sdp_params const& params, bool debug) { + array_of<at::ScalarType>(at::kHalf, at::kFloat, at::kBFloat16); + constexpr auto less_than_sm80_mem_efficient_dtypes = + array_of<at::ScalarType>(at::kHalf, at::kFloat); +-#ifdef USE_ROCM ++#if defined(USE_ROCM) && defined(USE_MEM_EFF_ATTENTION) + constexpr auto aotriton_mem_efficient_dtypes = + array_of<at::ScalarType>(at::kHalf, at::kFloat, at::kBFloat16); + #endif +@@ -709,7 +709,7 @@ bool can_use_mem_efficient_attention(sdp_params const& params, bool debug) { + } + } + +-#ifdef USE_ROCM ++#if defined(USE_ROCM) && defined(USE_MEM_EFF_ATTENTION) + return check_tensor_dtype(params, aotriton_mem_efficient_dtypes, debug); + #else + auto dprop = at::cuda::getCurrentDeviceProperties(); diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch b/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch new file mode 100644 index 000000000000..ffce0028a556 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch @@ -0,0 +1,8 @@ +--- a/functorch/CMakeLists.txt 2024-11-10 11:18:29.151992840 +0100 ++++ b/functorch/CMakeLists.txt 2024-11-10 11:20:19.642389982 +0100 +@@ -42,4 +42,4 @@ + if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "") + set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) + endif() +-install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}") ++install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.5.1-gentoo.patch new file mode 100644 index 000000000000..f923b6746a4b --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-gentoo.patch @@ -0,0 +1,127 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -986,12 +986,11 @@ endif() + # third_party/FBGEMM + include(cmake/public/utils.cmake) + if(NOT MSVC) +- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") ++ string(APPEND CMAKE_CXX_FLAGS " -O2") + # Eigen fails to build with some versions, so convert this to a warning + # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 + string(APPEND CMAKE_CXX_FLAGS " -Wall") + string(APPEND CMAKE_CXX_FLAGS " -Wextra") +- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS) +@@ -1085,7 +1084,6 @@ if(NOT MSVC) + string(APPEND CMAKE_LINKER_FLAGS_DEBUG " -fno-omit-frame-pointer -O0") + append_cxx_flag_if_supported("-fno-math-errno" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-fno-trapping-math" CMAKE_CXX_FLAGS) +- append_cxx_flag_if_supported("-Werror=format" CMAKE_CXX_FLAGS) + else() + # skip unwanted includes from windows.h + add_compile_definitions(WIN32_LEAN_AND_MEAN) +--- a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt ++++ b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt +@@ -324,16 +324,8 @@ set_target_properties(pytorch_qnnpack PROPERTIES PUBLIC_HEADER include/pytorch_q + set_target_properties(pytorch_qnnpack PROPERTIES PUBLIC_HEADER include/qnnpack_func.h) + + # ---[ Configure clog +-if(NOT TARGET clog) +- set(CLOG_BUILD_TESTS OFF CACHE BOOL "") +- set(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "") +- add_subdirectory( +- "${CLOG_SOURCE_DIR}" +- "${CONFU_DEPENDENCIES_BINARY_DIR}/clog") +- # We build static version of clog but a dynamic library may indirectly depend on it +- set_property(TARGET clog PROPERTY POSITION_INDEPENDENT_CODE ON) +-endif() +-target_link_libraries(pytorch_qnnpack PUBLIC clog) ++find_library(CLOG_LIBRARY NAMES clog REQUIRED) ++target_link_libraries(pytorch_qnnpack PUBLIC ${CLOG_LIBRARY}) + + # ---[ Configure cpuinfo + if(NOT TARGET cpuinfo AND USE_SYSTEM_CPUINFO) +--- a/caffe2/CMakeLists.txt ++++ b/caffe2/CMakeLists.txt +@@ -87,7 +87,7 @@ endif() + # Note: the folders that are being commented out have not been properly + # addressed yet. + +-if(NOT MSVC AND USE_XNNPACK) ++if(FALSE) + if(NOT TARGET fxdiv) + set(FXDIV_BUILD_TESTS OFF CACHE BOOL "") + set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") +@@ -1081,7 +1081,6 @@ if(USE_XPU) + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +--- a/cmake/Codegen.cmake ++++ b/cmake/Codegen.cmake +@@ -57,7 +57,7 @@ if(INTERN_BUILD_ATEN_OPS) + if(MSVC) + set(OPT_FLAG "/fp:strict ") + else(MSVC) +- set(OPT_FLAG "-O3 ") ++ set(OPT_FLAG " ") + if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") + set(OPT_FLAG " ") + endif() +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -473,7 +473,9 @@ if(USE_PYTORCH_QNNPACK) + set_property(TARGET pytorch_qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON) + # QNNPACK depends on gemmlowp headers +- target_include_directories(pytorch_qnnpack PRIVATE "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") ++ find_package(gemmlowp REQUIRED) ++ get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp::gemmlowp INTERFACE_INCLUDE_DIRECTORIES) ++ target_include_directories(pytorch_qnnpack PRIVATE ${GEMMLOWP_INCLUDE_DIRS}) + + if(PYTORCH_QNNPACK_CUSTOM_THREADPOOL) + target_compile_definitions( +@@ -710,7 +712,7 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) + endif() + + # ---[ FBGEMM +-if(USE_FBGEMM) ++if(FALSE) + set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") + if(NOT DEFINED FBGEMM_SOURCE_DIR) + set(FBGEMM_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/fbgemm" CACHE STRING "FBGEMM source directory") +@@ -758,6 +760,7 @@ if(USE_FBGEMM) + endif() + + if(USE_FBGEMM) ++ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) + caffe2_update_option(USE_FBGEMM ON) + else() + caffe2_update_option(USE_FBGEMM OFF) +--- a/cmake/External/nnpack.cmake ++++ b/cmake/External/nnpack.cmake +@@ -56,7 +56,7 @@ if(ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAM + set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory") + set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory") + +- if(NOT TARGET nnpack) ++ if(FALSE) + if(NOT USE_SYSTEM_PTHREADPOOL AND USE_INTERNAL_PTHREADPOOL_IMPL) + set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "") + endif() +--- a/cmake/public/utils.cmake ++++ b/cmake/public/utils.cmake +@@ -422,8 +422,6 @@ function(torch_compile_options libname) + endif() + + # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression) +- target_compile_options(${libname} PRIVATE +- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>>:-O2>) + + endfunction() + diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-glog-0.6.0.patch b/sci-libs/caffe2/files/caffe2-2.5.1-glog-0.6.0.patch new file mode 100644 index 000000000000..6c06d2cca654 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-glog-0.6.0.patch @@ -0,0 +1,29 @@ +https://github.com/pytorch/pytorch/issues/58054 + +--- a/c10/util/Logging.cpp ++++ b/c10/util/Logging.cpp +@@ -192,23 +192,13 @@ + google::GLOG_WARNING, + "The minimum log level that caffe2 will output."); + +-// Google glog's api does not have an external function that allows one to check +-// if glog is initialized or not. It does have an internal function - so we are +-// declaring it here. This is a hack but has been used by a bunch of others too +-// (e.g. Torch). +-namespace google { +-namespace glog_internal_namespace_ { +-bool IsGoogleLoggingInitialized(); +-} // namespace glog_internal_namespace_ +-} // namespace google +- + namespace c10 { + namespace { + + void initGoogleLogging(char const* name) { + #if !defined(_MSC_VER) + // This trick can only be used on UNIX platforms +- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) ++ if (!::google::IsGoogleLoggingInitialized()) + #endif + { + ::google::InitGoogleLogging(name); diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch b/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch new file mode 100644 index 000000000000..e99b7e59cb5b --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch @@ -0,0 +1,11 @@ +--- a/c10/CMakeLists.txt ++++ b/c10/CMakeLists.txt +@@ -162,7 +162,7 @@ if(NOT BUILD_LIBTORCHLESS) + # Note: for now, we will put all export path into one single Caffe2Targets group + # to deal with the cmake deployment need. Inside the Caffe2Targets set, the + # individual libraries like libc10.so and libcaffe2.so are still self-contained. +- install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib) ++ install(TARGETS c10 EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch b/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch new file mode 100644 index 000000000000..499a3c74c87f --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch @@ -0,0 +1,8 @@ +--- a/functorch/CMakeLists.txt 2024-11-10 11:18:29.151992840 +0100 ++++ b/functorch/CMakeLists.txt 2024-11-10 11:20:19.642389982 +0100 +@@ -42,4 +42,4 @@ + if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "") + set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) + endif() +-install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}") ++install(TARGETS ${PROJECT_NAME} DESTINATION "/var/lib/caffe2/") diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-unbundle_fmt.patch b/sci-libs/caffe2/files/caffe2-2.5.1-unbundle_fmt.patch new file mode 100644 index 000000000000..2594a56b36a5 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-unbundle_fmt.patch @@ -0,0 +1,10 @@ +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -1522,7 +1522,6 @@ + # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know + # `fmt` is compatible with a superset of the compilers that PyTorch is, it + # shouldn't be too bad to just disable the checks. +-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "") + + list(APPEND Caffe2_DEPENDENCY_LIBS fmt) + set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-unbundle_kineto.patch b/sci-libs/caffe2/files/caffe2-2.5.1-unbundle_kineto.patch new file mode 100644 index 000000000000..ebe931bc49b6 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.5.1-unbundle_kineto.patch @@ -0,0 +1,22 @@ +--- a/torch/CMakeLists.txt 2024-11-09 20:50:21.806784527 +0100 ++++ b/torch/CMakeLists.txt 2024-11-09 20:52:56.303892418 +0100 +@@ -67,7 +67,7 @@ + ${TORCH_ROOT}/third_party/gloo + ${TORCH_ROOT}/third_party/onnx + ${TORCH_ROOT}/third_party/flatbuffers/include +- ${TORCH_ROOT}/third_party/kineto/libkineto/include ++ "/usr/include/kineto" + ${TORCH_ROOT}/third_party/cpp-httplib + ${TORCH_ROOT}/third_party/nlohmann/include + +--- a/caffe2/CMakeLists.txt 2024-11-09 20:58:37.698085144 +0100 ++++ b/caffe2/CMakeLists.txt 2024-11-09 20:59:15.771391643 +0100 +@@ -1185,7 +1185,7 @@ + ${TORCH_ROOT}/third_party/miniz-2.1.0) + + target_include_directories(torch_cpu PRIVATE +- ${TORCH_ROOT}/third_party/kineto/libkineto/include) ++ "/usr/include/kineto") + + if(USE_KINETO) + target_include_directories(torch_cpu PRIVATE diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index e99253402e7a..cef968bc82ed 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="distributed">Support distributed applications</flag> <flag name="fbgemm">Use FBGEMM</flag> - <flag name="ffmpeg">Add support for video processing operators</flag> <flag name="flash">Enable flash attention</flag> <flag name="gloo">Use sci-libs/gloo</flag> <flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for blas, lapack and sparse blas routines</flag> @@ -16,7 +15,6 @@ <flag name="numpy">Add support for math operations through numpy</flag> <flag name="onednn">Use oneDNN</flag> <flag name="openblas">Use <pkg>sci-libs/openblas</pkg> for blas routines</flag> - <flag name="opencv">Add support for image processing operators</flag> <flag name="openmp">Use OpenMP for parallel code</flag> <flag name="qnnpack">Use QNNPACK</flag> <flag name="rocm">Enable ROCm gpu computing support</flag> diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 0e7764e95f41..b36e38ff4cea 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,2 +1 @@ -DIST cantera-3.0.0.tar.gz 2451103 BLAKE2B 094d7a4f0b8fd0f1a45d9f8c13e1390cf7fc62110e424e1287030e97382c1cdc016a5119adc4d5c7bbc222420a3b447db93fee8350643cb3a0907a838fbc1ddf SHA512 dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca DIST cantera-3.0.1.tar.gz 2451841 BLAKE2B b05771021a81d5266dfed382e2a6357e5b70653c6d9cfb5f03a6755095f4f8f4e7c0f78b79e0bf131c01fefce46bbc647c790ee412b6457c515cda39d4fc3054 SHA512 fa993b33867c6c0a0ca539f52116c4cdea739dfcd30deb5d2f66042f290f7f2f60112d7a37c38fbd8a38a119e5af00a7a85fd80b6e36388202b666be0ddd7715 diff --git a/sci-libs/cantera/cantera-3.0.1.ebuild b/sci-libs/cantera/cantera-3.0.1-r1.ebuild index 46a9c3b2f469..e1291d9791a8 100644 --- a/sci-libs/cantera/cantera-3.0.1.ebuild +++ b/sci-libs/cantera/cantera-3.0.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) FORTRAN_NEEDED=fortran FORTRAN_STANDARD="77 90" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="fortran hdf5 lapack +python test" RESTRICT="!test? ( test )" @@ -45,7 +45,7 @@ DEPEND=" ${RDEPEND} dev-cpp/eigen:3 dev-libs/boost:= - dev-libs/libfmt + <dev-libs/libfmt-11 python? ( $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] diff --git a/sci-libs/cantera/cantera-3.0.0-r1.ebuild b/sci-libs/cantera/cantera-3.0.1-r2.ebuild index c6b3ec2711e1..ffa880c04646 100644 --- a/sci-libs/cantera/cantera-3.0.0-r1.ebuild +++ b/sci-libs/cantera/cantera-3.0.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) FORTRAN_NEEDED=fortran FORTRAN_STANDARD="77 90" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="fortran hdf5 lapack +python test" RESTRICT="!test? ( test )" @@ -66,8 +66,9 @@ DEPEND=" " PATCHES=( - "${FILESDIR}/${P}_env.patch" - "${FILESDIR}/${P}_enable_python-3.12.patch" + "${FILESDIR}/${PN}-3.0.0_env.patch" + "${FILESDIR}/${P}_fix_fmt_with_c++20.patch" + "${FILESDIR}/${P}_add_fmt11_support.patch" ) pkg_setup() { @@ -87,7 +88,7 @@ src_configure() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" cc_flags="${CXXFLAGS}" - cxx_flags="-std=c++17" + cxx_flags="-std=c++20" debug="no" FORTRAN="$(tc-getFC)" FORTRANFLAGS="${FCFLAGS}" diff --git a/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch b/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch deleted file mode 100644 index 8efa7b0df9c5..000000000000 --- a/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 27f8362f537fc313f8fdb5c07649ef0d92e3b7f6 Mon Sep 17 00:00:00 2001 -From: "Mark E. Fuller" <mark.e.fuller@gmx.de> -Date: Sat, 26 Aug 2023 01:04:03 +0300 -Subject: [PATCH] mods to enable python3.12 - ---- - .github/workflows/main.yml | 2 +- - interfaces/cython/setup.cfg.in | 1 + - interfaces/python_minimal/setup.cfg.in | 1 + - interfaces/python_sdist/setup.cfg.in | 1 + - src/base/application.h | 2 +- - 5 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml -index 60822189bb..366ddd8435 100644 ---- a/.github/workflows/main.yml -+++ b/.github/workflows/main.yml -@@ -65,7 +65,7 @@ jobs: - timeout-minutes: 60 - strategy: - matrix: -- python-version: ['3.8', '3.10', '3.11'] -+ python-version: ['3.8', '3.10', '3.11', '3.12'] - os: ['ubuntu-20.04', 'ubuntu-22.04'] - fail-fast: false - env: -diff --git a/interfaces/cython/setup.cfg.in b/interfaces/cython/setup.cfg.in -index 1a0358a77d..fd3c0b53c4 100644 ---- a/interfaces/cython/setup.cfg.in -+++ b/interfaces/cython/setup.cfg.in -@@ -27,6 +27,7 @@ classifiers = - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 -+ Programming Language :: Python :: 3.12 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Chemistry - Topic :: Scientific/Engineering :: Physics -diff --git a/interfaces/python_minimal/setup.cfg.in b/interfaces/python_minimal/setup.cfg.in -index 2d96c75eda..753b619ede 100644 ---- a/interfaces/python_minimal/setup.cfg.in -+++ b/interfaces/python_minimal/setup.cfg.in -@@ -23,6 +23,7 @@ classifiers = - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 -+ Programming Language :: Python :: 3.12 - Topic :: Scientific/Engineering :: Chemistry - Topic :: Scientific/Engineering :: Physics - project_urls = -diff --git a/interfaces/python_sdist/setup.cfg.in b/interfaces/python_sdist/setup.cfg.in -index 219e53a3f0..e356b422b8 100644 ---- a/interfaces/python_sdist/setup.cfg.in -+++ b/interfaces/python_sdist/setup.cfg.in -@@ -27,6 +27,7 @@ classifiers = - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 -+ Programming Language :: Python :: 3.12 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Chemistry - Topic :: Scientific/Engineering :: Physics -diff --git a/src/base/application.h b/src/base/application.h -index 76a6c671a2..b03c049f14 100644 ---- a/src/base/application.h -+++ b/src/base/application.h -@@ -434,7 +434,7 @@ class Application - vector<string> inputDirs; - - //! Versions of Python to consider when attempting to load user extensions -- vector<string> m_pythonSearchVersions = {"3.11", "3.10", "3.9", "3.8"}; -+ vector<string> m_pythonSearchVersions = {"3.12", "3.11", "3.10", "3.9", "3.8"}; - - //! Set of deprecation warnings that have been emitted (to suppress duplicates) - set<string> warnings; diff --git a/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch b/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch new file mode 100644 index 000000000000..7e0d5333a105 --- /dev/null +++ b/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch @@ -0,0 +1,46 @@ +This is upstream patch with removed changes for "doc/sphinx/develop/compiling/dependencies.md" file +Upstream issue: https://github.com/Cantera/cantera/issues/1735 +Gentoo issue: https://bugs.gentoo.org/945800 + +From c8f190928fd7a074944f0f4c58661f84a282a35e Mon Sep 17 00:00:00 2001 +From: Ray Speth <speth@mit.edu> +Date: Wed, 24 Jul 2024 20:12:18 -0400 +Subject: [PATCH] Add support for fmt 11.0 + +Resolves #1735 +--- + SConstruct | 2 +- + doc/sphinx/develop/compiling/dependencies.md | 2 +- + include/cantera/base/fmt.h | 8 ++++++++ + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 3863fe3a32..0b607ac891 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -216,7 +216,7 @@ config_options = [ + options with spaces, for example, "cxx_flags='-g -Wextra -O3 --std=c++14'" + """, + { +- "cl": "/EHsc /std:c++17", ++ "cl": "/EHsc /std:c++17 /utf-8", + "default": "-std=c++17" + }), + Option( +diff --git a/include/cantera/base/fmt.h b/include/cantera/base/fmt.h +index 1e0b3a0423..6b4d734fe3 100644 +--- a/include/cantera/base/fmt.h ++++ b/include/cantera/base/fmt.h +@@ -42,4 +42,12 @@ void fmt_append(fmt::memory_buffer& b, const std::string& tmpl, Args... args) { + } + #endif + ++#if FMT_VERSION > 100000 ++ #if CT_USE_SYSTEM_FMT ++ #include <fmt/ranges.h> ++ #else ++ #include <fmt/join.h> ++ #endif ++#endif ++ + #endif diff --git a/sci-libs/cantera/files/cantera-3.0.1_fix_fmt_with_c++20.patch b/sci-libs/cantera/files/cantera-3.0.1_fix_fmt_with_c++20.patch new file mode 100644 index 000000000000..3b6b3da50a53 --- /dev/null +++ b/sci-libs/cantera/files/cantera-3.0.1_fix_fmt_with_c++20.patch @@ -0,0 +1,323 @@ +This is upstream patch. +Upstream issue: https://github.com/Cantera/cantera/issues/1711 + +From edc8243577020b7dd6cd0fd85285cc8ca043b5ea Mon Sep 17 00:00:00 2001 +From: Ray Speth <speth@mit.edu> +Date: Wed, 19 Jun 2024 00:09:02 -0400 +Subject: [PATCH] Fix usage of fmt when compiling in C++20 mode + +Resolves #1711 +--- + include/cantera/base/AnyMap.h | 6 ++-- + include/cantera/base/ctexceptions.h | 2 +- + include/cantera/base/fmt.h | 8 ++--- + include/cantera/base/global.h | 8 ++--- + src/base/AnyMap.cpp | 4 +-- + src/base/SolutionArray.cpp | 51 ++++++++++++++++------------- + src/thermo/PureFluidPhase.cpp | 2 +- + src/thermo/ThermoPhase.cpp | 2 +- + 8 files changed, 46 insertions(+), 37 deletions(-) + +diff --git a/include/cantera/base/AnyMap.h b/include/cantera/base/AnyMap.h +index 81ac0071a7..b1f0747f33 100644 +--- a/include/cantera/base/AnyMap.h ++++ b/include/cantera/base/AnyMap.h +@@ -746,7 +746,8 @@ class InputFileError : public CanteraError + : CanteraError( + procedure, + formatError( +- (sizeof...(args) == 0) ? message : fmt::format(message, args...), ++ (sizeof...(args) == 0) ? message ++ : fmt::format(fmt::runtime(message), args...), + node.m_line, node.m_column, node.m_metadata)) + { + } +@@ -761,7 +762,8 @@ class InputFileError : public CanteraError + : CanteraError( + procedure, + formatError2( +- (sizeof...(args) == 0) ? message : fmt::format(message, args...), ++ (sizeof...(args) == 0) ? message ++ : fmt::format(fmt::runtime(message), args...), + node1.m_line, node1.m_column, node1.m_metadata, + node2.m_line, node2.m_column, node2.m_metadata)) + { +diff --git a/include/cantera/base/ctexceptions.h b/include/cantera/base/ctexceptions.h +index fb21d3ef22..476e16bf46 100644 +--- a/include/cantera/base/ctexceptions.h ++++ b/include/cantera/base/ctexceptions.h +@@ -86,7 +86,7 @@ class CanteraError : public std::exception + if (sizeof...(args) == 0) { + msg_ = msg; + } else { +- msg_ = fmt::format(msg, args...); ++ msg_ = fmt::format(fmt::runtime(msg), args...); + } + } + +diff --git a/include/cantera/base/fmt.h b/include/cantera/base/fmt.h +index 8341be115e..f613e17b31 100644 +--- a/include/cantera/base/fmt.h ++++ b/include/cantera/base/fmt.h +@@ -26,13 +26,13 @@ + + #if FMT_VERSION < 80000 + template <typename... Args> +-void fmt_append(fmt::memory_buffer& b, Args... args) { +- format_to(b, args...); ++void fmt_append(fmt::memory_buffer& b, const std::string& tmpl, Args... args) { ++ format_to(b, tmpl, args...); + } + #else + template <typename... Args> +-void fmt_append(fmt::memory_buffer& b, Args... args) { +- format_to(fmt::appender(b), args...); ++void fmt_append(fmt::memory_buffer& b, const std::string& tmpl, Args... args) { ++ format_to(fmt::appender(b), fmt::runtime(tmpl), args...); + } + #endif + +diff --git a/include/cantera/base/global.h b/include/cantera/base/global.h +index c0092c43ee..aa0f636754 100644 +--- a/include/cantera/base/global.h ++++ b/include/cantera/base/global.h +@@ -176,7 +176,7 @@ void writelog(const string& fmt, const Args&... args) { + if (sizeof...(args) == 0) { + writelog_direct(fmt); + } else { +- writelog_direct(fmt::format(fmt, args...)); ++ writelog_direct(fmt::format(fmt::runtime(fmt), args...)); + } + } + +@@ -228,7 +228,7 @@ void warn_deprecated(const string& method, const string& msg, const Args&... arg + if (sizeof...(args) == 0) { + _warn_deprecated(method, msg); + } else { +- _warn_deprecated(method, fmt::format(msg, args...)); ++ _warn_deprecated(method, fmt::format(fmt::runtime(msg), args...)); + } + } + +@@ -253,7 +253,7 @@ void warn(const string& warning, const string& method, + if (sizeof...(args) == 0) { + _warn(warning, method, msg); + } else { +- _warn(warning, method, fmt::format(msg, args...)); ++ _warn(warning, method, fmt::format(fmt::runtime(msg), args...)); + } + } + +@@ -268,7 +268,7 @@ void warn_user(const string& method, const string& msg, const Args&... args) { + if (sizeof...(args) == 0) { + _warn("Cantera", method, msg); + } else { +- _warn("Cantera", method, fmt::format(msg, args...)); ++ _warn("Cantera", method, fmt::format(fmt::runtime(msg), args...)); + } + } + +diff --git a/src/base/AnyMap.cpp b/src/base/AnyMap.cpp +index 84d74c1358..b35aabb8c3 100644 +--- a/src/base/AnyMap.cpp ++++ b/src/base/AnyMap.cpp +@@ -164,7 +164,7 @@ string formatDouble(double x, long int precision) + size_t last; + string s0; + if (useExp) { +- s0 = fmt::format(fmt::format("{:.{}e}", x, precision)); ++ s0 = fmt::format(fmt::runtime(fmt::format("{:.{}e}", x, precision))); + // last digit of significand + last = s0.size() - 5; + if (s0[last + 1] == 'e') { +@@ -195,7 +195,7 @@ string formatDouble(double x, long int precision) + if (s0[last - 1] == '0') { + s1 = s0; // Recycle original string + } else if (useExp) { +- s1 = fmt::format(fmt::format("{:.{}e}", x, precision - 2)); ++ s1 = fmt::format(fmt::runtime(fmt::format("{:.{}e}", x, precision - 2))); + } else { + s1 = fmt::format("{:.{}f}", x, precision - log10x - 2); + } +diff --git a/src/base/SolutionArray.cpp b/src/base/SolutionArray.cpp +index 4819aaa756..986c3e2373 100644 +--- a/src/base/SolutionArray.cpp ++++ b/src/base/SolutionArray.cpp +@@ -232,17 +232,19 @@ vector<string> doubleColumn(string name, const vector<double>& comp, + if (csize <= rows) { + for (const auto& val : comp) { + data.push_back(val); +- raw.push_back(boost::trim_copy(fmt::format(notation, val))); ++ raw.push_back(boost::trim_copy(fmt::format(fmt::runtime(notation), val))); + } + } else { + dots = (rows + 1) / 2; + for (int row = 0; row < dots; row++) { + data.push_back(comp[row]); +- raw.push_back(boost::trim_copy(fmt::format(notation, comp[row]))); ++ raw.push_back(boost::trim_copy( ++ fmt::format(fmt::runtime(notation), comp[row]))); + } + for (int row = csize - rows / 2; row < csize; row++) { + data.push_back(comp[row]); +- raw.push_back(boost::trim_copy(fmt::format(notation, comp[row]))); ++ raw.push_back(boost::trim_copy( ++ fmt::format(fmt::runtime(notation), comp[row]))); + } + } + +@@ -292,17 +294,17 @@ vector<string> doubleColumn(string name, const vector<double>& comp, + // all entries are integers + notation = fmt::format(" {{:>{}.0f}}", over + maxLen); + } +- maxLen = fmt::format(notation, 0.).size(); ++ maxLen = fmt::format(fmt::runtime(notation), 0.).size(); + + // assemble output + string section = fmt::format("{{:>{}}}", maxLen); +- vector<string> col = {fmt::format(section, name)}; ++ vector<string> col = {fmt::format(fmt::runtime(section), name)}; + int count = 0; + for (const auto& val : data) { +- col.push_back(fmt::format(notation, val)); ++ col.push_back(fmt::format(fmt::runtime(notation), val)); + count++; + if (count == dots) { +- col.push_back(fmt::format(section, "...")); ++ col.push_back(fmt::format(fmt::runtime(section), "...")); + } + } + return col; +@@ -320,7 +322,8 @@ vector<string> integerColumn(string name, const vector<long int>& comp, + if (csize <= rows) { + for (const auto& val : comp) { + data.push_back(val); +- string formatted = boost::trim_copy(fmt::format(notation, val)); ++ string formatted = boost::trim_copy( ++ fmt::format(fmt::runtime(notation), val)); + if (formatted[0] == '-') { + formatted = formatted.substr(1); + } +@@ -330,7 +333,8 @@ vector<string> integerColumn(string name, const vector<long int>& comp, + dots = (rows + 1) / 2; + for (int row = 0; row < dots; row++) { + data.push_back(comp[row]); +- string formatted = boost::trim_copy(fmt::format(notation, comp[row])); ++ string formatted = boost::trim_copy( ++ fmt::format(fmt::runtime(notation), comp[row])); + if (formatted[0] == '-') { + formatted = formatted.substr(1); + } +@@ -338,7 +342,8 @@ vector<string> integerColumn(string name, const vector<long int>& comp, + } + for (int row = csize - rows / 2; row < csize; row++) { + data.push_back(comp[row]); +- string formatted = boost::trim_copy(fmt::format(notation, comp[row])); ++ string formatted = boost::trim_copy( ++ fmt::format(fmt::runtime(notation), comp[row])); + if (formatted[0] == '-') { + formatted = formatted.substr(1); + } +@@ -356,13 +361,13 @@ vector<string> integerColumn(string name, const vector<long int>& comp, + } + + // assemble output +- vector<string> col = {fmt::format(notation, name)}; ++ vector<string> col = {fmt::format(fmt::runtime(notation), name)}; + int count = 0; + for (const auto& val : data) { +- col.push_back(fmt::format(notation, val)); ++ col.push_back(fmt::format(fmt::runtime(notation), val)); + count++; + if (count == dots) { +- col.push_back(fmt::format(notation, "..")); ++ col.push_back(fmt::format(fmt::runtime(notation), "..")); + } + } + return col; +@@ -381,31 +386,33 @@ vector<string> stringColumn(string name, const vector<string>& comp, + for (const auto& val : comp) { + data.push_back(val); + maxLen = std::max(maxLen, +- boost::trim_copy(fmt::format(notation, val)).size()); ++ boost::trim_copy(fmt::format(fmt::runtime(notation), val)).size()); + } + } else { + dots = (rows + 1) / 2; + for (int row = 0; row < dots; row++) { + data.push_back(comp[row]); + maxLen = std::max(maxLen, +- boost::trim_copy(fmt::format(notation, comp[row])).size()); ++ boost::trim_copy( ++ fmt::format(fmt::runtime(notation), comp[row])).size()); + } + for (int row = csize - rows / 2; row < csize; row++) { + data.push_back(comp[row]); + maxLen = std::max(maxLen, +- boost::trim_copy(fmt::format(notation, comp[row])).size()); ++ boost::trim_copy( ++ fmt::format(fmt::runtime(notation), comp[row])).size()); + } + } + + // assemble output + notation = fmt::format(" {{:>{}}}", maxLen); +- vector<string> col = {fmt::format(notation, name)}; ++ vector<string> col = {fmt::format(fmt::runtime(notation), name)}; + int count = 0; + for (const auto& val : data) { +- col.push_back(fmt::format(notation, val)); ++ col.push_back(fmt::format(fmt::runtime(notation), val)); + count++; + if (count == dots) { +- col.push_back(fmt::format(notation, "...")); ++ col.push_back(fmt::format(fmt::runtime(notation), "...")); + } + } + return col; +@@ -443,8 +450,8 @@ vector<string> formatColumn(string name, const AnyValue& comp, int rows, int wid + + // assemble output + string notation = fmt::format(" {{:>{}}}", maxLen); +- repr = fmt::format(notation, repr); +- vector<string> col = {fmt::format(notation, name)}; ++ repr = fmt::format(fmt::runtime(notation), repr); ++ vector<string> col = {fmt::format(fmt::runtime(notation), name)}; + if (size <= rows) { + for (int row = 0; row < size; row++) { + col.push_back(repr); +@@ -454,7 +461,7 @@ vector<string> formatColumn(string name, const AnyValue& comp, int rows, int wid + for (int row = 0; row < dots; row++) { + col.push_back(repr); + } +- col.push_back(fmt::format(notation, "...")); ++ col.push_back(fmt::format(fmt::runtime(notation), "...")); + for (int row = size - rows / 2; row < size; row++) { + col.push_back(repr); + } +diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp +index 65e27c52d7..3e45009422 100644 +--- a/src/thermo/PureFluidPhase.cpp ++++ b/src/thermo/PureFluidPhase.cpp +@@ -393,7 +393,7 @@ string PureFluidPhase::report(bool show_thermo, double threshold) const + + string one_property = fmt::format("{{:>{}}} {{:<.5g}} {{}}\n", name_width); + +- string two_prop_header = "{} {:^15} {:^15}\n"; ++ constexpr auto two_prop_header = "{} {:^15} {:^15}\n"; + string kg_kmol_header = fmt::format( + two_prop_header, blank_leader, "1 kg", "1 kmol" + ); +diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp +index 31b2c0ee9f..2b3993be35 100644 +--- a/src/thermo/ThermoPhase.cpp ++++ b/src/thermo/ThermoPhase.cpp +@@ -1291,7 +1291,7 @@ string ThermoPhase::report(bool show_thermo, double threshold) const + + string one_property = fmt::format("{{:>{}}} {{:<.5g}} {{}}\n", name_width); + +- string two_prop_header = "{} {:^15} {:^15}\n"; ++ constexpr auto two_prop_header = "{} {:^15} {:^15}\n"; + string kg_kmol_header = fmt::format( + two_prop_header, blank_leader, "1 kg", "1 kmol" + ); diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest index 9f573fc8518a..946a98b3f28a 100644 --- a/sci-libs/cartopy/Manifest +++ b/sci-libs/cartopy/Manifest @@ -1,2 +1,2 @@ -DIST cartopy-0.23.0.gh.tar.gz 10645484 BLAKE2B aa9306e9f5bd85ae28be4802aac1a36d67df5812e9d188ad20d27103eaff1856b7d48e256459519b4e647bdf17fc207e8473ec6ead7413db113311fe821faba6 SHA512 8f357faad592db03c564d2c87f6d1600d2a04a68b71b250925c222cea418b8588f2eb48f64d3ec7210650a34372777ef8416c8f129af7911661615759d2c60b5 DIST cartopy-0.24.0.gh.tar.gz 10701591 BLAKE2B 93b555e43031561f4927952839ddb7f95bef3801cbdaa5c20d98612b5a6d0383b83f4c41cf965b9ef2c64aea68c0507b34a3959bebb71b00bd86fc25d2de412a SHA512 eb0349dc3c1358b18f8c8ae71166f1947c3024337d7bf27fe28a2dea30593e7c6fcf1aa4a540537dd02d95f66051469ca679f3a5b8b3c2cf09d2f25736e03a9b +DIST cartopy-0.24.1.gh.tar.gz 10701425 BLAKE2B b1c6980e4e2b03e6ca2f55eec949b7dc4f58577af3795f71af81bd25f0d6e6a2ef3aca1d09b73dbf9c8e9a611f697843189e60bd821516f80bdbc2af2a4f93af SHA512 de5a4c191e3917941b0bab4e9c92fb60a91ef0263f7066753fd64286c347304ae8b7529b08fa901669173e8630c2b396775daf98161e8cadc62346641555c01a diff --git a/sci-libs/cartopy/cartopy-0.23.0.ebuild b/sci-libs/cartopy/cartopy-0.24.1.ebuild index 024cbd93e090..3c21d69d0004 100644 --- a/sci-libs/cartopy/cartopy-0.23.0.ebuild +++ b/sci-libs/cartopy/cartopy-0.24.1.ebuild @@ -55,9 +55,6 @@ BDEPEND=" ') ) " -PATCHES=( - "${FILESDIR}"/${P}-backport-test-fixes.patch -) EPYTEST_IGNORE=( # Require network access, not covered by markers diff --git a/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch b/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch deleted file mode 100644 index b88d4110dd6f..000000000000 --- a/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -# backport last test fix just after v0.23 release -diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py -index 7d82178..d07573e 100644 ---- a/lib/cartopy/tests/mpl/test_gridliner.py -+++ b/lib/cartopy/tests/mpl/test_gridliner.py -@@ -496,6 +496,7 @@ def test_gridliner_count_draws(): - mocked.assert_called_once() - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare( - baseline_dir='baseline_images/mpl/test_mpl_integration', - filename='simple_global.png') diff --git a/sci-libs/cddlib/cddlib-094m-r2.ebuild b/sci-libs/cddlib/cddlib-094m-r2.ebuild index 521abc9a7448..389961a42c59 100644 --- a/sci-libs/cddlib/cddlib-094m-r2.ebuild +++ b/sci-libs/cddlib/cddlib-094m-r2.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g SLOT="0" LICENSE="GPL-2+" -KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples static-libs tools" DEPEND="dev-libs/gmp:0" diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index e8ce87e899aa..e1d3aefbf235 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -1 +1,2 @@ DIST cfitsio-4.4.1.tar.gz 4308170 BLAKE2B 237a2f899b39a01ed73e3e41b420874c7654faf1f93e3c3b3454d2001a472f64b1c44fa2c88598ea21e3a8d60a1dcb76aa3001fee1e4443f91bcd565ce605a4f SHA512 a49e4e09a2e5f6e0ae823a68f02b3f6285cf3e0af66c9a1f8dadcd2867fa83c17fd27e446e8e5af9374ff2dc7b7a18334663ce977a1691c4ed4ced14d33232b7 +DIST cfitsio-4.5.0.tar.gz 4648097 BLAKE2B 5e0e09a3e6f43ce00bb5e5dd90e88c1aa2a873b407f3156147b064904ab341da219e69dc2a763e6b02eea0392a78e0ce74c15f921054bf72cac9b6e425765f99 SHA512 03746bf49cfcd97991be54f3e4dd51fb45c7b3a75f581dc6ab9ee5726a342dc11b651667807fd67e5318576d9b15e3580dd62ceab02fd684feff7ee6bb2edc7c diff --git a/sci-libs/cfitsio/cfitsio-4.5.0.ebuild b/sci-libs/cfitsio/cfitsio-4.5.0.ebuild new file mode 100644 index 000000000000..ef31390aa516 --- /dev/null +++ b/sci-libs/cfitsio/cfitsio-4.5.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib fortran-2 + +DESCRIPTION="C and Fortran library for manipulating FITS files" +HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" +SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/10-r1" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="bzip2 curl test tools" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex +" +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) +" +# Bug #803350 +DEPEND=" + ${RDEPEND} + <dev-lang/cfortran-20110621 +" + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # fix libdir + sed -e 's:lib/::' -i CMakeLists.txt || die + + # Avoid internal cfortran + rm cfortran.h || die +} + +multilib_src_configure() { + local libdir=$(get_libdir) + local mycmakeargs=( + # used for .pc file + -DLIB_SUFFIX=${libdir#lib} + + -DUSE_BZIP2=$(usex bzip2) + -DUSE_CURL=$(usex curl) + -DUSE_PTHREADS=ON + # just appending CFLAGS + -DUSE_SSE2=OFF + -DUSE_SSSE3=OFF + + -DTESTS=$(usex test) + -DUTILS=$(multilib_native_usex tools) + ) + cmake_src_configure +} + +multilib_src_install_all() { + dodoc README.md docs/*.pdf + + docinto examples + dodoc utilities/{cookbook.{c,f},testprog.c,testf77.f,speed.c,smem.c} +} diff --git a/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild b/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild index 53eb0c7c01ac..c72425b12744 100644 --- a/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild +++ b/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/CGNS-${PV}" LICENSE="ZLIB" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools" RDEPEND=" diff --git a/sci-libs/coinasl/Manifest b/sci-libs/coinasl/Manifest new file mode 100644 index 000000000000..f2fee7a53866 --- /dev/null +++ b/sci-libs/coinasl/Manifest @@ -0,0 +1,3 @@ +DIST coin-or-tools-BuildTools-20208f47f7bbc0056a92adefdfd43fded969f674.tar.gz 110238 BLAKE2B dd1965fd0a3aca6a1d0116d38c1c30edda1d2f38976ea919a4dd6e06da70171ab4a768e34a1320e7c8487c259968566aa94a585f36d96964296b2b5a240250ae SHA512 82b7f14f2ae735001d41b05b592914f4c1c710536a4ec5ed4db3aefa0f0ce181b90f44d6a91e6216d3c8dc87f760df2571837a062bf6aa3f3444a0d70f8a7a19 +DIST coinasl-2.0.1.tar.gz 252385 BLAKE2B 7276c9e4325542817a49c61b0d08b5d3bd60a4d9beb981fdd164fdad80d6695c6ba83c4c0cbddeac119be4572c1fe4f0534b0adcc45541324b23e7bc2d60a303 SHA512 37c05677ebc82d56228cd80382c37ae44546fd5681063488bd2cd3c35c2155c2f85e6e8fbcbe41913eeafeb3ac12d2972919893de75affade3016e64f75e034b +DIST solvers-64919f75f.tgz 360043 BLAKE2B 08b81c638bc9154e3089a87409585dd8e6f64be48ef0e431e5d5e907f5fa7c21c755890baf480924c17e25e8da6220d90f9d3ad1aa3146f40134f4bde0ca9f06 SHA512 dfb001d1feb4218b3122f4d6fe7a101f03bbb8277e8af0adda6a1ae9295b6eb7fc1ef62550bc6cc724a54754c713e36f526555c66d9f0bcb9a08ed61414bbe26 diff --git a/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild b/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild new file mode 100644 index 000000000000..3a7e7ae257e8 --- /dev/null +++ b/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Ampl Solver Library (ASL)" +HOMEPAGE="https://github.com/coin-or-tools/ThirdParty-ASL" +BUILD_TOOLS_VERSION="20208f47f7bbc0056a92adefdfd43fded969f674" +SOLVERS_SHA="64919f75f" +SRC_URI="https://coin-or-tools.github.io/ThirdParty-ASL/solvers-${SOLVERS_SHA}.tgz + https://github.com/coin-or-tools/ThirdParty-ASL/archive/refs/tags/releases/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/coin-or-tools/BuildTools/archive/${BUILD_TOOLS_VERSION}.tar.gz -> coin-or-tools-BuildTools-${BUILD_TOOLS_VERSION}.tar.gz" +S="${WORKDIR}/ThirdParty-ASL-releases-${PV}" + +LICENSE="EPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +PATCHES=( + "${FILESDIR}/${P}-getrusage.patch" + "${FILESDIR}/${P}-dtoa.patch" +) + +src_unpack() { + default + mv solvers "${S}" || die +} + +src_prepare() { + default + AT_M4DIR="${WORKDIR}/BuildTools-${BUILD_TOOLS_VERSION}" + eautoreconf +} + +src_configure() { + econf --enable-shared +} + +src_install() { + default + rm "${D}/usr/$(get_libdir)/libcoinasl.la" || die +} diff --git a/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch b/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch new file mode 100644 index 000000000000..72efc195307a --- /dev/null +++ b/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch @@ -0,0 +1,11 @@ +--- a/solvers/dtoa1.c ++++ b/solvers/dtoa1.c +@@ -16,6 +16,8 @@ + of or in connection with the use or performance of this software. + *******************************************************************/ + ++#include <stddef.h> ++ + #ifndef No_dtoa /*{{*/ + #ifdef __cplusplus + #include "memory.h" diff --git a/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch new file mode 100644 index 000000000000..9d6c193605bd --- /dev/null +++ b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 59e033d..2544237 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,7 +51,7 @@ AM_CONDITIONAL([ASL_INT64],[test "$intsize" = 64]) + # The critical function for NO_RUSAGE is getrusage(). Use a standard test. + AC_MSG_CHECKING([for getrusage]) + AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[]],[[getrusage()]])], ++ [AC_LANG_PROGRAM([#include <sys/resource.h>],[struct rusage r; getrusage(RUSAGE_SELF, &r)])], + [AC_MSG_RESULT([yes])], + [CPPFLAGS="$CPPFLAGS -DNO_RUSAGE" + AC_MSG_RESULT([no])]) diff --git a/sci-libs/coinasl/metadata.xml b/sci-libs/coinasl/metadata.xml new file mode 100644 index 000000000000..8e63c7114d93 --- /dev/null +++ b/sci-libs/coinasl/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>audvare@gmail.com</email> + <name>Andrew Udvare</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">coin-or-tools/ThirdParty-ASL</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild index b044c1ce9001..bb50a70a3437 100644 --- a/sci-libs/colamd/colamd-2.9.6.ebuild +++ b/sci-libs/colamd/colamd-2.9.6.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" BDEPEND="virtual/pkgconfig" DEPEND=">=sci-libs/suitesparseconfig-5.4.0" diff --git a/sci-libs/datasets/Manifest b/sci-libs/datasets/Manifest index 8499b8b1ec10..3c6942a0364e 100644 --- a/sci-libs/datasets/Manifest +++ b/sci-libs/datasets/Manifest @@ -1 +1 @@ -DIST datasets-2.18.0.gh.tar.gz 2169179 BLAKE2B 8a0daa0e8995b3fa5480d8aa892a26d1b6ba90f252ef7c7ca62f4afc2efa61a8ed2efbf48a40381f07178b826bde62af0f0cb8cbf80d470d5d4dfb1ba25f6cb8 SHA512 b1fb0e6636417683fa79679286505b921a7ba00b1cabd6a23e60d5804eb098527c5283058799a0776a7f1e93972fdbb948882f153a10557bcc6b6b22ab861292 +DIST datasets-2.20.0.gh.tar.gz 2188840 BLAKE2B 3f246c3e069ec31b63dd785ca5e96b5b441cc51318baf91a9aed053c9d5d94de6871fc0f0f8c271a4782998d976407c94c3b7b4beccc60b7a12868685707090b SHA512 effa3150877ba8269940b47ae0d96d436b7d625ceb102812bbbad805b47b7661102b5ac1c2f16624630bf3039cc4265353f6b71a83122717e73575c7e8c4921f diff --git a/sci-libs/datasets/datasets-2.18.0-r1.ebuild b/sci-libs/datasets/datasets-2.18.0-r1.ebuild deleted file mode 100644 index d16c3e2459de..000000000000 --- a/sci-libs/datasets/datasets-2.18.0-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 - -DESCRIPTION="Access and share datasets for Audio, Computer Vision, and NLP tasks" -HOMEPAGE=" - https://pypi.org/project/datasets/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/${PV}.tar.gz - -> ${P}.gh.tar.gz" -IUSE="test" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - ${PYTHON_DEPS} - sci-libs/pytorch[${PYTHON_SINGLE_USEDEP}] - sci-libs/caffe2[${PYTHON_SINGLE_USEDEP},numpy] - $(python_gen_cond_dep ' - dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/dill[${PYTHON_USEDEP}] - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/fsspec[${PYTHON_USEDEP}] - dev-python/multiprocess[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/scikit-learn[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] - dev-python/xxhash[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND}" -BDEPEND="test? ( - $(python_gen_cond_dep ' - dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/pytest-datadir[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - sci-libs/jiwer[${PYTHON_USEDEP}] - sci-libs/seqeval[${PYTHON_USEDEP}] - ') -)" - -PATCHES=( - "${FILESDIR}"/${PN}-2.17.1-tests.patch -) - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - rm tests/packaged_modules/test_spark.py || die - rm tests/test_upstream_hub.py || die - sed -i -e \ - "/pyarrow_hotfix/d" \ - src/datasets/features/features.py || die - sed -i \ - -e "s:pytest.mark.integration:pytest.mark.skip():g" \ - tests/test_arrow_dataset.py \ - tests/test_fingerprint.py \ - tests/test_hf_gcp.py \ - tests/test_inspect.py \ - tests/test_iterable_dataset.py \ - tests/test_iterable_dataset.py \ - tests/test_load.py \ - tests/test_offline_util.py \ - tests/test_streaming_download_manager.py \ - tests/commands/test_test.py \ - tests/packaged_modules/test_cache.py \ - || die -} diff --git a/sci-libs/datasets/datasets-2.20.0.ebuild b/sci-libs/datasets/datasets-2.20.0.ebuild new file mode 100644 index 000000000000..e2847e01db5c --- /dev/null +++ b/sci-libs/datasets/datasets-2.20.0.ebuild @@ -0,0 +1,235 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 + +DESCRIPTION="Access and share datasets for Audio, Computer Vision, and NLP tasks" +HOMEPAGE="https://pypi.org/project/datasets/" +SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" + +RDEPEND=" + ${PYTHON_DEPS} + sci-libs/pytorch[${PYTHON_SINGLE_USEDEP}] + sci-libs/caffe2[${PYTHON_SINGLE_USEDEP},numpy] + $(python_gen_cond_dep ' + dev-python/absl-py[${PYTHON_USEDEP}] + dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/dill[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/fsspec[${PYTHON_USEDEP}] + dev-python/multiprocess[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] + dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + dev-python/xxhash[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] + sci-libs/huggingface_hub[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( + $(python_gen_cond_dep ' + dev-python/absl-py[${PYTHON_USEDEP}] + dev-python/pytest-datadir[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + sci-libs/jiwer[${PYTHON_USEDEP}] + sci-libs/seqeval[${PYTHON_USEDEP}] + ') +)" + +PATCHES=( + "${FILESDIR}"/${PN}-2.19.2-tests.patch +) + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + sed -i -e \ + "/pyarrow_hotfix/d" \ + src/datasets/features/features.py || die +} + +src_test() { + local EPYTEST_IGNORE=( + tests/test_upstream_hub.py + tests/packaged_modules/test_spark.py + tests/test_load.py + ) + + local EPYTEST_DESELECT=( + "tests/test_arrow_dataset.py::BaseDatasetTest::test_filter_caching_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_filter_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_filter_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_flatten_indices_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_flatten_indices_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_batched_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_batched_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_caching_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_remove_columns_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_remove_columns_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_select_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_select_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_set_format_numpy_multiple_columns_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_set_format_numpy_multiple_columns_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_set_format_torch_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_set_format_torch_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_train_test_split_in_memory" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_train_test_split_on_disk" + "tests/test_arrow_dataset.py::TaskTemplatesTest::test_task_automatic_speech_recognition" + "tests/test_arrow_dataset.py::StratifiedTest::test_train_test_split_startify" + "tests/test_arrow_dataset.py::test_dataset_format_with_unformatted_image" + "tests/test_arrow_dataset.py::test_map_cases" + "tests/test_dataset_dict.py::DatasetDictTest::test_set_format_numpy" + "tests/test_dataset_dict.py::DatasetDictTest::test_set_format_torch" + "tests/test_distributed.py::test_torch_distributed_run" + "tests/test_distributed.py::test_torch_distributed_run_streaming_with_num_workers" + "tests/test_file_utils.py::TestxPath::test_xpath_glob" + "tests/test_file_utils.py::TestxPath::test_xpath_rglob" + "tests/test_file_utils.py::test_xopen_remote" + "tests/test_file_utils.py::test_xexists_private" + "tests/test_file_utils.py::test_xlistdir_private" + "tests/test_file_utils.py::test_xisdir_private" + "tests/test_file_utils.py::test_xisfile_private" + "tests/test_file_utils.py::test_xgetsize_private" + "tests/test_file_utils.py::test_xglob_private" + "tests/test_file_utils.py::test_xwalk_private" + "tests/test_fingerprint.py::TokenizersHashTest::test_hash_regex" + "tests/test_fingerprint.py::TokenizersHashTest::test_hash_tokenizer" + "tests/test_fingerprint.py::TokenizersHashTest::test_hash_tokenizer_with_cache" + "tests/test_fingerprint.py::RecurseHashTest::test_hash_ignores_line_definition_of_function" + "tests/test_fingerprint.py::RecurseHashTest::test_hash_ipython_function" + "tests/test_fingerprint.py::HashingTest::test_hash_torch_compiled_module" + "tests/test_fingerprint.py::HashingTest::test_hash_torch_generator" + "tests/test_fingerprint.py::HashingTest::test_hash_torch_tensor" + "tests/test_fingerprint.py::HashingTest::test_set_doesnt_depend_on_order" + "tests/test_fingerprint.py::HashingTest::test_set_stable" + "tests/test_fingerprint.py::test_move_script_doesnt_change_hash" + "tests/test_formatting.py::ArrowExtractorTest::test_numpy_extractor" + "tests/test_formatting.py::ArrowExtractorTest::test_numpy_extractor_nested" + "tests/test_formatting.py::ArrowExtractorTest::test_numpy_extractor_temporal" + "tests/test_formatting.py::FormatterTest::test_numpy_formatter" + "tests/test_formatting.py::FormatterTest::test_numpy_formatter_image" + "tests/test_formatting.py::FormatterTest::test_numpy_formatter_np_array_kwargs" + "tests/test_formatting.py::FormatterTest::test_torch_formatter" + "tests/test_formatting.py::FormatterTest::test_torch_formatter_image" + "tests/test_formatting.py::FormatterTest::test_torch_formatter_torch_tensor_kwargs" + "tests/test_formatting.py::test_torch_formatter_sets_default_dtypes" + "tests/test_inspect.py::test_get_dataset_config_names[hf-internal-testing/librispeech_asr_dummy-expected4]" + "tests/test_inspect.py::test_get_dataset_default_config_name[hf-internal-testing/librispeech_asr_dummy-None]" + "tests/test_inspect.py::test_inspect_dataset" + "tests/test_inspect.py::test_inspect_metric" + "tests/test_inspect.py::test_get_dataset_config_info" + "tests/test_inspect.py::test_get_dataset_config_info_error[paws-None-ValueError]" + "tests/test_inspect.py::test_get_dataset_config_names" + "tests/test_inspect.py::test_get_dataset_default_config_name" + "tests/test_inspect.py::test_get_dataset_info" + "tests/test_inspect.py::test_get_dataset_split_names" + "tests/test_inspect.py::test_get_dataset_config_info_private" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_bertscore" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_bleurt" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_chrf" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_code_eval" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_competition_math" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_coval" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_cuad" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_frugalscore" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_glue" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_google_bleu" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_indic_glue" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_mae" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_mauve" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_mean_iou" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_meteor" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_mse" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_precision" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_roc_auc" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_rouge" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_sacrebleu" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_sari" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_spearmanr" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_super_glue" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_ter" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_wiki_split" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_xnli" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_xtreme_s" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_bleu" + "tests/commands/test_test.py::test_test_command" + "tests/features/test_array_xd.py::ExtensionTypeCompatibilityTest::test_array2d_nonspecific_shape" + "tests/features/test_array_xd.py::ExtensionTypeCompatibilityTest::test_extension_indexing" + "tests/features/test_array_xd.py::ExtensionTypeCompatibilityTest::test_multiple_extensions_same_row" + "tests/features/test_array_xd.py::ArrayXDTest::test_from_dict_2d" + "tests/features/test_array_xd.py::ArrayXDTest::test_from_dict_3d" + "tests/features/test_array_xd.py::ArrayXDTest::test_from_dict_4d" + "tests/features/test_array_xd.py::ArrayXDTest::test_from_dict_5d" + "tests/features/test_array_xd.py::ArrayXDTest::test_write_2d" + "tests/features/test_array_xd.py::ArrayXDTest::test_write_3d" + "tests/features/test_array_xd.py::ArrayXDTest::test_write_4d" + "tests/features/test_array_xd.py::ArrayXDTest::test_write_5d" + "tests/features/test_array_xd.py::ArrayXDTest::test_write_batch_2d" + "tests/features/test_array_xd.py::ArrayXDTest::test_write_batch_3d" + "tests/features/test_array_xd.py::ArrayXDTest::test_write_batch_4d" + "tests/features/test_array_xd.py::ArrayXDTest::test_write_batch_5d" + "tests/features/test_array_xd.py::test_array_xd_numpy_arrow_extractor" + "tests/features/test_array_xd.py::test_array_xd_with_none" + "tests/features/test_array_xd.py::test_dataset_map" + "tests/features/test_audio.py::test_audio_feature_encode_example" + "tests/features/test_audio.py::test_audio_feature_encode_example_pcm" + "tests/features/test_audio.py::test_audio_decode_example_pcm" + "tests/features/test_audio.py::test_dataset_cast_to_audio_features" + "tests/features/test_audio.py::test_dataset_concatenate_audio_features" + "tests/features/test_audio.py::test_dataset_concatenate_nested_audio_features" + "tests/features/test_audio.py::test_dataset_with_audio_feature_undecoded" + "tests/features/test_audio.py::test_formatted_dataset_with_audio_feature_undecoded" + "tests/features/test_audio.py::test_dataset_with_audio_feature_map_undecoded" + "tests/features/test_image.py::test_formatted_dataset_with_image_feature_map" + "tests/features/test_image.py::test_formatted_dataset_with_image_feature" + "tests/features/test_image.py::test_formatted_dataset_with_image_feature_undecoded" + "tests/packaged_modules/test_cache.py::test_cache_multi_configs" + "tests/packaged_modules/test_cache.py::test_cache_single_config" + "tests/packaged_modules/test_cache.py::test_cache_capital_letters" + "tests/packaged_modules/test_folder_based_builder.py::test_data_files_with_different_levels_no_metadata" + "tests/packaged_modules/test_folder_based_builder.py::test_data_files_with_one_label_no_metadata" + "tests/test_data_files.py::test_DataFilesList_from_patterns_locally_with_extra_files" + "tests/test_data_files.py::test_DataFilesDict_from_patterns_locally_or_remote_hashing" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_natural_questions/default@19ba7767b174ad046a84f46af056517a3910ee57" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki40b/en@7b21a2e64b90323b2d3d1b81aa349bb4bc76d9bf" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.multiset.no_index@b24a417d802a583f8922946c1c75210290e93108" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.nq.compressed@b24a417d802a583f8922946c1c75210290e93108" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.nq.no_index@b24a417d802a583f8922946c1c75210290e93108" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.de@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.en@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.fr@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.frr@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.it@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.simple@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::test_as_dataset_from_hf_gcs" + "tests/test_hf_gcp.py::test_as_streaming_dataset_from_hf_gcs" + "tests/test_iterable_dataset.py::test_iterable_dataset_from_hub_torch_dataloader_parallel" + "tests/test_offline_util.py::test_offline_with_timeout" + "tests/io/test_parquet.py::test_parquet_read_geoparquet" + tests/test_exceptions.py::test_error_deprecated + tests/test_hub.py::test_convert_to_parquet + ) + distutils-r1_src_test +} diff --git a/sci-libs/datasets/files/datasets-2.17.1-tests.patch b/sci-libs/datasets/files/datasets-2.17.1-tests.patch deleted file mode 100644 index 2281598dfb38..000000000000 --- a/sci-libs/datasets/files/datasets-2.17.1-tests.patch +++ /dev/null @@ -1,364 +0,0 @@ ---- a/tests/test_arrow_dataset.py 2024-02-20 21:53:24.248470991 +0100 -+++ b/tests/test_arrow_dataset.py 2024-02-20 21:53:29.441804737 +0100 -@@ -4016,7 +4016,6 @@ - [ - "relative/path", - "/absolute/path", -- "s3://bucket/relative/path", - "hdfs://relative/path", - "hdfs:///absolute/path", - ], -@@ -4136,6 +4136,7 @@ - ) - self.assertDictEqual(features_after_cast, dset.features) - -+ @pytest.mark.skip(reason="require soundfile") - def test_task_automatic_speech_recognition(self): - # Include a dummy extra column `dummy` to test we drop it correctly - features_before_cast = Features( ---- a/tests/test_load.py 2024-02-20 22:12:13.699209107 +0100 -+++ b/tests/test_load.py 2024-02-20 22:13:10.862626708 +0100 -@@ -388,6 +388,7 @@ - hf_modules_cache=self.hf_modules_cache, - ) - -+ @pytest.mark.skip(reason="") - def test_HubDatasetModuleFactoryWithScript_dont_trust_remote_code(self): - # "lhoestq/test" has a dataset script - factory = HubDatasetModuleFactoryWithScript( -@@ -403,6 +404,7 @@ - ) - self.assertRaises(ValueError, factory.get_module) - -+ @pytest.mark.skip() - def test_HubDatasetModuleFactoryWithScript_with_github_dataset(self): - # "wmt_t2t" has additional imports (internal) - factory = HubDatasetModuleFactoryWithScript( -@@ -412,6 +414,7 @@ - assert importlib.import_module(module_factory_result.module_path) is not None - assert module_factory_result.builder_kwargs["base_path"].startswith(config.HF_ENDPOINT) - -+ @pytest.mark.skip() - def test_GithubMetricModuleFactory_with_internal_import(self): - # "squad_v2" requires additional imports (internal) - factory = GithubMetricModuleFactory( -@@ -420,6 +423,7 @@ - module_factory_result = factory.get_module() - assert importlib.import_module(module_factory_result.module_path) is not None - -+ @pytest.mark.skip() - @pytest.mark.filterwarnings("ignore:GithubMetricModuleFactory is deprecated:FutureWarning") - def test_GithubMetricModuleFactory_with_external_import(self): - # "bleu" requires additional imports (external from github) -@@ -1033,6 +1037,7 @@ - datasets.load_dataset_builder(SAMPLE_DATASET_TWO_CONFIG_IN_METADATA, "non-existing-config") - - -+@pytest.mark.skip() - @pytest.mark.parametrize("serializer", [pickle, dill]) - def test_load_dataset_builder_with_metadata_configs_pickable(serializer): - builder = datasets.load_dataset_builder(SAMPLE_DATASET_SINGLE_CONFIG_IN_METADATA) -@@ -1154,6 +1159,7 @@ - assert len(builder.config.data_files["test"]) > 0 - - -+@pytest.mark.skip() - def test_load_dataset_builder_fail(): - with pytest.raises(DatasetNotFoundError): - datasets.load_dataset_builder("blabla") -@@ -1169,6 +1175,7 @@ - assert isinstance(next(iter(dataset["train"])), dict) - - -+@pytest.mark.skip() - def test_load_dataset_cached_local_script(dataset_loading_script_dir, data_dir, caplog): - dataset = load_dataset(dataset_loading_script_dir, data_dir=data_dir) - assert isinstance(dataset, DatasetDict) ---- a/tests/test_hf_gcp.py 2024-02-21 09:59:26.918397895 +0100 -+++ b/tests/test_hf_gcp.py 2024-02-21 09:59:46.335100597 +0100 -@@ -45,6 +45,7 @@ - ] - - -+@pytest.mark.skip("network") - @parameterized.named_parameters(list_datasets_on_hf_gcp_parameters(with_config=True)) - class TestDatasetOnHfGcp(TestCase): - dataset = None ---- a/tests/test_inspect.py 2024-02-21 10:03:32.315520016 +0100 -+++ b/tests/test_inspect.py 2024-02-21 10:03:50.345553490 +0100 -@@ -49,6 +49,7 @@ - assert list(info.splits.keys()) == expected_splits - - -+@pytest.mark.skip(reason="require network") - def test_get_dataset_config_info_private(hf_token, hf_private_dataset_repo_txt_data): - info = get_dataset_config_info(hf_private_dataset_repo_txt_data, config_name="default", token=hf_token) - assert list(info.splits.keys()) == ["train"] ---- a/tests/test_data_files.py 2024-02-21 20:22:57.536160356 +0100 -+++ b/tests/test_data_files.py 2024-02-21 20:25:00.153052174 +0100 -@@ -378,6 +378,7 @@ - assert len(hub_dataset_repo_patterns_results[pattern]) == 0 - - -+@pytest.mark.skip(reason="network") - def test_DataFilesList_from_patterns_locally_with_extra_files(complex_data_dir, text_file): - data_files_list = DataFilesList.from_patterns([_TEST_URL, text_file.as_posix()], complex_data_dir) - assert list(data_files_list) == [_TEST_URL, text_file.as_posix()] -@@ -467,6 +468,7 @@ - assert Hasher.hash(data_files1) != Hasher.hash(data_files2) - - -+@pytest.mark.skip(reason="network") - def test_DataFilesDict_from_patterns_locally_or_remote_hashing(text_file): - patterns = {"train": [_TEST_URL], "test": [str(text_file)]} - data_files1 = DataFilesDict.from_patterns(patterns) ---- a/tests/packaged_modules/test_folder_based_builder.py 2024-02-21 21:30:20.718922523 +0100 -+++ b/tests/packaged_modules/test_folder_based_builder.py 2024-02-21 21:31:46.309061287 +0100 -@@ -382,6 +382,7 @@ - assert example[column] is not None - - -+@pytest.mark.skip(reason="network") - @pytest.mark.parametrize("remote", [True, False]) - @pytest.mark.parametrize("drop_labels", [None, True, False]) - def test_data_files_with_different_levels_no_metadata( -@@ -405,6 +406,7 @@ - assert all(example.keys() == {"base", "label"} for _, example in generator) - - -+@pytest.mark.skip(reason="network") - @pytest.mark.parametrize("remote", [False, True]) - @pytest.mark.parametrize("drop_labels", [None, True, False]) - def test_data_files_with_one_label_no_metadata(data_files_with_one_label_no_metadata, drop_labels, remote, cache_dir): ---- a/tests/test_metric_common.py 2023-05-04 18:48:48.550861318 +0200 -+++ b/tests/test_metric_common.py 2023-05-04 18:50:25.787364577 +0200 -@@ -93,6 +93,7 @@ - INTENSIVE_CALLS_PATCHER = {} - metric_name = None - -+ @pytest.mark.skip(reason="disabling, depends on bert_score, bleurt, math_equivalence, coval, nltk, faiss, mauve, rouge_score, sacrebleu, sacremoses ...") - @pytest.mark.filterwarnings("ignore:metric_module_factory is deprecated:FutureWarning") - @pytest.mark.filterwarnings("ignore:load_metric is deprecated:FutureWarning") - def test_load_metric(self, metric_name): ---- a/tests/test_distributed.py 2023-05-04 19:43:09.861275030 +0200 -+++ b/tests/test_distributed.py 2023-05-04 19:44:17.608326722 +0200 -@@ -74,6 +74,7 @@ - split_dataset_by_node(full_ds.shuffle(), rank=0, world_size=world_size) - - -+@pytest.mark.skip(reason="require distributed torch") - @pytest.mark.parametrize("streaming", [False, True]) - @require_torch - @pytest.mark.skipif(os.name == "nt", reason="execute_subprocess_async doesn't support windows") -@@ -95,6 +96,7 @@ - execute_subprocess_async(cmd, env=os.environ.copy()) - - -+@pytest.mark.skip(reason="require distributed torch") - @pytest.mark.parametrize( - "nproc_per_node, num_workers", - [ ---- a/tests/utils.py 2023-05-06 08:43:16.251987543 +0200 -+++ b/tests/utils.py 2023-05-06 08:44:24.467952870 +0200 -@@ -50,8 +50,8 @@ - # Audio - require_sndfile = pytest.mark.skipif( - # On Windows and OS X, soundfile installs sndfile -- find_spec("soundfile") is None or version.parse(importlib.metadata.version("soundfile")) < version.parse("0.12.0"), -- reason="test requires sndfile>=0.12.1: 'pip install \"soundfile>=0.12.1\"'; ", -+ True, -+ reason="test requires librosa", - ) - - # Beam ---- a/tests/features/test_audio.py 2023-05-06 09:03:58.680108142 +0200 -+++ a/tests/features/test_audio.py 2023-05-06 09:05:50.463407967 +0200 -@@ -57,6 +57,7 @@ - assert features.arrow_schema == pa.schema({"sequence_of_audios": pa.list_(Audio().pa_type)}) - - -+@pytest.mark.skip(reason="require librosa") - @pytest.mark.parametrize( - "build_example", - [ -@@ -81,6 +82,7 @@ - assert decoded_example.keys() == {"path", "array", "sampling_rate"} - - -+@pytest.mark.skip(reason="require librosa") - @pytest.mark.parametrize( - "build_example", - [ -@@ -148,6 +149,7 @@ - assert decoded_example["sampling_rate"] == 48000 - - -+@pytest.mark.skip(reason="require librosa") - @pytest.mark.parametrize("sampling_rate", [16_000, 48_000]) - def test_audio_decode_example_pcm(shared_datadir, sampling_rate): - audio_path = str(shared_datadir / "test_audio_16000.pcm") -@@ -414,6 +417,7 @@ - assert column[0]["sampling_rate"] == 16000 - - -+@pytest.mark.skip(reason="require librosa") - @pytest.mark.parametrize( - "build_data", - [ -@@ -438,6 +442,7 @@ - assert item["audio"].keys() == {"path", "array", "sampling_rate"} - - -+@pytest.mark.skip(reason="require librosa") - def test_dataset_concatenate_audio_features(shared_datadir): - # we use a different data structure between 1 and 2 to make sure they are compatible with each other - audio_path = str(shared_datadir / "test_audio_44100.wav") -@@ -451,6 +456,7 @@ - assert concatenated_dataset[1]["audio"]["array"].shape == dset2[0]["audio"]["array"].shape - - -+@pytest.mark.skip(reason="require librosa") - def test_dataset_concatenate_nested_audio_features(shared_datadir): - # we use a different data structure between 1 and 2 to make sure they are compatible with each other - audio_path = str(shared_datadir / "test_audio_44100.wav") -@@ -610,6 +616,7 @@ - assert isinstance(ds, Dataset) - - -+@require_sndfile - def test_dataset_with_audio_feature_undecoded(shared_datadir): - audio_path = str(shared_datadir / "test_audio_44100.wav") - data = {"audio": [audio_path]} -@@ -627,6 +634,7 @@ - assert column[0] == {"path": audio_path, "bytes": None} - - -+@require_sndfile - def test_formatted_dataset_with_audio_feature_undecoded(shared_datadir): - audio_path = str(shared_datadir / "test_audio_44100.wav") - data = {"audio": [audio_path]} -@@ -658,6 +666,7 @@ - assert column[0] == {"path": audio_path, "bytes": None} - - -+@require_sndfile - def test_dataset_with_audio_feature_map_undecoded(shared_datadir): - audio_path = str(shared_datadir / "test_audio_44100.wav") - data = {"audio": [audio_path]} ---- a/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:00:39.560876163 +0200 -+++ b/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:01:26.005212423 +0200 -@@ -1,10 +1,8 @@ - import shutil - import textwrap - --import librosa - import numpy as np - import pytest --import soundfile as sf - - from datasets import Audio, ClassLabel, Features, Value - from datasets.data_files import DataFilesDict, get_data_patterns -@@ -192,8 +190,11 @@ - return data_files_with_two_splits_and_metadata - - -+@pytest.mark.skip(reason="require soundfile") - @pytest.fixture - def data_files_with_zip_archives(tmp_path, audio_file): -+ import soundfile as sf -+ import librosa - data_dir = tmp_path / "audiofolder_data_dir_with_zip_archives" - data_dir.mkdir(parents=True, exist_ok=True) - archive_dir = data_dir / "archive" ---- a/tests/test_streaming_download_manager.py 2023-08-26 07:33:41.937389401 +0200 -+++ b/tests/test_streaming_download_manager.py 2023-08-26 07:37:22.521218698 +0200 -@@ -218,6 +218,7 @@ - assert output_path == _readd_double_slash_removed_by_path(Path(expected_path).as_posix()) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, exists", - [ -@@ -301,6 +302,7 @@ - assert list(f) == TEST_URL_CONTENT.splitlines(keepends=True) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, expected_paths", - [ -@@ -331,6 +333,7 @@ - xlistdir(root_url, download_config=download_config) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, isdir", - [ -@@ -358,6 +361,7 @@ - assert xisdir(root_url, download_config=download_config) is False - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, isfile", - [ -@@ -382,6 +386,7 @@ - assert xisfile(root_url + "qwertyuiop", download_config=download_config) is False - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, size", - [ -@@ -407,6 +412,7 @@ - xgetsize(root_url + "qwertyuiop", download_config=download_config) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, expected_paths", - [ -@@ -450,6 +456,7 @@ - assert len(xglob("zip://qwertyuiop/*::" + root_url, download_config=download_config)) == 0 - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, expected_outputs", - [ -@@ -540,6 +547,7 @@ - def test_xpath_as_posix(self, input_path, expected_path): - assert xPath(input_path).as_posix() == expected_path - -+ @pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, exists", - [ -@@ -555,6 +563,7 @@ - (tmp_path / "file.txt").touch() - assert xexists(input_path) is exists - -+ @pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, pattern, expected_paths", - [ -@@ -593,6 +602,7 @@ - output_paths = sorted(xPath(input_path).glob(pattern)) - assert output_paths == expected_paths - -+ @pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, pattern, expected_paths", - [ ---- a/tests/io/test_parquet.py 2024-02-22 19:19:53.890749240 +0100 -+++ b/tests/io/test_parquet.py 2024-02-22 19:20:30.954099914 +0100 -@@ -69,6 +69,7 @@ - _check_parquet_dataset(dataset, expected_features) - - -+@pytest.mark.skip() - def test_parquet_read_geoparquet(geoparquet_path, tmp_path): - cache_dir = tmp_path / "cache" - dataset = ParquetDatasetReader(path_or_paths=geoparquet_path, cache_dir=cache_dir).read() diff --git a/sci-libs/datasets/files/datasets-2.19.2-tests.patch b/sci-libs/datasets/files/datasets-2.19.2-tests.patch new file mode 100644 index 000000000000..64df833032c5 --- /dev/null +++ b/sci-libs/datasets/files/datasets-2.19.2-tests.patch @@ -0,0 +1,23 @@ +--- a/tests/test_arrow_dataset.py 2024-02-20 21:53:24.248470991 +0100 ++++ b/tests/test_arrow_dataset.py 2024-02-20 21:53:29.441804737 +0100 +@@ -4109,7 +4109,6 @@ + [ + "relative/path", + "/absolute/path", +- "s3://bucket/relative/path", + "hdfs://relative/path", + "hdfs:///absolute/path", + ], +--- a/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:00:39.560876163 +0200 ++++ b/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:01:26.005212423 +0200 +@@ -1,10 +1,8 @@ + import shutil + import textwrap + +-import librosa + import numpy as np + import pytest +-import soundfile as sf + + from datasets import Audio, ClassLabel, Features, Value + from datasets.data_files import DataFilesDict, get_data_patterns diff --git a/sci-libs/dcmtk/dcmtk-3.6.8.ebuild b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild index ed291a83e208..ed8e58cef155 100644 --- a/sci-libs/dcmtk/dcmtk-3.6.8.ebuild +++ b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz" LICENSE="OFFIS" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="doc png ssl tcpd tiff +threads xml zlib" RDEPEND=" diff --git a/sci-libs/foxi/foxi-2021.05.27.ebuild b/sci-libs/foxi/foxi-2021.05.27.ebuild index 667c6691565a..ef8a2caf3511 100644 --- a/sci-libs/foxi/foxi-2021.05.27.ebuild +++ b/sci-libs/foxi/foxi-2021.05.27.ebuild @@ -11,14 +11,14 @@ HOMEPAGE="https://github.com/houseroad/foxi/" SRC_URI="https://github.com/houseroad/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" RESTRICT="test" # No test available -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest index a47edd02beb0..5566b85d76ba 100644 --- a/sci-libs/fplll/Manifest +++ b/sci-libs/fplll/Manifest @@ -1 +1,2 @@ DIST fplll-5.4.5.tar.gz 2630275 BLAKE2B 43d1601f401c3a4eba60939028b26f99d32f92b9d53b763768427d05b2d709645532c4fbb14556c8d8d92cc14efe86468469ed69a77bdb03af75ec08499cc17e SHA512 3e1281f1b993ebe4a767b7fc526f49a27d58f24b1b4c6074310cc971f6f569388d6ba27102087a2eb11671d2d5b87bd60306e2597567f4ae8dd2a9efd13beb77 +DIST fplll-5.5.0.tar.gz 2633527 BLAKE2B 47a5b53fea261cb08ac04a939108414f692280806a7c12ebf851f309cfccbeb360dd1777ac595e9eacae1f23b51c6437c11c91964a04242f3a45af9f8b28de75 SHA512 c070dab206ebf692aa2afd8e6cdf412b5497488e8205332b4b726dd69283f415f86d1bcb55937a678cacd47b2068eea3f776eae8e050c4096e48d1cefd3de291 diff --git a/sci-libs/fplll/fplll-5.5.0.ebuild b/sci-libs/fplll/fplll-5.5.0.ebuild new file mode 100644 index 000000000000..fc8117803c94 --- /dev/null +++ b/sci-libs/fplll/fplll-5.5.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Implementations of the floating-point LLL reduction algorithm" +HOMEPAGE="https://github.com/fplll/fplll" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0/8" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="qd" + +BDEPEND="virtual/pkgconfig" +DEPEND="dev-libs/gmp:0 + dev-libs/mpfr:0 + qd? ( sci-libs/qd )" +RDEPEND="${DEPEND}" + +src_configure() { + econf \ + $(use_with qd) +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sci-libs/gdal/gdal-3.9.1-r1.ebuild b/sci-libs/gdal/gdal-3.9.1-r1.ebuild new file mode 100644 index 000000000000..ceed348d315a --- /dev/null +++ b/sci-libs/gdal/gdal-3.9.1-r1.ebuild @@ -0,0 +1,287 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake java-pkg-opt-2 python-single-r1 + +DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" +HOMEPAGE="https://gdal.org/" +SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz" +SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz )" + +LICENSE="BSD Info-ZIP MIT" +SLOT="0/35" # subslot is libgdal.so.<SONAME> +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lerc lzma mysql netcdf odbc ogdi opencl oracle parquet pdf png postgres python spatialite sqlite test webp xls zstd" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + spatialite? ( sqlite ) + test? ( ${PYTHON_REQUIRED_USE} ) +" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) + java? ( + >=dev-java/ant-1.10.14-r3:0 + dev-lang/swig + ) + python? ( + dev-lang/swig + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + test? ( + ${PYTHON_DEPS} + dev-cpp/gtest + ) +" +DEPEND=" + dev-libs/expat + dev-libs/json-c:= + dev-libs/libpcre2 + dev-libs/libxml2:2 + dev-libs/openssl:= + media-libs/tiff + >=sci-libs/libgeotiff-1.5.1-r1:= + >=sci-libs/proj-6.0.0:= + sys-libs/zlib[minizip(+)] + armadillo? ( sci-libs/armadillo:=[lapack] ) + curl? ( net-misc/curl ) + fits? ( sci-libs/cfitsio:= ) + geos? ( >=sci-libs/geos-3.8.0 ) + gif? ( media-libs/giflib:= ) + gml? ( >=dev-libs/xerces-c-3.1 ) + heif? ( media-libs/libheif:= ) + hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) + java? ( + >=virtual/jdk-1.8:*[-headless-awt] + ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + lerc? ( media-libs/tiff:=[lerc(-)] ) + lzma? ( || ( + app-arch/xz-utils + app-arch/lzma + ) ) + mysql? ( virtual/mysql ) + netcdf? ( sci-libs/netcdf:= ) + odbc? ( dev-db/unixODBC ) + ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) + opencl? ( virtual/opencl ) + oracle? ( dev-db/oracle-instantclient:= ) + parquet? ( dev-libs/apache-arrow:=[dataset,parquet] ) + pdf? ( app-text/poppler:= ) + png? ( media-libs/libpng:= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) + spatialite? ( dev-db/spatialite ) + sqlite? ( dev-db/sqlite:3 ) + webp? ( media-libs/libwebp:= ) + xls? ( dev-libs/freexl ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND=" + ${DEPEND} + java? ( >=virtual/jre-1.8:* ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + _wstat64 # Windows LFS +) + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch +) + +pkg_setup() { + if use python || use test ; then + python-single-r1_pkg_setup + fi + + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + if use test ; then + mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die + fi +} + +src_configure() { + local mycmakeargs=( + -DENABLE_IPO=OFF + -DGDAL_USE_EXTERNAL_LIBS=ON + -DGDAL_USE_INTERNAL_LIBS=OFF + -DBUILD_TESTING=$(usex test) + + # bug #844874 and bug #845150 + -DCMAKE_INSTALL_INCLUDEDIR="include/gdal" + + # Options here are generally off because of one of: + # - Not yet packaged dependencies + # + # - Off for autotools build and didn't want more churn by + # enabling during port to CMake. Feel free to request them + # being turned on if useful for you. + -DGDAL_USE_ARMADILLO=$(usex armadillo) + -DGDAL_USE_ARROW=OFF + -DGDAL_USE_BLOSC=OFF + -DGDAL_USE_BRUNSLI=OFF + -DGDAL_USE_CRNLIB=OFF + -DGDAL_USE_CFITSIO=$(usex fits) + -DGDAL_USE_CURL=$(usex curl) + -DGDAL_USE_CRYPTOPP=OFF + -DGDAL_USE_DEFLATE=OFF + -DGDAL_USE_ECW=OFF + -DGDAL_USE_EXPAT=ON + -DGDAL_USE_FILEGDB=OFF + -DGDAL_USE_FREEXL=$(usex xls) + -DGDAL_USE_FYBA=OFF + -DGDAL_USE_GEOTIFF=ON + -DGDAL_USE_GEOS=$(usex geos) + -DGDAL_USE_GIF=$(usex gif) + -DGDAL_USE_GTA=OFF + -DGDAL_USE_HEIF=$(usex heif) + -DGDAL_USE_HDF4=OFF + -DGDAL_USE_HDF5=$(usex hdf5) + -DGDAL_USE_HDFS=OFF + -DGDAL_USE_ICONV=ON # TODO dep + -DGDAL_USE_IDB=OFF + -DGDAL_USE_JPEG=$(usex jpeg) + + # https://gdal.org/build_hints.html#jpeg12 + # Independent of whether using system libjpeg + -DGDAL_USE_JPEG12_INTERNAL=ON + + -DGDAL_USE_JSONC=ON + -DGDAL_USE_JXL=OFF + -DGDAL_USE_KDU=OFF + -DGDAL_USE_KEA=OFF + -DGDAL_USE_LERC=$(usex lerc) + -DGDAL_USE_LIBKML=OFF + -DGDAL_USE_LIBLZMA=$(usex lzma) + -DGDAL_USE_LIBXML2=ON + -DGDAL_USE_LURATECH=OFF + -DGDAL_USE_LZ4=OFF + -DGDAL_USE_MONGOCXX=OFF + -DGDAL_USE_MRSID=OFF + -DGDAL_USE_MSSQL_NCLI=OFF + -DGDAL_USE_MSSQL_ODBC=OFF + -DGDAL_USE_MYSQL=$(usex mysql) + -DGDAL_USE_NETCDF=$(usex netcdf) + -DGDAL_USE_ODBC=$(usex odbc) + -DGDAL_USE_ODBCCPP=OFF + -DGDAL_USE_OGDI=$(usex ogdi) + -DGDAL_USE_OPENCAD=OFF + -DGDAL_USE_OPENCL=$(usex opencl) + -DGDAL_USE_OPENEXR=OFF + -DGDAL_USE_OPENJPEG=$(usex jpeg2k) + -DGDAL_USE_OPENSSL=ON + -DGDAL_USE_ORACLE=$(usex oracle) + -DGDAL_USE_PARQUET=$(usex parquet) + -DGDAL_USE_PCRE2=ON + -DGDAL_USE_PDFIUM=OFF + -DGDAL_USE_PNG=$(usex png) + -DGDAL_USE_PODOFO=OFF + -DGDAL_USE_POPPLER=$(usex pdf) + -DGDAL_USE_POSTGRESQL=$(usex postgres) + -DGDAL_USE_QHULL=OFF + -DGDAL_USE_RASTERLITE2=OFF + -DGDAL_USE_RDB=OFF + -DGDAL_USE_SPATIALITE=$(usex spatialite) + -DGDAL_USE_SQLITE3=$(usex sqlite) + -DGDAL_USE_SFCGAL=OFF + -DGDAL_USE_TEIGHA=OFF + -DGDAL_USE_TIFF=ON + -DGDAL_USE_TILEDB=OFF + -DGDAL_USE_WEBP=$(usex webp) + -DGDAL_USE_XERCESC=$(usex gml) + -DGDAL_USE_ZLIB=ON + -DGDAL_USE_ZSTD=$(usex zstd) + + # Bindings + -DBUILD_PYTHON_BINDINGS=$(usex python) + -DBUILD_JAVA_BINDINGS=$(usex java) + # bug #845369 + -DBUILD_CSHARP_BINDINGS=OFF + + # Check work/gdal-3.5.0_build/CMakeCache.txt after configure + # and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71 + # Commented out: not (yet?) implemented upstream. + # Also, arm64 stuff is a TODO upstream, but not there (yet?) + -Dtest_avx=$(usex cpu_flags_x86_avx) + -Dtest_avx2=$(usex cpu_flags_x86_avx2) + -Dtest_sse=$(usex cpu_flags_x86_sse) + -Dtest_sse2=$(usex cpu_flags_x86_sse2) + #-Dtest_sse3=$(usex cpu_flags_x86_sse3) + -Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1) + #-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2) + #-Dtest_sse4a=$(usex cpu_flags_x86_sse4a) + -Dtest_ssse3=$(usex cpu_flags_x86_ssse3) + #-Dtest_fma4=$(usex cpu_flags_x86_fma4) + #-Dtest_xop=$(usex cpu_flags_x86_xop) + ) + + if use test ; then + mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_src_compile doc +} + +src_test() { + export GDAL_RUN_SLOW_TESTS=0 + export GDAL_DOWNLOAD_TEST_DATA=0 + + # Two test suites: + # 1. autotests (much larger, uses pytest) + # 2. Small set of fuzzing tests (no download needed) + + # Missing file for test-unit? + cmake_src_test -E "(test-unit)" +} + +src_install() { + cmake_src_install + use python && python_optimize + + if use java; then + # Move the native library into the proper place for Gentoo. The + # library in ${D} has already had its RPATH fixed, so we use it + # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. + java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" + rm -rf "${ED}/usr/$(get_libdir)/jni" || die + fi + + # TODO: install docs? +} + +pkg_postinst() { + elog "Check available image and data formats after building with" + elog "gdalinfo and ogrinfo (using the --formats switch)." + + if use java; then + elog + elog "To use the Java bindings, you need to pass the following to java:" + elog " -Djava.library.path=$(java-config -i gdal)" + fi +} diff --git a/sci-libs/gdal/gdal-3.9.1.ebuild b/sci-libs/gdal/gdal-3.9.1.ebuild index db84788cf355..22717aa1fd76 100644 --- a/sci-libs/gdal/gdal-3.9.1.ebuild +++ b/sci-libs/gdal/gdal-3.9.1.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta LICENSE="BSD Info-ZIP MIT" SLOT="0/35" # subslot is libgdal.so.<SONAME> -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle parquet pdf png postgres python spatialite sqlite test webp xls zstd" RESTRICT="!test? ( test )" diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index 9fca3d6d3ed3..1e40fec0618c 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,5 +1,3 @@ -DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f98df95d5aaf9f6fd957ebcdbdefb43ae4fb17a5a671b6dfdb812bdacfdbfdfdea6e5bd44f135e3701a3cc914d SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189 -DIST geos-3.11.1.tar.bz2 6753232 BLAKE2B 376050ca3224e5220f69d82ff62d79ff7ea3d35d5fe90b7ab4e0cabcb4200b47d7569110538c201df9cb28da784f09f8207a9a8233ee002ab2ec87f5cf336ba1 SHA512 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3 DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff985555e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec -DIST geos-3.12.0.tar.bz2 6736650 BLAKE2B abdf1c524fa35dccfe253f9774a57768a7597b3fb5ede99dbb5c473a3de5a2c8bcef7cd892ebf3768179a85b365394163fd38efb661f014d23828618178505d0 SHA512 cc67d9516d24ada2ceaf7c81ff9df40033bb15123160bf7e70fdff97b72c798f4b9ba8223c1eaebac0f33dcb530bc8cf42af000af3491f3227420290d89332d5 DIST geos-3.12.1.tar.bz2 6727199 BLAKE2B 4ffc9cb63f3ac15b3dcb0ba9fec6a1ccaeaf35962a057234f4da38d6bba19df39e800805badfd56fe927da09c9392f0feaf2b7d02085e8f293c4d9503ab28ff9 SHA512 192eba83c651e935b3c9a5cc19321285e4d28b9da9d7a1fa15d9471803027e630db7a7ecea96343d9c5f9846d279062ca3694fe47916a4ebf5698ae66dd5210d +DIST geos-3.13.0.tar.bz2 6801211 BLAKE2B 8de35093e2819268df2cd15f1661dcbaba6b9c3bd978904fb992fd91905b0056cfa6580cae602511bd8c4b19686597abb81e0af71a8a73a684cafd8013755bad SHA512 8ffaa3f49a8365db693ac948e9d66cf55321eb12151734c7da2775070b7804ffa607de2474b7019d6ea2a99d5e037fb1e8561bf9025e65ddd4bd1ba049382b28 diff --git a/sci-libs/geos/geos-3.11.0.ebuild b/sci-libs/geos/geos-3.11.0.ebuild deleted file mode 100644 index 25b7decf53b3..000000000000 --- a/sci-libs/geos/geos-3.11.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Geometry engine library for Geographic Information Systems" -HOMEPAGE="https://libgeos.org/" -SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( app-text/doxygen )" - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc) - -DBUILD_TESTING=$(usex test) - -DUSE_CCACHE=OFF - - # bug #709368 - $(usex arm '-DDISABLE_GEOS_INLINE=ON' '') - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile docs -} - -src_install() { - cmake_src_install - - if use doc ; then - HTML_DOCS=( "${BUILD_DIR}"/doxygen/doxygen_docs/html/. ) - einstalldocs - fi -} diff --git a/sci-libs/geos/geos-3.11.1.ebuild b/sci-libs/geos/geos-3.11.1.ebuild deleted file mode 100644 index a5cfc6f35abd..000000000000 --- a/sci-libs/geos/geos-3.11.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Geometry engine library for Geographic Information Systems" -HOMEPAGE="https://libgeos.org/" -SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( app-text/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-gcc-13.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc) - -DBUILD_TESTING=$(usex test) - -DUSE_CCACHE=OFF - - # bug #709368 - $(usex arm '-DDISABLE_GEOS_INLINE=ON' '') - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile docs -} - -src_install() { - cmake_src_install - - if use doc ; then - HTML_DOCS=( "${BUILD_DIR}"/doxygen/doxygen_docs/html/. ) - einstalldocs - fi -} diff --git a/sci-libs/geos/geos-3.12.1.ebuild b/sci-libs/geos/geos-3.12.1.ebuild index 28aa46b4d863..d79086d95a41 100644 --- a/sci-libs/geos/geos-3.12.1.ebuild +++ b/sci-libs/geos/geos-3.12.1.ebuild @@ -27,9 +27,6 @@ src_configure() { -DBUILD_DOCUMENTATION=$(usex doc) -DBUILD_TESTING=$(usex test) -DUSE_CCACHE=OFF - - # bug #709368 - $(usev arm '-DDISABLE_GEOS_INLINE=ON') ) cmake_src_configure diff --git a/sci-libs/geos/geos-3.12.0.ebuild b/sci-libs/geos/geos-3.13.0.ebuild index 8c629724b3c8..bd059b420ac0 100644 --- a/sci-libs/geos/geos-3.12.0.ebuild +++ b/sci-libs/geos/geos-3.13.0.ebuild @@ -27,9 +27,6 @@ src_configure() { -DBUILD_DOCUMENTATION=$(usex doc) -DBUILD_TESTING=$(usex test) -DUSE_CCACHE=OFF - - # bug #709368 - $(usev arm '-DDISABLE_GEOS_INLINE=ON') ) cmake_src_configure diff --git a/sci-libs/geos/metadata.xml b/sci-libs/geos/metadata.xml index cc52aafc5a7e..c432d56fb480 100644 --- a/sci-libs/geos/metadata.xml +++ b/sci-libs/geos/metadata.xml @@ -19,6 +19,8 @@ functions, and topological validity checking. </longdescription> <upstream> + <bugs-to>https://github.com/libgeos/geos/issues</bugs-to> + <changelog>https://libgeos.org/posts</changelog> <remote-id type="github">libgeos/geos</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/givaro/files/givaro-4.2.0-gcc15.patch b/sci-libs/givaro/files/givaro-4.2.0-gcc15.patch new file mode 100644 index 000000000000..ddceae7b22ab --- /dev/null +++ b/sci-libs/givaro/files/givaro-4.2.0-gcc15.patch @@ -0,0 +1,26 @@ +From 4d0712be1180f034ac698d944c1cefb3decf351a Mon Sep 17 00:00:00 2001 +From: Doug Torrance <dtorrance@piedmont.edu> +Date: Thu, 3 Oct 2024 13:26:16 -0400 +Subject: [PATCH] Fix build using GCC 15 + +max is an rint, which doesn't have a "Low" member. But max.Value, +which is an ruint, does. + +Closes: #232 +--- + src/kernel/recint/rfiddling.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kernel/recint/rfiddling.h b/src/kernel/recint/rfiddling.h +index 3865eb3b..3ea16e91 100644 +--- a/src/kernel/recint/rfiddling.h ++++ b/src/kernel/recint/rfiddling.h +@@ -167,7 +167,7 @@ namespace RecInt + template <size_t K> + inline rint<K> rint<K>::maxFFLAS() { + rint<K> max; +- set_highest_bit(max.Low.Value); ++ set_highest_bit(max.Value.Low.Value); + return max; + } + diff --git a/sci-libs/givaro/givaro-4.2.0-r1.ebuild b/sci-libs/givaro/givaro-4.2.0-r1.ebuild new file mode 100644 index 000000000000..6395b5ddd659 --- /dev/null +++ b/sci-libs/givaro/givaro-4.2.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="C++ library for arithmetic and algebraic computations" +HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/" +SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="CeCILL-B" +SLOT="0/9" # soname major +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( + app-text/doxygen[dot] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) +" +DEPEND="dev-libs/gmp:0[cxx(+)]" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog README.md ) + +PATCHES=( + "${FILESDIR}/givaro-4.1.1-fix-pc-libdir.patch" + "${FILESDIR}/${P}-configure.ac-fix-a-bashism.patch" + "${FILESDIR}/${P}-cstdint.patch" + "${FILESDIR}/${P}-gcc14.patch" + "${FILESDIR}/${P}-gcc15.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --with-docdir="/usr/share/doc/${PF}/html" \ + $(use_enable doc) +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sci-libs/gloo/gloo-2023.07.19.ebuild b/sci-libs/gloo/gloo-2023.07.19.ebuild index 5bdcf1d00a44..e7f134898b96 100644 --- a/sci-libs/gloo/gloo-2023.07.19.ebuild +++ b/sci-libs/gloo/gloo-2023.07.19.ebuild @@ -11,6 +11,8 @@ HOMEPAGE="https://github.com/facebookincubator/gloo/" SRC_URI="https://github.com/facebookincubator/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -32,8 +34,6 @@ DEPEND="${RDEPEND} BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="test" # For some test the network is needed -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( "${FILESDIR}"/${PN}-2022.05.18-gentoo.patch "${FILESDIR}"/${PN}-2023.01.17-cuda.patch diff --git a/sci-libs/gsl/gsl-2.7.1-r3.ebuild b/sci-libs/gsl/gsl-2.7.1-r3.ebuild index 6fcb37b119c4..1141ba3c0fd4 100644 --- a/sci-libs/gsl/gsl-2.7.1-r3.ebuild +++ b/sci-libs/gsl/gsl-2.7.1-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz LICENSE="GPL-3+" # Usually 0/${PV} but check SLOT="0/27" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="cblas-external +deprecated static-libs" RDEPEND="cblas-external? ( virtual/cblas:= )" diff --git a/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild b/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild index 87cb0f37705b..b03531bb034a 100644 --- a/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild +++ b/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="NCSA-HDF" SLOT="0/311" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="cxx debug examples fortran +hl mpi szip test threads unsupported zlib" RESTRICT="!test? ( test )" REQUIRED_USE=" diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild index 574f185be5d7..021ed71fd7cd 100644 --- a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild +++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild @@ -38,7 +38,7 @@ BDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/joblib[${PYTHON_USEDEP}] ') - $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') + $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') test? ( dev-cpp/gtest ) diff --git a/sci-libs/ideep/Manifest b/sci-libs/ideep/Manifest index 9def4f3ea3e9..31ba505629cb 100644 --- a/sci-libs/ideep/Manifest +++ b/sci-libs/ideep/Manifest @@ -1,2 +1,2 @@ -DIST ideep-3.1.1.tar.gz 57015 BLAKE2B 054bb0363b5a6e8c40bf1192d557163f2e90195cbf3387562d5bf05a18eb0f3f2a45e5398ed0895ecc07807e753ab4f1a6375b12ede06aea33cc22e1e1d9cdb4 SHA512 1d636072512d90c1c47c0a976787a1fdaecdbd993ee319c40a2fbbc702143a0a752128e76e99f483d5628f64814684aa39b7355b2df675a4247037ddeeff03e5 DIST ideep-3.3.2.tar.gz 57631 BLAKE2B 57ec733a3bf9e6e8ebdebdeb63000adcef8e9ecda00118c88bca24a80fd71602b5dc3d46892410d0231d2ecf2111d5a08c3a4e95bb785964cfc4c5d6c81537f0 SHA512 e0a9ca99f25b488e38b8887099c015ed0e67cc5c350c922b85f746e25c88e07a3291f8f5d71aef5f37c72814f32e00d81ec16853a425e0fe735c71c5fccc6a41 +DIST ideep-3.5.3_p2.tar.gz 63267 BLAKE2B 8797b5ff222824ef135496c39cdeb41c646ae2d7538a75688d554933529de1fa5126fa19e95d0d0199e6cef348c6ede49ccb7a10235d9f434c4f108991c1b299 SHA512 033ec14e50b50fde7f213656c784cc81a12b4ff0a67b019e8efc00e0703bdff5b5aed44bad5cab75e50d014ea9db5a2ec5490f62ff7208824d08a5df451cc64a diff --git a/sci-libs/ideep/files/ideep-3.1.1-20230825.patch b/sci-libs/ideep/files/ideep-3.1.1-20230825.patch deleted file mode 100644 index a8625e758b00..000000000000 --- a/sci-libs/ideep/files/ideep-3.1.1-20230825.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6f4d653802bd43bc4eda515460df9f90353dbebe Mon Sep 17 00:00:00 2001 -From: leslie-fang-intel <leslie.fang@intel.com> -Date: Fri, 25 Aug 2023 13:37:20 +0800 -Subject: [PATCH] reland remove conv weight scale reciprocal (#226) - ---- - include/ideep.hpp | 2 +- - include/ideep/operators/conv.hpp | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/include/ideep.hpp b/include/ideep.hpp -index 7e02c366..a11c3553 100644 ---- a/include/ideep.hpp -+++ b/include/ideep.hpp -@@ -48,6 +48,6 @@ - #define IDEEP_VERSION_MAJOR DNNL_VERSION_MAJOR - #define IDEEP_VERSION_MINOR DNNL_VERSION_MINOR - #define IDEEP_VERSION_PATCH DNNL_VERSION_PATCH --#define IDEEP_VERSION_REVISION 0 -+#define IDEEP_VERSION_REVISION 1 - - #endif -diff --git a/include/ideep/operators/conv.hpp b/include/ideep/operators/conv.hpp -index 49677ff6..27ee84b6 100644 ---- a/include/ideep/operators/conv.hpp -+++ b/include/ideep/operators/conv.hpp -@@ -161,9 +161,6 @@ struct conv_deconv_utils { - weights_scales_in.size(), oc_per_group, groups, is_deconv); - auto wei_scales = weights_scales_in; - if (!std::all_of(wei_scales.begin(), wei_scales.end(), [](float i){ return i == 1.0f; })) { -- for (auto& s : wei_scales) { -- s = 1.0 / s; -- } - op_attr.set_scales(DNNL_ARG_WEIGHTS, wei_scale_mask, wei_scales); - } - if (dst_scales_in[0] != 1.0f) { diff --git a/sci-libs/ideep/ideep-3.3.2.ebuild b/sci-libs/ideep/ideep-3.3.2.ebuild index 58a69716df8e..dbf932362e8d 100644 --- a/sci-libs/ideep/ideep-3.3.2.ebuild +++ b/sci-libs/ideep/ideep-3.3.2.ebuild @@ -9,12 +9,12 @@ HOMEPAGE="https://github.com/intel/ideep" SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${MYP}.tar.gz -> ${PF}.tar.gz" +S="${WORKDIR}"/ideep-${MYP} + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -S="${WORKDIR}"/ideep-${MYP} - src_install() { doheader -r include/* } diff --git a/sci-libs/ideep/ideep-3.1.1.ebuild b/sci-libs/ideep/ideep-3.5.3_p2.ebuild index 8f892eea0ed5..b8203c85ce6e 100644 --- a/sci-libs/ideep/ideep-3.1.1.ebuild +++ b/sci-libs/ideep/ideep-3.5.3_p2.ebuild @@ -3,20 +3,18 @@ EAPI=8 -MYP=pytorch-rls-v${PV} +MYP=pytorch-rls-v${PV/_p/-} DESCRIPTION="Intel® Optimization for Chainer" HOMEPAGE="https://github.com/intel/ideep" SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${MYP}.tar.gz - -> ${PF}.tar.gz" + -> ${P}.tar.gz" + +S="${WORKDIR}"/ideep-${MYP} LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -PATCHES=( "${FILESDIR}"/${P}-20230825.patch ) - -S="${WORKDIR}"/ideep-${MYP} - src_install() { doheader -r include/* } diff --git a/sci-libs/iml/iml-1.0.5-r1.ebuild b/sci-libs/iml/iml-1.0.5-r1.ebuild index f967cdfd1ab6..94dfc5229ec5 100644 --- a/sci-libs/iml/iml-1.0.5-r1.ebuild +++ b/sci-libs/iml/iml-1.0.5-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2" # COPYING is GPL-2, but the files under src/ all have a BSD header LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" DEPEND="virtual/cblas" RDEPEND="${DEPEND}" diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest index 6d3e86309a7c..e71fd407674f 100644 --- a/sci-libs/inchi/Manifest +++ b/sci-libs/inchi/Manifest @@ -1,4 +1,2 @@ -DIST inchi-1.04-doc.zip 2128303 BLAKE2B 041ee948e8a852b66e64c8b04a52a4b4972a750ebdc0e31ce68e6bacfae4d81e49e8356cde766fc87affacc6839c015d5e578e9bacff486605ce5d6b63ed1552 SHA512 930fe10ac2bae11074b7e47446b5af9c01e2aa55f891d04912c71c76e214871c78cc22b3dafea99b57eede5080ac0cfaa6b6d35a73242c8549bea8ffa86e7df7 -DIST inchi-1.04.zip 2701930 BLAKE2B 12e5153fdefffdd97794b3942936f93742729cd195a1be0687762263e1d8aa9b0130a79cc1c8a652d2cad67b14a175b8f5ad968c83094f9ebf250f43bcebc18c SHA512 c5a1c2f08d472fcde603acbd898a9a8880407474869eadf0089444503693ae89ff805c579161cb3ee9d7f18e891289a21c4b8a65cc7ece69ee730f7f4e283be4 DIST inchi-1.06-doc.zip 4143516 BLAKE2B 10daaffe40c1ce523ec1f51e090d4cb0080f17ee103859a872eb2a5606b06e84b25459c3ed0492e5009d4898caef36ce251c34bea8148ee773e4c9bff7f0ba3d SHA512 df31014d21d46498e3bcde85d8c782a23193225e8d3b6ba7f6e31816c935c8ea1a60b2472fb0cd81733a47ae71918de973324ccd20a49fea3808bdfed92e6850 DIST inchi-1.06.zip 2931129 BLAKE2B 9ae317b359e886c5e16f6c5f2ef6037c1b9f46b4928b1cb372d7dc4ec9f50e695bd58424eb30c75b823f8c12d392a4aa0070161c43a448e6a078d2427df8c956 SHA512 56248030f30b0fa065cb783353cc9eab0da0e39b580a54120e9fca0a2ad8a0cfc85da1ea81b6231e48cfd59a3a5d81e1c6310778d913c21ec3f2e72d6a7fad8a diff --git a/sci-libs/inchi/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch deleted file mode 100644 index 6a47ce99c294..000000000000 --- a/sci-libs/inchi/files/inchi-1.03-shared.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/INCHI_API/gcc_so_makefile/makefile -+++ b/INCHI_API/gcc_so_makefile/makefile -@@ -213,9 +213,11 @@ $(INCHI_LIB_PATHNAME).so$(VERSION): $(INCHI_LIB_OBJS) - $(SHARED_LINK) $(SHARED_LINK_PARM) -o \ - $(INCHI_LIB_PATHNAME).so$(VERSION) \ - $(INCHI_LIB_OBJS) \ -- -Wl$(LINUX_MAP)$(LINUX_Z_RELRO),-soname,$(INCHI_LIB_NAME).so$(MAIN_VERSION) -+ -Wl$(LINUX_MAP)$(LINUX_Z_RELRO),-soname,$(INCHI_LIB_NAME).so$(MAIN_VERSION) -lm - ln -fs $(INCHI_LIB_NAME).so$(VERSION) \ - $(INCHI_LIB_PATHNAME).so$(MAIN_VERSION) -+ ln -fs $(INCHI_LIB_NAME).so$(VERSION) \ -+ $(INCHI_LIB_PATHNAME).so - - endif - diff --git a/sci-libs/inchi/inchi-1.04-r1.ebuild b/sci-libs/inchi/inchi-1.04-r1.ebuild deleted file mode 100644 index 47eba9dec162..000000000000 --- a/sci-libs/inchi/inchi-1.04-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Program and library for generating standard and non-standard InChI and InChIKeys" -HOMEPAGE="http://www.iupac.org/inchi/" -SRC_URI=" - http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-API.ZIP -> ${P}.zip - doc? ( http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-DOC.ZIP -> ${P}-doc.zip )" -S="${WORKDIR}"/INCHI-1-API - -LICENSE="IUPAC-InChi" -SLOT="0" -KEYWORDS="amd64 arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -BDEPEND="app-arch/unzip" - -PATCHES=( - "${FILESDIR}"/${PN}-1.03-shared.patch -) - -src_configure() { - tc-export AR RANLIB -} - -src_compile() { - local dir common_opts - common_opts=( - C_COMPILER=$(tc-getCC) - CPP_COMPILER=$(tc-getCXX) - LINKER="$(tc-getCXX) ${LDFLAGS}" - SHARED_LINK="$(tc-getCC) ${LDFLAGS} -shared" - C_COMPILER_OPTIONS="\${P_INCL} -ansi -DCOMPILE_ANSI_ONLY ${CFLAGS} -c " - CPP_COMPILER_OPTIONS="\${P_INCL} -D_LIB -ansi ${CXXFLAGS} -frtti -c " - C_OPTIONS="${CFLAGS} -fPIC -c " - LINKER_OPTIONS="${LDFLAGS}" - CREATE_MAIN= - ISLINUX=1 - ) - for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do - pushd ${dir} > /dev/null || die - emake \ - "${common_opts[@]}" - popd > /dev/null || die - done -} - -src_install() { - dodoc readme*.txt - if use doc ; then - cd "${WORKDIR}"/INCHI-1-DOC || die - docinto doc - dodoc *.pdf readme.txt - fi - dobin "${S}"/INCHI/gcc/inchi-1/inchi-1 - cd "${S}"/INCHI_API/gcc_so_makefile/result || die - rm *gz || die - dolib.so lib*so* - doheader ../../inchi_main/inchi_api.h -} diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index 5e7988c52182..8256b676b9c3 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,3 +1,2 @@ -DIST indilib-2.0.8.tar.gz 2851129 BLAKE2B 061ed06bbb122e5579d881ff76d84e6629045eb9972da68fb0c66554f453e7a0660c0017858b8626af70a114bf099c3f7397c6789f41ed99335bde0de767fb95 SHA512 a9b4c5efe9841c024a7ccc271b2de6626ee442d3543f621822522950cc7549def9de111e66e6d183e0a63bead6d1e211fa6025463f9ca4bad30b7a457c5f66b9 -DIST indilib-2.0.9.tar.gz 2894181 BLAKE2B 888209ce864ee324c842b1847c4f2c9b279a614b81be66597cc194cd7d67327565a1cd30b2c22b76c467ba513d1d61215bdf91161a634421ed36737b4256340b SHA512 b5e1ef58c2139bd5dd79e72d9d25d5c0730f29dff2db0001db5b1d0eff029f60f714c13e14e820f5ccfa8ab6cba25f4cd16e699f9842fa722ef961d00fc8c4a4 DIST indilib-2.1.0.tar.gz 2899251 BLAKE2B 3e9a52f295c543f703a8b17bda5219363481f432d3a4cc4c45e34331107484a2e42d77e6903b03379443fc82df74a5c3eaa9eb5ad55f63351eabd540e26cf3f8 SHA512 e70e8a15e7f23e9690ad2d15c2d1357271c664f2d7d3ce2b489b7af748d046b11a66e82cec64aa991c383cc1a8e529795ce8d5abd488654738b4b6ef292e64e7 +DIST indilib-2.1.1.tar.gz 2929685 BLAKE2B 565199451a2ebbf6757bb854e0dad576397a6154c6043543243364b6072375afd775ed0b54ed116b2702bdea222b47e4f68673da617e68ebf626d1725e66d2a7 SHA512 3224afb13776462e906398be2b85802807e739042494b29701d106731423640a4dceaeb262cd62d3a87f032ba0655da7ceaa150e6912be20508e090ad93c3ba7 diff --git a/sci-libs/indilib/indilib-2.0.8.ebuild b/sci-libs/indilib/indilib-2.0.8.ebuild deleted file mode 100644 index 0cfc49a84aa4..000000000000 --- a/sci-libs/indilib/indilib-2.0.8.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake udev - -DESCRIPTION="INDI Astronomical Control Protocol library" -HOMEPAGE="https://www.indilib.org/" -SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P/lib/}" - -LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" -SLOT="0/1" -KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="ogg rtlsdr test websocket" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/cpp-httplib:= - dev-cpp/nlohmann_json - dev-libs/libev - media-libs/libjpeg-turbo:= - net-misc/curl - sci-libs/cfitsio:= - sci-libs/fftw:3.0= - sci-libs/gsl:= - sci-libs/libnova:= - sys-libs/zlib - virtual/libusb:1 - ogg? ( - media-libs/libogg - media-libs/libtheora - ) - rtlsdr? ( net-wireless/rtl-sdr ) - websocket? ( dev-libs/boost:= ) -" -DEPEND="${RDEPEND} - kernel_linux? ( sys-kernel/linux-headers ) - test? ( >=dev-cpp/gtest-1.8.0 ) - websocket? ( dev-cpp/websocketpp ) -" - -src_configure() { - local mycmakeargs=( - -DINDI_SYSTEM_HTTPLIB=ON - -DINDI_SYSTEM_JSONLIB=ON - -DINDI_BUILD_QT5_CLIENT=OFF - -DINDI_BUILD_SHARED=ON - -DINDI_BUILD_STATIC=OFF - -DINDI_BUILD_XISF=OFF # not packaged - -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d - $(cmake_use_find_package ogg OggTheora) - $(cmake_use_find_package rtlsdr RTLSDR) - -DINDI_BUILD_UNITTESTS=$(usex test) - -DINDI_BUILD_INTEGTESTS=$(usex test) - -DINDI_BUILD_WEBSOCKET=$(usex websocket) - ) - - cmake_src_configure -} - -src_test() { - # Unit tests - BUILD_DIR="${BUILD_DIR}"/test cmake_src_test - - # Integration tests - # They fail in parallel because they try to bind to the same port more - # than once. - BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1 -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sci-libs/indilib/indilib-2.1.0.ebuild b/sci-libs/indilib/indilib-2.1.0.ebuild index 5550e43e5885..0cfc49a84aa4 100644 --- a/sci-libs/indilib/indilib-2.1.0.ebuild +++ b/sci-libs/indilib/indilib-2.1.0.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" diff --git a/sci-libs/indilib/indilib-2.0.9.ebuild b/sci-libs/indilib/indilib-2.1.1.ebuild index 5550e43e5885..5550e43e5885 100644 --- a/sci-libs/indilib/indilib-2.0.9.ebuild +++ b/sci-libs/indilib/indilib-2.1.1.ebuild diff --git a/sci-libs/ipopt/ipopt-3.14.4.ebuild b/sci-libs/ipopt/ipopt-3.14.4-r1.ebuild index 44a78114fdfa..9005696f3cee 100644 --- a/sci-libs/ipopt/ipopt-3.14.4.ebuild +++ b/sci-libs/ipopt/ipopt-3.14.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,15 +15,15 @@ HOMEPAGE="https://github.com/coin-or/Ipopt" SRC_URI="https://github.com/coin-or/Ipopt/archive/refs/tags/releases/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Ipopt-releases-${PV}" -LICENSE="EPL-1.0 hsl? ( HSL )" +LICENSE="EPL-1.0" SLOT="0/1" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="hsl +lapack mpi mumps static-libs test" +IUSE="+asl +lapack mpi mumps static-libs test" RESTRICT="!test? ( test )" RDEPEND=" virtual/blas - hsl? ( sci-libs/coinhsl:0= ) + asl? ( sci-libs/coinasl:0= ) lapack? ( virtual/lapack ) mpi? ( virtual/mpi ) mumps? ( sci-libs/mumps:0=[mpi=] )" @@ -41,6 +41,8 @@ src_prepare() { src_configure() { local myeconfargs=( $(use_with doc dot) + $(use_with asl) + --without-hsl ) if use lapack; then @@ -55,13 +57,6 @@ src_configure() { else myeconfargs+=( --without-mumps ) fi - if use hsl; then - myeconfargs+=( - --with-hsl-incdir="${EPREFIX}"/usr/include - --with-hsl-lib="$($(tc-getPKG_CONFIG) --libs coinhsl)" ) - else - myeconfargs+=( --without-hsl ) - fi econf "${myeconfargs[@]}" } diff --git a/sci-libs/ipopt/metadata.xml b/sci-libs/ipopt/metadata.xml index f5b474167afc..1b9661483cd4 100644 --- a/sci-libs/ipopt/metadata.xml +++ b/sci-libs/ipopt/metadata.xml @@ -15,7 +15,7 @@ for Operations Research). </longdescription> <use> - <flag name="hsl">hsl</flag> + <flag name="asl">AMPL Solver Library support and build the 'ipopt' binary</flag> <flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag> </use> <upstream> diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest index ecca9794d523..e978bd09f2a7 100644 --- a/sci-libs/kineto/Manifest +++ b/sci-libs/kineto/Manifest @@ -1,2 +1,2 @@ -DIST kineto-0.4.0_p20231127.tar.gz 8234629 BLAKE2B ac6e13340817eb283e387e699e70e5113571b258ee3ebf72f2d4a54a6349be22d84701ddec67fbc72d12be3fb0c321a71c8dd64a7f8a6d679522c49f21304fbc SHA512 316db3db624ae36720c0fcabb81f70c31b94ea64f18bc103aeadb75a25e06e113a774a3ec0c769881960ad61f3c2210172ccde1c451df653e7c430fbe89e4d9a DIST kineto-0.4.0_p20240525.tar.gz 8243259 BLAKE2B 677529d327254c26000271a6c845356604598fb05ba57befd0e5cbd0f112f6776d2851ea1e2a7671a38ee6cb06df45db68ff0435fcddbf69496db43f5ec1e7ee SHA512 41a08c7da9eea7d12402f80a5550c9d4df79798719cc52b12a507828c8c896ba28a37c35d8adf809ca72589e1d84965d5ef6dd01f3f8dc1c803c5ed67b03a43a +DIST kineto-0.4.0_p20240807.tar.gz 8263052 BLAKE2B 79a9035939164595f30f55c6cdfdc72ab42fd93d6d8fc63dc028cae50498823916993cb2d856c4b4dc43f4107602e28e8cf70584b4aea4cacda2a700b9e856e3 SHA512 f037fac78e566c40108acf9eace55a8f67a2c5b71f298fd3cd17bf22cf05240c260fd89f017fa411656a7505ec9073a06a3048e191251d5cfc4b52c237b37d0b diff --git a/sci-libs/kineto/kineto-0.4.0_p20231127.ebuild b/sci-libs/kineto/kineto-0.4.0_p20240807.ebuild index 3a0dcc58057b..cda618f24d0a 100644 --- a/sci-libs/kineto/kineto-0.4.0_p20231127.ebuild +++ b/sci-libs/kineto/kineto-0.4.0_p20240807.ebuild @@ -3,15 +3,16 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-any-r1 cmake prefix -CommitId=c7aeac02222978e7673ee5381bfcaa6b60d5d69c +CommitId=d9753139d181b9ff42872465aac0e5d3018be415 DESCRIPTION="part of the PyTorch Profiler" HOMEPAGE="https://github.com/pytorch/kineto" SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} LICENSE="BSD" SLOT="0" @@ -33,8 +34,6 @@ PATCHES=( "${FILESDIR}"/${PN}-0.4.0-gcc13.patch ) -S="${WORKDIR}"/${PN}-${CommitId} - src_prepare() { cd libkineto cmake_src_prepare @@ -44,6 +43,9 @@ src_configure() { cd libkineto local mycmakeargs=( -DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/ + -DKINETO_BUILD_TESTS=OFF # tests require cuda toolkit + -DCUDA_SOURCE_DIR=/opt/cuda + -DLIBKINETO_NOXPUPTI=Yes ) eapply $(prefixify_ro "${FILESDIR}"/${PN}-0.4.0_p20231031-gentoo.patch) diff --git a/sci-libs/kissfft/kissfft-131.1.0-r2.ebuild b/sci-libs/kissfft/kissfft-131.1.0-r2.ebuild new file mode 100644 index 000000000000..200fee708116 --- /dev/null +++ b/sci-libs/kissfft/kissfft-131.1.0-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit cmake multibuild python-any-r1 toolchain-funcs + +DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid" +HOMEPAGE="https://github.com/mborgerding/kissfft" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/mborgerding/kissfft" + inherit git-r3 +else + SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~arm arm64 ~riscv x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="alloca cpu_flags_x86_sse double int16 int32 openmp test tools" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( + sci-libs/fftw:3.0 + $(python_gen_any_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-131.1.0-cross.patch + "${FILESDIR}"/${PN}-131.1.0-cmake.patch +) + +python_check_deps() { + python_has_version -d "dev-python/numpy[${PYTHON_USEDEP}]" +} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + MULTIBUILD_VARIANTS=( + float + $(usev double) + $(usev int16 int16_t) + $(usev int32 int32_t) + $(usev cpu_flags_x86_sse simd) + ) + + use test && python-any-r1_pkg_setup + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +kissfft_configure() { + local mycmakeargs=( + -DKISSFFT_OPENMP=$(usex openmp 1 0) + -DKISSFFT_TEST=$(usex test) + -DKISSFFT_TOOLS=$(usex tools) + -DKISSFFT_USE_ALLOCA=$(usex alloca) + -DKISSFFT_DATATYPE=${MULTIBUILD_VARIANT} + ) + + cmake_src_configure +} + +src_configure() { + multibuild_foreach_variant kissfft_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild index 14e039c7eec1..8d8b1bb59f38 100644 --- a/sci-libs/kissfft/kissfft-9999.ebuild +++ b/sci-libs/kissfft/kissfft-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake python-any-r1 toolchain-funcs +inherit cmake multibuild python-any-r1 toolchain-funcs DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid" HOMEPAGE="https://github.com/mborgerding/kissfft" @@ -20,7 +20,7 @@ fi LICENSE="BSD" SLOT="0" -IUSE="alloca cpu_flags_x86_sse openmp test tools" +IUSE="alloca cpu_flags_x86_sse double int16 int32 openmp test tools" RESTRICT="!test? ( test )" DEPEND=" @@ -46,18 +46,38 @@ pkg_pretend() { } pkg_setup() { + MULTIBUILD_VARIANTS=( + float + $(usev double) + $(usev int16 int16_t) + $(usev int32 int32_t) + $(usev cpu_flags_x86_sse simd) + ) + use test && python-any-r1_pkg_setup [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -src_configure() { +kissfft_configure() { local mycmakeargs=( -DKISSFFT_OPENMP=$(usex openmp 1 0) -DKISSFFT_TEST=$(usex test) -DKISSFFT_TOOLS=$(usex tools) -DKISSFFT_USE_ALLOCA=$(usex alloca) - -DKISSFFT_DATATYPE=$(usex cpu_flags_x86_sse simd float) + -DKISSFFT_DATATYPE=${MULTIBUILD_VARIANT} ) cmake_src_configure } + +src_configure() { + multibuild_foreach_variant kissfft_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} diff --git a/sci-libs/kissfft/metadata.xml b/sci-libs/kissfft/metadata.xml index 9cc777a3ea9c..5ffd94eab047 100644 --- a/sci-libs/kissfft/metadata.xml +++ b/sci-libs/kissfft/metadata.xml @@ -7,6 +7,9 @@ </maintainer> <use> <flag name="alloca">Use alloca(3) instead of malloc(3) for memory management</flag> + <flag name="double">Build library for primary data type of double</flag> + <flag name="int16">Build library for primary data type of int16_t</flag> + <flag name="int32">Build library for primary data type of int32_t</flag> <flag name="tools">Build command line tools</flag> </use> <upstream> diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild index 8a339063a47c..09400f021621 100644 --- a/sci-libs/klu/klu-1.3.9-r2.ebuild +++ b/sci-libs/klu/klu-1.3.9-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc" BDEPEND=" diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest index f1e19d383a74..a93c14d198dc 100644 --- a/sci-libs/libbraiding/Manifest +++ b/sci-libs/libbraiding/Manifest @@ -1 +1 @@ -DIST libbraiding-1.2.tar.gz 380852 BLAKE2B 8d88861879e7566fa88f3a269c20efa4f37a692da6fd32736b695628a414cec0e03a01cb7a0cfcf20bd233fd21c15b070d9df3e0ee4951c9511949962b012f61 SHA512 f3dcfa77d5313ecfa91c0b9a61988eb2048dd27ed77f46a5c34fc57adb9eee53b250946a7158918b3198559bd016c723dba98465036d01c482b5c6000ab59d8a +DIST libbraiding-1.3.tar.gz 389034 BLAKE2B edc4fbe0a06afec3ddb9c3fa2d63f388ec16bb355100ecf1bb104f72ebf1975d92abc973e8ba118f5cafe998ea4587dc9f456a7a45d076cdae429d607c335a9b SHA512 da8c24183eeaf21a79cd7f723b0082e29e3185594b7cf6695e58de9677a64838da361220b35dd140c920d64dbf5cbf1f1c6f4129709c57efc5d624b766ccd69f diff --git a/sci-libs/libbraiding/libbraiding-1.2.ebuild b/sci-libs/libbraiding/libbraiding-1.3.ebuild index cd88acc244ae..cd88acc244ae 100644 --- a/sci-libs/libbraiding/libbraiding-1.2.ebuild +++ b/sci-libs/libbraiding/libbraiding-1.3.ebuild diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest index d827c4d056a9..cb439d505583 100644 --- a/sci-libs/libcifpp/Manifest +++ b/sci-libs/libcifpp/Manifest @@ -1,6 +1,6 @@ -DIST libcifpp-5.2.2-components.cif.xz 60754468 BLAKE2B 899120c2d6749fb2da9be94de8665f4e961d08c101b33bce98b84bf126b32d43bb79c88da98fb926047522a6f138512dcc59df698f57a83b716e039d422308d4 SHA512 d861b83f8b363f2e64ccf073bae768d73f9f57ec2674bf30d43b05fc9a32d235e26c888faaa02b6276e0734632b237b6dd00d8b966dd63b4fcf6562ebcf41cfc -DIST libcifpp-5.2.2.tar.gz 2277238 BLAKE2B a31af09bed7f1dbd6f610e104f0a8439742c863bc58b3680c058cb570a1f93fbcd6d23f29a372aafbb7166a4d86b2590cd24e092b1cc7af25bd09bbe437c93eb SHA512 2bbe9b13fd0ce8f686b5fa9e1675a41cc37c954cd9d80326fcc7c5f4c767be95dd71f6ddc3e841b6102214cd66205303515fa0750683e539f48b038a32a51af9 -DIST libcifpp-7.0.4-components.cif.xz 62591092 BLAKE2B f5fc502cfb0d5c33c2218a02ccbf652c87f0d9d0ac93a8f2eb7c5a7e1e301555cb641f3df815fefbb998ca00f0b04f4fd39de2023dd69ca88de29a814208cd70 SHA512 6f85b84b9e4c63b134dedbc41a6a3ba4a7bec6a66b0ce1fcc9248c06b3e5600b8fe31c5ed72722cb40cb431227f17bb9f485e7b471c84efa313b04adfb161ec2 -DIST libcifpp-7.0.4.tar.gz 2598838 BLAKE2B db6e4b1573d243c511f15ea1fc28867c8a57eb1050c24a59c12a4608b59890ee567569ca4035daead7e74d206a77bb280c56d54ef8b050fe297ccd75cf48ffeb SHA512 6957b3e3ace855c22923391cfd05db40399b6b84fb194ccceaf7b460493ee8576573056296eb06fecf9e6e83c590776fdd5a09f06bb316de61f44468d2a53392 -DIST libcifpp-7.0.5-components.cif.xz 65274864 BLAKE2B e39ff3d84c8a6977eb505dd68f729261e9caea58b254dc547ddc375a6e9501903aca3886b1ab31f7843251bb430f8b7ed2b27735eae60152e5b54149ec1c0f1a SHA512 f6320df7b839f10282d7c86c865597f201ea3a75c9c95cc69b1526062bb0b57bd37562545560aad2c5549937069ff3ea3e580466aaca8a8af1c736a34554ba98 -DIST libcifpp-7.0.5.tar.gz 2648187 BLAKE2B 700cc68efb355a8e32a81b4ad9acbac0ad31760935ff664663a96e82c6ca74307f43a3c4ea378362c7fdb97deb73bb81021e9da3dd1b528d6eae98dec0a6e4aa SHA512 be4600dfaeb7211728d98caa283904407d0314aca52e63038a218b12d88ef331ad8de2a00d0e610781fa6dce5328d602e65fec9c40d4dd132b6aaed9dd0acf2b +DIST libcifpp-7.0.6-components.cif.xz 65615784 BLAKE2B 680aa4e10e8297541f7c8f4eda5ed29bfbbbe0f91495b0cdb0f0796b3b800ab7a7ea97078f011d248e550c5fb5b3a5359dbddd70475a50e770f2aa1f1c8a4751 SHA512 4b992ae9f8a8acb5d15742899178e69b668380d67dfad1f320a2ca0c9e2f813d4877a9eb37729372265403b3b6c8d3a302b81b8a5d4087444a722b182495e432 +DIST libcifpp-7.0.6.tar.gz 2648194 BLAKE2B 569a0357b77a7b86686e49e5b117e926147ec93cf16671a3869d8d355e4fdbdc1144bbffb7be8ac29ac4299b9ca3860ca2bdbcf1cf5f6ed3f83eadf00beb5e3d SHA512 e0a599928d6126321a3b2af99943bb627369f10c97bf5eacfa314e245dcf3c195a46d34e7b30600e2d4ae94a87567e7d86fb8178eca75dad2a38d5fbd5b4dbc1 +DIST libcifpp-7.0.7-components.cif.xz 65615784 BLAKE2B 680aa4e10e8297541f7c8f4eda5ed29bfbbbe0f91495b0cdb0f0796b3b800ab7a7ea97078f011d248e550c5fb5b3a5359dbddd70475a50e770f2aa1f1c8a4751 SHA512 4b992ae9f8a8acb5d15742899178e69b668380d67dfad1f320a2ca0c9e2f813d4877a9eb37729372265403b3b6c8d3a302b81b8a5d4087444a722b182495e432 +DIST libcifpp-7.0.7.tar.gz 2648232 BLAKE2B 559c62110dd700262bc403a7fac2d4e65a29a86a84313823796cf1b99c5e37ccfd453c113db5509bf5c2cadc0bcfc0e1267a9ff4863d165e984beeb20fd927d5 SHA512 a3f4bb8218b8136b17a440a4e1ad3b8c2674bbb37084e60ad743b41b3d7d7f765c51495adb1789e63624d889cf43e3a001e1a2dd2c5d38d3268b680a77510120 +DIST libcifpp-7.0.8-components.cif.xz 66099572 BLAKE2B ef50f385b3bb58d945bc0e5abf056c172dedf42dcea2169eae1da40408c7b286d76a80096deba103d224e7b6788ce37bbb667c6137b8bf695909cab1a3f91f51 SHA512 f4952d54691086691f80a7280394cb59511e43193156c6c24e3ab0c19040d13f9a564fe1e5195292911a77c2bc03f453f260cd147bf4d84526b5fc34b8d69358 +DIST libcifpp-7.0.8.tar.gz 2648244 BLAKE2B fc591c80156038b9636538d6da2a031d3d2956ecad14f83e94cf8bb62d00f9e7cc8d2667baab98781fcb187c6b8256e055f011dfc38f91916fcff0875e5514db SHA512 ccf28ee8461e199914b91607708aea1946d7933a1c92a809e1ae8560120ec00c3981af3063322a0a59f85e77ec9c5d42ddf0e7ab87387511434226b965e6ced6 diff --git a/sci-libs/libcifpp/libcifpp-7.0.5.ebuild b/sci-libs/libcifpp/libcifpp-7.0.6.ebuild index 855615bcc0ce..855615bcc0ce 100644 --- a/sci-libs/libcifpp/libcifpp-7.0.5.ebuild +++ b/sci-libs/libcifpp/libcifpp-7.0.6.ebuild diff --git a/sci-libs/libcifpp/libcifpp-7.0.4.ebuild b/sci-libs/libcifpp/libcifpp-7.0.7.ebuild index 8c10d84a2291..855615bcc0ce 100644 --- a/sci-libs/libcifpp/libcifpp-7.0.4.ebuild +++ b/sci-libs/libcifpp/libcifpp-7.0.7.ebuild @@ -27,12 +27,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - # https://github.com/PDB-REDO/libcifpp/issues/59 - sed -i -e '/unit-3d/d' test/CMakeLists.txt || die - cmake_src_prepare -} - src_configure() { cp "${WORKDIR}"/${P}-components.cif rsrc/components.cif || die diff --git a/sci-libs/libcifpp/libcifpp-5.2.2.ebuild b/sci-libs/libcifpp/libcifpp-7.0.8.ebuild index 0a794df24722..855615bcc0ce 100644 --- a/sci-libs/libcifpp/libcifpp-5.2.2.ebuild +++ b/sci-libs/libcifpp/libcifpp-7.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,17 +20,18 @@ IUSE="test" RESTRICT="!test? ( test )" DEPEND=" - dev-cpp/eigen:3 + >=dev-cpp/eigen-3.4.0:3 dev-libs/boost:= + sys-libs/zlib + test? ( dev-cpp/catch:0 ) " RDEPEND="${DEPEND}" src_configure() { - cp "${WORKDIR}"/${P}-components.cif data/components.cif || die + cp "${WORKDIR}"/${P}-components.cif rsrc/components.cif || die local mycmakeargs=( -DBUILD_SHARED_LIBS=ON - -DCIFPP_DOWNLOAD_CCD=OFF -DCIFPP_INSTALL_UPDATE_SCRIPT=OFF -DBUILD_TESTING="$(usex test)" ) diff --git a/sci-libs/libint/libint-2.9.0.ebuild b/sci-libs/libint/libint-2.9.0.ebuild index f2d1c2fa4e39..47937a070ce8 100644 --- a/sci-libs/libint/libint-2.9.0.ebuild +++ b/sci-libs/libint/libint-2.9.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs doc" DEPEND=" diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index d0bfd8d551a6..87aea3cf53e2 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1 +1,3 @@ -DIST libqalculate-5.2.0.tar.gz 2694752 BLAKE2B 3be1a538c5093ba8915ed1c9a795f11b615a6ed6ef9aaf7539abad411040d8c87709611f6e0367884cfd25cd46356b9237fd9c665796a275d3ecebe4fbef3edb SHA512 d849c315d3c35f97f47572c891bb2284db593d2bb5611d9405a1e7d00e849d35e08392fe6c67e5296311ed99597f76d25c3878cdcedadb2928699c22cba8af41 +DIST libqalculate-5.3.0.tar.gz 2705592 BLAKE2B 8a42ab386e6b028c8e8429abedf0606e409c552a722b785bf621ea205fc792d9174fe8f62311fd7587c4a7f5d91fcbf7c1ce99ceb5d0c08ad2b696aba2f6856a SHA512 41aa83a6448158ddfbf6b4e0a88062d20dd199d8bc1fa6f12b704fa0c4085ddac19bc1bc0a7e01e063221e157b1597cf8cc387ee226a90e228723fc0e2e2bed1 +DIST libqalculate-5.4.0.1.tar.gz 2203512 BLAKE2B ccecbfdb9dc026f00bc072124d9582b8f364293d60443fb6136bf2520492b50a76db7bd6a1e678c4c4eea1ff18c9033098d8046415daaba49add765e8fa68fa5 SHA512 453e5048fca023b787f4bc68ef6cf9aac6b9aeb64ef6048543a7d3729c918976dff4336e2a1f697e5e1e7489fe6c2cc92ab016802e0ee8a1a3085b0f807e38cc +DIST libqalculate-5.4.0.tar.gz 2720059 BLAKE2B e6ec9536a8b0ed3769c2a013bd267ca8202f58ebf54cd4c629d0d993cede797f2f547d02da50ced4ce94d41bbb8d54db9b4136451e960340c6bcd03c040080d6 SHA512 0539fe8053c903653b72716d0f7e5bc17d2ba954854d61f51bf62f2d9b6a02d3160be6a9f0208c67960ae5f9d831cc29eae4e80438cae482e6fb97e7686207e4 diff --git a/sci-libs/libqalculate/libqalculate-5.2.0.ebuild b/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild index 1cf6eae32345..97c095f1c488 100644 --- a/sci-libs/libqalculate/libqalculate-5.2.0.ebuild +++ b/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs MY_PV="${PV//b/}" @@ -16,7 +16,7 @@ S="${WORKDIR}"/"${PN}-${MY_PV}" LICENSE="GPL-2+" # SONAME changes pretty often on bumps. Check! -SLOT="0/23.2" +SLOT="0/23.3" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="curl icu gnuplot +hardened readline test" RESTRICT="!test? ( test )" @@ -58,14 +58,20 @@ src_configure() { # bug #792027 tc-export CC - econf \ - $(use_enable test tests) \ - $(use_enable test unittests) \ - $(use_with curl libcurl) \ - $(use_with gnuplot gnuplot-call) \ - $(use_enable !hardened insecure) \ - $(use_with icu) \ + # bug #924939 + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + local myeconfargs=( + $(use_enable test tests) + $(use_enable test unittests) + $(use_with curl libcurl) + $(use_with gnuplot gnuplot-call) + $(use_enable !hardened insecure) + $(use_with icu) $(use_with readline) + ) + + econf "${myeconfargs[@]}" } src_install() { diff --git a/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild b/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild new file mode 100644 index 000000000000..1565a70bf69f --- /dev/null +++ b/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt + +inherit autotools flag-o-matic toolchain-funcs + +MY_PV="${PV//b/}" + +DESCRIPTION="A modern multi-purpose calculator library" +HOMEPAGE="https://qalculate.github.io/" +SRC_URI="https://github.com/Qalculate/libqalculate/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/"${PN}-${MY_PV}" + +LICENSE="GPL-2+" +# SONAME changes pretty often on bumps. Check! +SLOT="0/23.3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="curl icu gnuplot +hardened readline test" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/gmp:= + dev-libs/libxml2:2 + dev-libs/mpfr:= + virtual/libiconv + curl? ( net-misc/curl ) + icu? ( dev-libs/icu:= ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND} + gnuplot? ( >=sci-visualization/gnuplot-3.7 )" +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + cat >po/POTFILES.skip <<-EOF || die + # Required by make check + data/currencies.xml.in + data/datasets.xml.in + data/elements.xml.in + data/functions.xml.in + data/planets.xml.in + data/prefixes.xml.in + data/units.xml.in + data/variables.xml.in + src/defs2doc.cc + EOF + + eautoreconf +} + +src_configure() { + # Needed for po-defs/Makefile + export CXX_FOR_BUILD="$(tc-getBUILD_CXX)" + export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E" + + # bug #792027 + tc-export CC + + # bug #924939 + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + local myeconfargs=( + $(use_enable test tests) + $(use_enable test unittests) + $(use_with curl libcurl) + $(use_with gnuplot gnuplot-call) + $(use_enable !hardened insecure) + $(use_with icu) + $(use_with readline) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + # docs/reference/Makefile.am -> referencedir= + emake \ + DESTDIR="${D}" \ + referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \ + install + + einstalldocs + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/libqalculate/libqalculate-5.4.0.ebuild b/sci-libs/libqalculate/libqalculate-5.4.0.ebuild new file mode 100644 index 000000000000..341483a69648 --- /dev/null +++ b/sci-libs/libqalculate/libqalculate-5.4.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt + +inherit flag-o-matic toolchain-funcs + +MY_PV="${PV//b/}" + +DESCRIPTION="A modern multi-purpose calculator library" +HOMEPAGE="https://qalculate.github.io/" +SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${MY_PV}/${P}.tar.gz" +S="${WORKDIR}"/"${PN}-${MY_PV}" + +LICENSE="GPL-2+" +# SONAME changes pretty often on bumps. Check! +SLOT="0/23.3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="curl icu gnuplot +hardened readline test" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/gmp:= + dev-libs/libxml2:2 + dev-libs/mpfr:= + virtual/libiconv + curl? ( net-misc/curl ) + icu? ( dev-libs/icu:= ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND} + gnuplot? ( >=sci-visualization/gnuplot-3.7 )" +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + cat >po/POTFILES.skip <<-EOF || die + # Required by make check + data/currencies.xml.in + data/datasets.xml.in + data/elements.xml.in + data/functions.xml.in + data/planets.xml.in + data/prefixes.xml.in + data/units.xml.in + data/variables.xml.in + src/defs2doc.cc + EOF +} + +src_configure() { + # Needed for po-defs/Makefile + export CXX_FOR_BUILD="$(tc-getBUILD_CXX)" + export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E" + + # bug #792027 + tc-export CC + + # bug #924939 + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + local myeconfargs=( + $(use_enable test tests) + $(use_enable test unittests) + $(use_with curl libcurl) + $(use_with gnuplot gnuplot-call) + $(use_enable !hardened insecure) + $(use_with icu) + $(use_with readline) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + # docs/reference/Makefile.am -> referencedir= + emake \ + DESTDIR="${D}" \ + referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \ + install + + einstalldocs + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/libqalculate/metadata.xml b/sci-libs/libqalculate/metadata.xml index 1fc5756c8fef..37c5af587a99 100644 --- a/sci-libs/libqalculate/metadata.xml +++ b/sci-libs/libqalculate/metadata.xml @@ -5,6 +5,14 @@ <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>csfore@posteo.net</email> + <name>Christopher Fore</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="hardened"> Disable unsafe functions like 'command' and variables like 'uptime'. diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index 2fa47a31d5ad..f8c76cc65197 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -1,3 +1,2 @@ DIST gpib_firmware-2008-08-10.tar.gz 173004 BLAKE2B 05fcde09de5246b86004c263c733d64316511bdb0b84dfbd9b94cb78e2909c0d191ff21ee0d77e7f0947e9231bd4cd62d6348e8f9beefd6d201b473732ff23d2 SHA512 f2a0ee3316b75ac36ed88568e45ca4c69935a6d10783c65582003ab39686f2a69d3002901866065f4f5efa9fdd4c779e038d1d7ce24bba266a619c164d5ac10d -DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566 SHA512 018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76 DIST linux-gpib-4.3.6.tar.gz 1433121 BLAKE2B 64e2b19106d0531df990b1338f82a71707e54f448d652f6379eb9cd71feb84637090ed8fdfb0264248aa6879d5b9a1dc50e75c21a2c22a31397120eea5903e98 SHA512 a8005c71bfddb854ecbe4df0a81530e44378150242508b10df58c61d039c6d329020407608e31f1ef360de0c83169e76b793c032256e732d229bfd2da4cbaa35 diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.5.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.5.ebuild deleted file mode 100644 index ec3f2baf9002..000000000000 --- a/sci-libs/linux-gpib/linux-gpib-4.3.5.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit readme.gentoo-r1 autotools perl-functions python-single-r1 udev - -# Check for latest firmware version on bump -FW_PV="2008-08-10" - -DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware" -HOMEPAGE="https://linux-gpib.sourceforge.io/" -SRC_URI="https://downloads.sourceforge.net/linux-gpib/${P}.tar.gz - firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-${FW_PV}.tar.gz ) -" -S="${WORKDIR}/${PN}-user-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" -IUSE="pcmcia static guile perl php python tcl doc firmware" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -COMMONDEPEND=" - sys-libs/readline:= - tcl? ( dev-lang/tcl:0= ) - guile? ( dev-scheme/guile:12 ) - perl? ( dev-lang/perl:= ) - php? ( dev-lang/php:= ) - python? ( ${PYTHON_DEPS} ) - firmware? ( sys-apps/fxload ) -" -RDEPEND="${COMMONDEPEND} - acct-group/gpib - ~sci-libs/linux-gpib-modules-${PV} -" -DEPEND="${COMMONDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/docbook-sgml-utils ) - perl? ( virtual/perl-ExtUtils-MakeMaker ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3.0-perl.patch -) - -pkg_setup() { - use perl && perl_set_version - use python && python_setup -} - -src_unpack() { - default - unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz" -} - -src_prepare() { - default - - # We have to use --root instead of --prefix for setup.py. - # Otherwise the python files are not installed properly into site-packages. - sed -i -e \ - 's/--prefix=$(DESTDIR)$(prefix)/--root=$(DESTDIR)/g' \ - language/python/Makefile.am || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static) \ - $(use_enable guile guile-binding) \ - $(use_enable perl perl-binding) \ - $(use_enable php php-binding) \ - $(use_enable python python-binding) \ - $(use_enable tcl tcl-binding) \ - $(use_enable doc documentation) -} - -src_install() { - # PYTHONDONTWRITEBYTECODE=0 is required, otherwise - # installation of the python files is skipped - FIRM_DIR=/usr/share/usb - emake \ - DESTDIR="${ED}" \ - INSTALL_MOD_PATH="${ED}" \ - HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \ - UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ - USB_FIRMWARE_DIR=${FIRM_DIR} \ - PYTHONDONTWRITEBYTECODE=0 \ - docdir="/usr/share/doc/${PF}/html" install - - if use perl; then - einfo "Installing perl module" - cd "${S}"/language/perl || die - emake DESTDIR="${ED}" install - perl_fix_packlist - perl_delete_emptybsdir - cd "${S}" || die - fi - - echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules - udev_dorules 99-gpib.rules - - dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS - - insinto /etc - newins util/templates/gpib.conf gpib.conf - newins util/templates/gpib.conf gpib.conf.example - - if use pcmcia; then - insinto /etc/pcmcia - doins "${S}"/etc/pcmcia/* - fi - - # fix rules files - local f - find "${ED}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do - grep -q "${ED}" "${f}" && einfo "File ${f} contains a temporary path, fixing." - sed -i -e "s:${ED}:/:g" "${f}" - done - - DOC_CONTENTS=" -As the udev rules were changed and refactored in this release it is -necessary to remove any manually installed pre-4.3.0 gpib udev rules files -in /etc/udev/rules.d/. The files to remove are: -\n - 99-agilent_82357a.rules\n - 99-gpib-generic.rules\n - 99-ni_usb_gpib.rules\n -\n -You need to run the 'gpib_config' utility to setup the driver before -you can use it. In order to do it automatically you can add to your -start script something like this (supposing the appropriate driver -is loaded on the startup): -\n - gpib_config --minor 0 -\n -To give a user access to the computer's gpib board you will have to add -them to the group 'gpib' or, you could change the permissions on the device -files /dev/gpib[0-15] to something you like better, using 'chmod' -\n -Edit /etc/gpib.conf to match your interface board, and any devices you wish -to open via ibfind(). See the documentation in /usr/share/linux-gpib/html for -more information. -\n -" - - if use pcmcia; then - DOC_CONTENTS+=' -For PCMCIA cards:\n -All files needed for a PCMCIA board were copied to /etc/pcmcia. -You may wish to edit the options passed to the gpib_config call in the -/etc/pcmcia/linux-gpib-pcmcia script. -You may need to send a SIGHUP signal to the cardmgr daemon to force it -to reload the files in /etc/pcmcia \(alternatively you could use your -pcmcia init.d script to restart the cardmgr, or you could just reboot\). -The driver module will be loaded as needed by the cardmgr. - -' - fi - - if use firmware; then - DOC_CONTENTS+=' -For Agilent \(HP\) 82341C and 82341D cards: -The firmware for these boards is uploaded by passing the appropriate -firmware file from /usr/share/linux-gpib/hp_82341 directory to -gpib_config using the -I or --init-data command line option. Example:\n -gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin -' - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.6-r100.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.6-r100.ebuild index 7950a9d28862..3d9866603ae6 100644 --- a/sci-libs/linux-gpib/linux-gpib-4.3.6-r100.ebuild +++ b/sci-libs/linux-gpib/linux-gpib-4.3.6-r100.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-user-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" IUSE="pcmcia static guile perl php python tcl doc firmware" REQUIRED_USE=" guile? ( ${GUILE_REQUIRED_USE} ) diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.6-r3.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.6-r3.ebuild deleted file mode 100644 index d42907d639c7..000000000000 --- a/sci-libs/linux-gpib/linux-gpib-4.3.6-r3.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit readme.gentoo-r1 autotools perl-functions python-single-r1 udev - -# Check for latest firmware version on bump -FW_PV="2008-08-10" - -DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware" -HOMEPAGE="https://linux-gpib.sourceforge.io/" -SRC_URI="https://downloads.sourceforge.net/linux-gpib/${P}.tar.gz - firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-${FW_PV}.tar.gz ) -" -S="${WORKDIR}/${PN}-user-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" -IUSE="pcmcia static guile perl php python tcl doc firmware" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -COMMONDEPEND=" - sys-libs/readline:= - tcl? ( dev-lang/tcl:0= ) - guile? ( dev-scheme/guile:12 ) - perl? ( dev-lang/perl:= ) - php? ( dev-lang/php:= ) - python? ( ${PYTHON_DEPS} ) - firmware? ( sys-apps/fxload ) -" -RDEPEND="${COMMONDEPEND} - acct-group/gpib - ~sci-libs/linux-gpib-modules-${PV} -" -DEPEND="${COMMONDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/docbook-sgml-utils ) - perl? ( virtual/perl-ExtUtils-MakeMaker ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3.0-perl.patch -) - -pkg_setup() { - use perl && perl_set_version - use python && python_setup -} - -src_unpack() { - default - unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz" -} - -src_prepare() { - default - - # We have to use --root instead of --prefix for setup.py. - # Otherwise the python files are not installed properly into site-packages. - sed -i -e \ - 's/--prefix=$(DESTDIR)$(prefix)/--root=$(DESTDIR)/g' \ - language/python/Makefile.am || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static) \ - $(use_enable guile guile-binding) \ - $(use_enable perl perl-binding) \ - $(use_enable php php-binding) \ - $(use_enable python python-binding) \ - $(use_enable tcl tcl-binding) \ - $(use_enable doc documentation) -} - -src_install() { - # PYTHONDONTWRITEBYTECODE=0 is required, otherwise - # installation of the python files is skipped - FIRM_DIR=/usr/share/usb - emake \ - DESTDIR="${ED}" \ - INSTALL_MOD_PATH="${ED}" \ - HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \ - UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ - USB_FIRMWARE_DIR=${FIRM_DIR} \ - PYTHONDONTWRITEBYTECODE=0 \ - docdir="/usr/share/doc/${PF}/html" install - - if use perl; then - einfo "Installing perl module" - cd "${S}"/language/perl || die - emake DESTDIR="${ED}" install - perl_fix_packlist - perl_delete_emptybsdir - cd "${S}" || die - fi - - echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules - udev_dorules 99-gpib.rules - - dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS - - insinto /etc - newins util/templates/gpib.conf gpib.conf - newins util/templates/gpib.conf gpib.conf.example - - if use pcmcia; then - insinto /etc/pcmcia - doins "${S}"/etc/pcmcia/* - fi - - # fix rules files - local f - find "${ED}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do - grep -q "${ED}" "${f}" && einfo "File ${f} contains a temporary path, fixing." - sed -i -e "s:${ED}:/:g" "${f}" - done - - # remove .la files - find "${ED}" -name '*.la' -delete || die - - DOC_CONTENTS=" -As the udev rules were changed and refactored in this release it is -necessary to remove any manually installed pre-4.3.0 gpib udev rules files -in /etc/udev/rules.d/. The files to remove are: -\n - 99-agilent_82357a.rules\n - 99-gpib-generic.rules\n - 99-ni_usb_gpib.rules\n -\n -You need to run the 'gpib_config' utility to setup the driver before -you can use it. In order to do it automatically you can add to your -start script something like this (supposing the appropriate driver -is loaded on the startup): -\n - gpib_config --minor 0 -\n -To give a user access to the computer's gpib board you will have to add -them to the group 'gpib' or, you could change the permissions on the device -files /dev/gpib[0-15] to something you like better, using 'chmod' -\n -Edit /etc/gpib.conf to match your interface board, and any devices you wish -to open via ibfind(). See the documentation in /usr/share/linux-gpib/html for -more information. -\n -" - - if use pcmcia; then - DOC_CONTENTS+=' -For PCMCIA cards:\n -All files needed for a PCMCIA board were copied to /etc/pcmcia. -You may wish to edit the options passed to the gpib_config call in the -/etc/pcmcia/linux-gpib-pcmcia script. -You may need to send a SIGHUP signal to the cardmgr daemon to force it -to reload the files in /etc/pcmcia \(alternatively you could use your -pcmcia init.d script to restart the cardmgr, or you could just reboot\). -The driver module will be loaded as needed by the cardmgr. - -' - fi - - if use firmware; then - DOC_CONTENTS+=' -For Agilent \(HP\) 82341C and 82341D cards: -The firmware for these boards is uploaded by passing the appropriate -firmware file from /usr/share/linux-gpib/hp_82341 directory to -gpib_config using the -I or --init-data command line option. Example:\n -gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin -' - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sci-libs/lmfit/lmfit-9.0-r1.ebuild b/sci-libs/lmfit/lmfit-9.0-r1.ebuild index 32374742eb2f..7b5a1669b02e 100644 --- a/sci-libs/lmfit/lmfit-9.0-r1.ebuild +++ b/sci-libs/lmfit/lmfit-9.0-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" SLOT="0/9" -KEYWORDS="amd64 arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~riscv ~x86" PATCHES=( "${FILESDIR}"/${P}-cmake.patch diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest index 65ee490c9030..3c5ad748cda7 100644 --- a/sci-libs/lrslib/Manifest +++ b/sci-libs/lrslib/Manifest @@ -1 +1,2 @@ DIST lrslib-071b.tar.gz 466789 BLAKE2B 57a8abd9d203b1cdc62d6848afa77aa6912d9d720a0dedfbe72ca602ad8ba36d13160f7da7d719e3fa140ba2cb6432d20590ae9ea9b1f66bc2e24c393d9fe1bd SHA512 feafc5726e66c977e917f0b59ae950cdb98dbd84639885b487930aab2a89a7f067a3f39c381acc3eae7206b91255e1befa5551488d8816afc0f8054d801eb539 +DIST lrslib-073.tar.gz 4566562 BLAKE2B b3906b29d8b35452319af1d81184f3e49f9c74cdc8fadfdb7e0bd13797acecc0f21d0b375fbe7c00ff585bb51c0571003c131af8d732929ebb1d4ca3dc0d23ea SHA512 8966ed12f7dd9f178949bf51c64e75e4850bda5b77be1c6e525f77baef1bc0f5fbee69b09f6a4ee858532831a4c4ae4461eb598e635fae7aaa8d02bf145140b9 diff --git a/sci-libs/lrslib/files/lrslib-073-cflags-ldflags.patch b/sci-libs/lrslib/files/lrslib-073-cflags-ldflags.patch new file mode 100644 index 000000000000..d4d04f0f00c4 --- /dev/null +++ b/sci-libs/lrslib/files/lrslib-073-cflags-ldflags.patch @@ -0,0 +1,169 @@ +diff --git a/makefile b/makefile +index 8142044..1c26969 100755 +--- a/makefile ++++ b/makefile +@@ -35,7 +35,7 @@ LRSOBJ2=lrslib2.o lrslong2.o + + #legacy lrs and mplrs + #CFLAGS = -g -Wall -I ${ARITH} +-CFLAGS = -O3 -Wall -I ${ARITH} ++CFLAGS += -I ${ARITH} + + #use this if you want only output file contain data between begin/end lines + #CFLAGS = -O3 -Wall -I ${ARITH} -DLRS_QUIET +@@ -89,14 +89,14 @@ MPLRSOBJ=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o lrsdr + MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o lrsdriver-mplrs.o mplrs64.o + + lrs: ${LRSOBJ} ${LRSOBJ2} +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DMA ${BITS} -L${LIBDIR} -o lrs ${LRSOBJ} ${LRSOBJ2} ${MINI} ${GMP} ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DMA ${BITS} -L${LIBDIR} $(LDFLAGS) -o lrs ${LRSOBJ} ${LRSOBJ2} ${MINI} ${GMP} + ln -s -f lrs redund + ln -s -f lrs minrep + ln -s -f lrs fel + + lrsMP: ${LRSOBJMP} +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DMA ${BITS} -o lrsMP ${LRSOBJMP} +- $(CC) -O3 hvref.c -o hvref ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DMA ${BITS} $(LDFLAGS) -o lrsMP ${LRSOBJMP} ++ $(CC) $(CFLAGS) hvref.c $(LDFLAGS) -o hvref + ln -s -f lrs redund + + lrs.o: lrs.c +@@ -126,10 +126,10 @@ lrsmp.o: ${ARITH}lrsmp.c ${ARITH}lrsmp.h + $(CC) ${CFLAGS} -DMA -DMP -c -o lrsmp.o ${ARITH}lrsmp.c + + inedel: inedel.c ${ARITH}lrsgmp.h ${ARITH}lrsgmp.c +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -DGMP -o inedel inedel.c ${ARITH}lrsgmp.c -lgmp ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -DGMP $(LDFLAGS) -o inedel inedel.c ${ARITH}lrsgmp.c -lgmp + + polyv: polyv.c ${ARITH}lrsgmp.h ${ARITH}lrsgmp.c +- $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} -DGMP -o polyv polyv.c ${ARITH}lrsgmp.c -lgmp ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} -DGMP $(LDFLAGS) -o polyv polyv.c ${ARITH}lrsgmp.c -lgmp + + lrslong1-mplrs.o: ${ARITH}lrslong.c ${ARITH}lrslong.h + $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE -DLRSLONG -DMPLRS -c -o lrslong1-mplrs.o ${ARITH}lrslong.c +@@ -159,67 +159,67 @@ mplrs64.o: mplrs.c mplrs.h lrslib.h ${ARITH}lrsgmp.h + $(mpicxx) ${CFLAGS} -I${INCLUDEDIR} ${GMP} -DMA -DMPLRS -DTIMES -DSIGNALS -D_WITH_GETLINE -c -o mplrs64.o mplrs.c + + mplrs: ${MPLRSOBJ} ${MPLRSOBJ2} +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DMA ${BITS} -L${LIBDIR} -o mplrs ${MPLRSOBJ} ${MPLRSOBJ2} ${MINI} ${GMP} ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DMA ${BITS} -L${LIBDIR} $(LDFLAGS) -o mplrs ${MPLRSOBJ} ${MPLRSOBJ2} ${MINI} ${GMP} + + mplrs64: ${MPLRSOBJ64} mplrsgmp +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DMA -L${LIBDIR} -o mplrs ${MPLRSOBJ64} -lgmp ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DMA -L${LIBDIR} $(LDFLAGS) -o mplrs ${MPLRSOBJ64} -lgmp + + mplrsgmp: mplrs.c mplrs.h lrslib.c lrslib.h ${ARITH}lrsgmp.c ${ARITH}lrsgmp.h lrsdriver.h lrsdriver.c +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DGMP -I${INCLUDEDIR} mplrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c -L${LIBDIR} -o mplrsgmp -lgmp ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DGMP -I${INCLUDEDIR} mplrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c -L${LIBDIR} $(LDFLAGS) -o mplrsgmp -lgmp + + mplrs1: mplrs.c mplrs.h lrslib.c lrslib.h ${ARITH}lrslong.c ${ARITH}lrslong.h lrsdriver.h lrsdriver.c +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DSAFE -DLRSLONG mplrs.c lrslib.c ${ARITH}lrslong.c lrsdriver.c -o mplrs1 ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DSAFE -DLRSLONG mplrs.c lrslib.c ${ARITH}lrslong.c lrsdriver.c $(LDFLAGS) -o mplrs1 + + mplrs2: mplrs.c mplrs.h lrslib.c lrslib.h ${ARITH}lrslong.c ${ARITH}lrslong.h lrsdriver.h lrsdriver.c +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DSAFE -DLRSLONG ${BITS} mplrs.c lrslib.c ${ARITH}lrslong.c lrsdriver.c -o mplrs2 ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS -DSAFE -DLRSLONG ${BITS} mplrs.c lrslib.c ${ARITH}lrslong.c lrsdriver.c $(LDFLAGS) -o mplrs2 + + mplrsmp: mplrs.c mplrs.h lrslib.c lrslib.h ${ARITH}lrsmp.c ${ARITH}lrsmp.h lrsdriver.h lrsdriver.c +- $(mpicxx) ${CFLAGS} -DMP -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS mplrs.c lrslib.c ${ARITH}lrsmp.c lrsdriver.c -o mplrsmp ++ $(mpicxx) ${CFLAGS} -DMP -DTIMES -DSIGNALS -D_WITH_GETLINE -DMPLRS mplrs.c lrslib.c ${ARITH}lrsmp.c lrsdriver.c $(LDFLAGS) -o mplrsmp + + singlemplrs: mplrs1 mplrs2 + + flint: lrs.c lrslib.c lrslib.h ${ARITH}lrsgmp.c ${ARITH}lrsgmp.h + @test -d ${INCLUDEDIR}/flint || { echo ${INCLUDEDIR}/flint not found; exit 1; } +- $(CC) -O3 -DFLINT ${PLRSFLAGS} -I/usr/local/include/flint lrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint -o lrsflint -lgmp ++ $(CC) $(CFLAGS) -DFLINT ${PLRSFLAGS} -I/usr/local/include/flint lrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint $(LDFLAGS) -o lrsflint -lgmp + + mplrsflint: mplrs.c mplrs.h lrslib.c lrslib.h ${ARITH}lrsgmp.c ${ARITH}lrsgmp.h lrsdriver.c lrsdriver.h +- ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DMPLRS -o mplrsflint mplrs.c lrsdriver.c lrslib.c ${ARITH}lrsgmp.c -L${LIBDIR} -lflint -lgmp ++ ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DMPLRS $(LDFLAGS) -o mplrsflint mplrs.c lrsdriver.c lrslib.c ${ARITH}lrsgmp.c -L${LIBDIR} -lflint -lgmp + + lrsgmp: lrs.c lrslib.c lrslib.h ${ARITH}lrsgmp.c ${ARITH}lrsgmp.h lrsdriver.h lrsdriver.c +- $(CC) ${CFLAGS} ${PLRSFLAGS} -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c -L${LIBDIR} ${MINI} ${GMP} ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -I${INCLUDEDIR} $(LDFLAGS) -o lrsgmp lrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c -L${LIBDIR} ${MINI} ${GMP} + + single: lrs.c ${ARITH}lrslong.c ${ARITH}lrslong.h lrslib.c lrslib.h ${ARITH}lrsgmp.c ${ARITH}lrsgmp.h lrsdriver.h lrsdriver.c +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c ${ARITH}lrslong.c lrsdriver.c +- $(CC) ${CFLAGS} ${PLRSFLAGS} ${BITS} -DSAFE -DLRSLONG -o lrs2 lrs.c lrslib.c ${ARITH}lrslong.c lrsdriver.c +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DMP -o lrsmp lrs.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DMGMP -DGMP -I${INCLUDEDIR} -o lrsmgmp lrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c ${ARITH}mini-gmp.c ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c ${ARITH}lrslong.c lrsdriver.c ++ $(CC) ${CFLAGS} ${PLRSFLAGS} ${BITS} -DSAFE -DLRSLONG $(LDFLAGS) -o lrs2 lrs.c lrslib.c ${ARITH}lrslong.c lrsdriver.c ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DMP $(LDFLAGS) -o lrsmp lrs.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DGMP -I${INCLUDEDIR} $(LDFLAGS) -o lrsgmp lrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DMGMP -DGMP -I${INCLUDEDIR} $(LDFLAGS) -o lrsmgmp lrs.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c ${ARITH}mini-gmp.c + + allmp: lrs.c lrslib.c lrslib.h ${ARITH}lrsmp.c ${ARITH}lrsmp.h lrsdriver.h lrsdriver.c +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DMP -o lrsmp lrs.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrsdriver.c ${ARITH}lrslong.c +- $(CC) ${CFLAGS} ${PLRSFLAGS} -DSAFE -DLRSLONG ${BITS} -o lrs2 lrs.c lrslib.c lrsdriver.c ${ARITH}lrslong.c +- $(CC) ${CFLAGS} -DMP -DLRS_QUIET -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c +- $(CC) ${CFLAGS} -DMP -o setupnash setupnash.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c +- $(CC) ${CFLAGS} -DMP -o setupnash2 setupnash2.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c +- $(CC) ${CFLAGS} -o 2nash 2nash.c ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DMP $(LDFLAGS) -o lrsmp lrs.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrsdriver.c ${ARITH}lrslong.c ++ $(CC) ${CFLAGS} ${PLRSFLAGS} -DSAFE -DLRSLONG ${BITS} $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrsdriver.c ${ARITH}lrslong.c ++ $(CC) ${CFLAGS} -DMP -DLRS_QUIET $(LDFLAGS) -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c ++ $(CC) ${CFLAGS} -DMP $(LDFLAGS) -o setupnash setupnash.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c ++ $(CC) ${CFLAGS} -DMP $(LDFLAGS) -o setupnash2 setupnash2.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c ++ $(CC) ${CFLAGS} $(LDFLAGS) -o 2nash 2nash.c + + demo: lpdemo1.c lrslib.c lrsdriver.c lrslib.h ${ARITH}lrsgmp.c ${ARITH}lrsgmp.h +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo lpdemo.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o vedemo vedemo.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o chdemo chdemo.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo lpdemo.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o vedemo vedemo.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o chdemo chdemo.c lrslib.c lrsdriver.c ${ARITH}lrsgmp.c -lgmp -DGMP + + lrsnash: lrsnash.c nashdemo.c lrsnashlib.c lrslib.c lrsnashlib.h lrslib.h ${ARITH}lrsgmp.c ${ARITH}lrsgmp.h ${ARITH}lrslong.h lrsdriver.h lrsdriver.c +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c ${MINI} ${GMP} +- $(CC) ${CFLAGS} -DNASH -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c ${ARITH}lrslong.c lrsdriver.c -DLRSLONG -DSAFE +- +- $(CC) ${CFLAGS} -DNASH -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c ${ARITH}lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS} +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o nashdemo nashdemo.c lrsnashlib.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c ${MINI} ${GMP} +- $(CC) ${CFLAGS} -DMP -o setupnash setupnash.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c +- $(CC) ${CFLAGS} -DMP -o setupnash2 setupnash2.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c +- $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o 2nash 2nash.c ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c ${MINI} ${GMP} ++ $(CC) ${CFLAGS} -DNASH -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c ${ARITH}lrslong.c lrsdriver.c -DLRSLONG -DSAFE ++ ++ $(CC) ${CFLAGS} -DNASH -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c ${ARITH}lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS} ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o nashdemo nashdemo.c lrsnashlib.c lrslib.c ${ARITH}lrsgmp.c lrsdriver.c ${MINI} ${GMP} ++ $(CC) ${CFLAGS} -DMP $(LDFLAGS) -o setupnash setupnash.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c ++ $(CC) ${CFLAGS} -DMP $(LDFLAGS) -o setupnash2 setupnash2.c lrslib.c lrsdriver.c ${ARITH}lrsmp.c ++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o 2nash 2nash.c + cp lrsnashgmp lrsnash + + ###################################################################### +@@ -246,7 +246,7 @@ SHLIBBIN=lrs-shared lrsnash-shared + # Building (linking) the shared library, and relevant symlinks. + + ${SHLIB}: ${SHLIBOBJ} +- $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ ${SHLIBOBJ} -lgmp ++ $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) $(LDFLAGS) -o $@ ${SHLIBOBJ} -lgmp + + ${SONAME}: ${SHLIB} + ln -sf ${SHLIB} ${SONAME} +@@ -259,11 +259,11 @@ ${SHLINK}: ${SONAME} + all-shared: ${SHLIBBIN} + + lrs-shared: ${SHLINK} lrs-shared.o +- $(CC) $^ -o $@ -L . -llrs ++ $(CC) $^ $(LDFLAGS) -o $@ -L . -llrs + + + lrsnash-shared: ${SHLINK} lrsnash.c +- $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp ++ $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} $(LDFLAGS) -o $@ -L . -llrs -lgmp + + # driver object files + diff --git a/sci-libs/lrslib/lrslib-071b-r1.ebuild b/sci-libs/lrslib/lrslib-071b-r1.ebuild index 75524f3d1210..32486e5db22d 100644 --- a/sci-libs/lrslib/lrslib-071b-r1.ebuild +++ b/sci-libs/lrslib/lrslib-071b-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz" # COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version." LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~riscv ~amd64-linux" IUSE="gmp mpi" BDEPEND="" diff --git a/sci-libs/lrslib/lrslib-071b.ebuild b/sci-libs/lrslib/lrslib-071b.ebuild deleted file mode 100644 index dce7bc19ece6..000000000000 --- a/sci-libs/lrslib/lrslib-071b.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Reverse-search algorithm for vertex enumeration problems" -HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html" -SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz" - -# COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version." -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -IUSE="gmp mpi" - -BDEPEND="" -RDEPEND=" - gmp? ( - dev-libs/gmp:0= - mpi? ( virtual/mpi ) - )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - tc-export CC - - # The "makefile" sort-of supports CFLAGS as of lrslib-071b, but - # "-O3" is still included verbatim in many targets. Likewise, a - # LIBDIR variable exists but "lib" remains hard-coded in the install - # targets. - sed -e "s/-O3/${CFLAGS}/g" \ - -e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \ - -e "s,/usr/local,${EPREFIX}/usr,g" \ - -e "s,/lib,/$(get_libdir),g" \ - -i makefile || die -} - -src_compile() { - if use gmp ; then - emake - emake all-shared - use mpi && emake mplrs - else - emake allmp - fi -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-common - if use gmp; then - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install - use mpi && dobin mplrs - fi - dodoc README -} diff --git a/sci-libs/lrslib/lrslib-073.ebuild b/sci-libs/lrslib/lrslib-073.ebuild new file mode 100644 index 000000000000..cfe1404b0cd6 --- /dev/null +++ b/sci-libs/lrslib/lrslib-073.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Reverse-search algorithm for vertex enumeration problems" +HOMEPAGE="https://cgm.cs.mcgill.ca/~avis/C/lrs.html" +SRC_URI="https://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz" + +# COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version." +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm ~riscv ~amd64-linux" +IUSE="gmp mpi" + +RDEPEND=" + gmp? ( + dev-libs/gmp:0= + mpi? ( virtual/mpi ) + )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-cflags-ldflags.patch" +) + +src_prepare() { + default + tc-export CC + + # A LIBDIR variable exists in the makefile but "lib" remains + # hard-coded in the install targets. + sed -e "s,/usr/local,${EPREFIX}/usr,g" \ + -e "s,/lib,/$(get_libdir),g" \ + -i makefile || die +} + +src_compile() { + if use gmp ; then + emake + emake all-shared + use mpi && emake mplrs + else + emake allmp + fi +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-common + if use gmp; then + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install + use mpi && dobin mplrs + fi + dodoc README +} + +src_test() { + bins=() + + if use gmp; then + bins+=( "./lrs" ) + use mpi && bins+=( "mpirun ./mplrs" ) + fi + + for b in "${bins[@]}"; do + for f in cube mp5; do + # There are other ine/ext pairs in the tarball, but only + # these two are at the top level and are obviously H/V + # counterparts. + + echo "Testing example ${f} under ${b}..." + # Convert this H-repr to a V-repr, keeping only the list of + # vertices (which are indented by one space). We also sort + # the output because it's only consistent up to a + # permutation. + ${b} "${f}.ine" \ + | grep '^ ' \ + | sort \ + > "${T}/actual.txt" \ + || die + + # The expected output is contained in the "ext" counterpart, + # which we have to sort for the same reason we sorted the + # actual output. + grep '^ ' \ + "${f}.ext" \ + | sort \ + > "${T}/expected.txt" \ + || die + + cmp "${T}/actual.txt" "${T}/expected.txt" \ + || die "test case ${f} under ${b} failed" + done + done +} diff --git a/sci-libs/med/med-4.1.1-r4.ebuild b/sci-libs/med/med-4.1.1-r4.ebuild new file mode 100644 index 000000000000..ce0d521ecfd1 --- /dev/null +++ b/sci-libs/med/med-4.1.1-r4.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake flag-o-matic fortran-2 optfeature python-single-r1 + +DESCRIPTION="A library to store and exchange meshed data or computation results" +HOMEPAGE="https://www.salome-platform.org/user-section/about/med" +SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" +S="${WORKDIR}/${P}_SRC" +LICENSE="LGPL-3" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fortran mpi python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test ) python? ( test )" + +RDEPEND=" + !sci-libs/libmed + >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?] + mpi? ( virtual/mpi[fortran?] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" + +PATCHES=( + "${FILESDIR}/${PN}-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" + "${FILESDIR}/${PN}-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch" + "${FILESDIR}/${PN}-4.1.0-0003-build-against-hdf5-1.14.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + if use python; then + # fixes for correct libdir name + local pysite=$(python_get_sitedir) + pysite="${pysite##/usr/}" + sed \ + -e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \ + -i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed" + fi + sed -e 's/med-fichier/med/' -i CMakeLists.txt || die "fix paths failed" + sed -e 's|doc/med-${MED_STR_VERSION}|doc/'${PF}'/html|' \ + -i CMakeLists.txt || die "fix doc path failed" + + # bug #862900, already reported upstream. CHECK on updates! + filter-lto + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, + # so let's avoid rebuilding it because it will be different + -DMEDFILE_BUILD_DOC=OFF + -DMEDFILE_BUILD_FORTRAN=$(usex fortran) + -DMEDFILE_BUILD_PYTHON=$(usex python) + -DMEDFILE_BUILD_SHARED_LIBS=ON + -DMEDFILE_BUILD_STATIC_LIBS=OFF + -DMEDFILE_BUILD_TESTS=$(usex test) + -DMEDFILE_INSTALL_DOC=$(usex doc) + -DMEDFILE_USE_MPI=$(usex mpi) + -DMEDFILE_USE_UNICODE=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # we don't need old 2.3.6 include files + rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir" + + # the optimization done in CMakeLists.txt has been disabled so + # we need to do it manually + use python && python_optimize + + # Prevent test executables being installed + if use test; then + rm -r "${ED}"/usr/bin/testc || die "failed to delete C test executables" + if use fortran; then + rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables" + fi + if use python; then + rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables" + fi + fi +} + +src_test() { + # override parallel mode only for tests + local myctestargs=( "-j 1" ) + cmake_src_test +} + +pkg_postinst() { + optfeature "xmdump scripts support" dev-lang/tk +} diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild index b5764fafad09..45c317219bad 100644 --- a/sci-libs/mkl/mkl-2020.4.304.ebuild +++ b/sci-libs/mkl/mkl-2020.4.304.ebuild @@ -27,7 +27,7 @@ RESTRICT="strip" RDEPEND=" app-eselect/eselect-blas app-eselect/eselect-lapack - sys-libs/libomp[${MULTILIB_USEDEP}] + llvm-runtimes/openmp[${MULTILIB_USEDEP}] " # bug #801460 BDEPEND="app-arch/xz-utils[extra-filters(+)]" diff --git a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild index 08673a4b5283..0695051cd353 100644 --- a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild +++ b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" dev-cpp/tbb dev-libs/opencl-icd-loader sys-cluster/mpich - sys-libs/libomp + llvm-runtimes/openmp " # bug #801460 BDEPEND="app-arch/xz-utils[extra-filters(+)]" diff --git a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild index 55c1ca5a70c6..f81d3ce2ca91 100644 --- a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild +++ b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-cpp/tbb dev-libs/opencl-icd-loader sys-cluster/mpich - sys-libs/libomp + llvm-runtimes/openmp " # bug #801460 BDEPEND=" diff --git a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild index 024336ac92b8..cebe7dbfe4d3 100644 --- a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild +++ b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-cpp/tbb dev-libs/opencl-icd-loader sys-cluster/mpich[fortran] - sys-libs/libomp + llvm-runtimes/openmp " # bug #801460 BDEPEND=" diff --git a/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild b/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild index c3143d68d21a..41b815377ac4 100644 --- a/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild +++ b/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-1.5.4" # are LGPL-2.1+ LICENSE="GPL-3 LGPL-3 LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" DEPEND=" dev-libs/gmp:0= diff --git a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild index 4d76cac8161a..58ffa1e50216 100644 --- a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild +++ b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV} LICENSE="UCAR-Unidata" # SONAME of libnetcdf.so SLOT="0/19" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd" RESTRICT="!test? ( test )" diff --git a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild deleted file mode 100644 index 926fa896d4f4..000000000000 --- a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -FORTRAN_NEEDED="test" - -inherit python-r1 cmake fortran-2 - -DESCRIPTION="Non-linear optimization library" -HOMEPAGE="https://github.com/stevengj/nlopt" -SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 MIT" -KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="cxx guile octave python test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - guile? ( dev-scheme/guile:* ) - octave? ( >=sci-mathematics/octave-6 ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - ) - " -DEPEND="${RDEPEND}" -BDEPEND="python? ( dev-lang/swig )" - -src_prepare() { - cmake_src_prepare - - use python && python_copy_sources -} - -src_configure() { - # MATLAB detection causes problems (as in bug 826774) if we don't - # explicitly disable it. - local mycmakeargs=( - -DNLOPT_CXX=$(usex cxx) - -DNLOPT_FORTRAN=$(usex test) - -DNLOPT_GUILE=$(usex guile) - -DNLOPT_OCTAVE=$(usex octave) - -DNLOPT_MATLAB=OFF - -DNLOPT_PYTHON=OFF - -DNLOPT_SWIG=$(usex python) - -DNLOPT_TESTS=$(usex test) - ) - - cmake_src_configure - - if use python; then - python_configure() { - local mycmakeargs=( - ${mycmakeargs[@]} - -DNLOPT_PYTHON=ON - -DINSTALL_PYTHON_DIR="$(python_get_sitedir)" - ) - - cmake_src_configure - } - - python_foreach_impl run_in_build_dir python_configure - fi -} - -src_compile() { - cmake_src_compile - - if use python; then - python_foreach_impl run_in_build_dir cmake_src_compile - fi -} - -src_test() { - do_test() { - local a f - cd "${BUILD_DIR}"/test - for a in {1..$(usex cxx 9 7)}; do - for f in {5..9}; do - ./testopt -a $a -o $f || die "algorithm $a function $f failed" - done - done - } - - do_test - - if use python; then - python_foreach_impl run_in_build_dir do_test - fi -} - -nlopt_install() { - cmake_src_install - python_optimize -} - -src_install() { - cmake_src_install - - if use python; then - python_foreach_impl run_in_build_dir nlopt_install - fi - - local r - for r in */README; do - newdoc ${r} README.$(dirname ${r}) - done -} diff --git a/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild index 385cdb5a674d..eb57a5b3d68b 100644 --- a/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild +++ b/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt" SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1 MIT" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE="cxx guile octave python test" REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild deleted file mode 100644 index 4788982d8935..000000000000 --- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -FORTRAN_NEEDED="test" - -inherit python-r1 cmake fortran-2 - -DESCRIPTION="Non-linear optimization library" -HOMEPAGE="https://github.com/stevengj/nlopt" -SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 MIT" -KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="cxx guile octave python test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - guile? ( dev-scheme/guile:* ) - octave? ( >=sci-mathematics/octave-6:= ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - ) - " -DEPEND="${RDEPEND}" -BDEPEND="python? ( dev-lang/swig )" - -src_prepare() { - cmake_src_prepare - - use python && python_copy_sources -} - -src_configure() { - # MATLAB detection causes problems (as in bug 826774) if we don't - # explicitly disable it. - local mycmakeargs=( - -DNLOPT_CXX=$(usex cxx) - -DNLOPT_FORTRAN=$(usex test) - -DNLOPT_GUILE=$(usex guile) - -DNLOPT_OCTAVE=$(usex octave) - -DNLOPT_MATLAB=OFF - -DNLOPT_PYTHON=OFF - -DNLOPT_SWIG=$(usex python) - -DNLOPT_TESTS=$(usex test) - ) - - cmake_src_configure - - if use python; then - python_configure() { - local mycmakeargs=( - ${mycmakeargs[@]} - -DNLOPT_PYTHON=ON - -DINSTALL_PYTHON_DIR="$(python_get_sitedir)" - ) - - cmake_src_configure - } - - python_foreach_impl run_in_build_dir python_configure - fi -} - -src_compile() { - cmake_src_compile - - if use python; then - python_foreach_impl run_in_build_dir cmake_src_compile - fi -} - -src_test() { - do_test() { - local a f - cd "${BUILD_DIR}"/test - for a in {1..$(usex cxx 9 7)}; do - for f in {5..9}; do - ./testopt -a $a -o $f || die "algorithm $a function $f failed" - done - done - } - - do_test - - if use python; then - python_foreach_impl run_in_build_dir do_test - fi -} - -nlopt_install() { - cmake_src_install - python_optimize -} - -src_install() { - cmake_src_install - - if use python; then - python_foreach_impl run_in_build_dir nlopt_install - fi - - local r - for r in */README; do - newdoc ${r} README.$(dirname ${r}) - done -} diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index 5b59ba271455..00f196c30f46 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -1 +1,2 @@ DIST onnx-1.16.1.tar.gz 12428832 BLAKE2B 15a7db2fa263914957c671bd8e94eb8b80afeba0b396e8b54f8fb2deda2965885055efae7a6f6e402eb085b5795025020f650132023ba3d4df1f395d99ec353c SHA512 0ae1b36563ddeaa9947bf452eb20b83174e4c2bc4696b61768f096c401666323343fac0f699f756da99d3c29df15a0bd78fe3fa51da15f133617d7310c5b28d4 +DIST onnx-1.16.2.tar.gz 12429500 BLAKE2B 1541fd9e80e305bc0764d1f5d236a89a2f0d0d8819bd6f235c88d35985daf02f575854a537af193befbeab861b2fe6a9d5b8803975b8ae6a47d5d5a6dc28b661 SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d diff --git a/sci-libs/onnx/onnx-1.16.1-r1.ebuild b/sci-libs/onnx/onnx-1.16.1-r1.ebuild index 0e8227eb2487..9d71aeffe047 100644 --- a/sci-libs/onnx/onnx-1.16.1-r1.ebuild +++ b/sci-libs/onnx/onnx-1.16.1-r1.ebuild @@ -19,7 +19,7 @@ IUSE="disableStaticReg" RESTRICT="test" RDEPEND=" - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] dev-libs/protobuf:= dev-cpp/abseil-cpp:= diff --git a/sci-libs/onnx/onnx-1.16.2.ebuild b/sci-libs/onnx/onnx-1.16.2.ebuild new file mode 100644 index 000000000000..9d71aeffe047 --- /dev/null +++ b/sci-libs/onnx/onnx-1.16.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 cmake + +DESCRIPTION="Open Neural Network Exchange (ONNX)" +HOMEPAGE="https://github.com/onnx/onnx" +SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="disableStaticReg" +RESTRICT="test" + +RDEPEND=" + dev-python/protobuf[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-libs/protobuf:= + dev-cpp/abseil-cpp:= +" +DEPEND="${RDEPEND}" + +src_prepare() { + eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch + cmake_src_prepare + distutils-r1_src_prepare +} + +python_configure_all() +{ + mycmakeargs=( + -DONNX_USE_PROTOBUF_SHARED_LIBS=ON + -DONNX_USE_LITE_PROTO=ON + -DONNX_BUILD_SHARED_LIBS=ON + -DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF) + ) + cmake_src_configure +} + +src_configure() { + distutils-r1_src_configure +} + +src_compile() { + mycmakeargs=( + -DONNX_USE_PROTOBUF_SHARED_LIBS=ON + -DONNX_USE_LITE_PROTO=ON + -DONNX_BUILD_SHARED_LIBS=ON + -DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF) + ) + CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile +} + +python_compile_all() { + cmake_src_compile +} + +python_install_all() { + cmake_src_install + distutils-r1_python_install_all +} + +src_install() { + distutils-r1_src_install +} diff --git a/sci-libs/openblas/openblas-0.3.26-r1.ebuild b/sci-libs/openblas/openblas-0.3.26-r1.ebuild index 9bd2045ad974..69f12e137b23 100644 --- a/sci-libs/openblas/openblas-0.3.26-r1.ebuild +++ b/sci-libs/openblas/openblas-0.3.26-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test" REQUIRED_USE="?? ( openmp pthread )" RESTRICT="!test? ( test )" diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index fa54d19c63f2..db7dd2e4cdad 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,6 +1,2 @@ -DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded -DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c -DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee DIST opencascade-7.8.1.tar.gz 48432051 BLAKE2B de7a40b8e6612642a1567d2cf3e6b471c9edeadbc7f686bc8648502165c8d824b3574259874ecb1775c856703fd8df7481c9bc07a66a3a321a83e699e6802052 SHA512 807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81 -DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279 SHA512 71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8 DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c SHA512 9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990 diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch deleted file mode 100644 index caace23fc2d8..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8469f927963fe4bece05297c514fb2b9f9ad9b1a Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl@gmail.com> -Date: Fri, 5 Feb 2021 13:44:15 +0100 -Subject: [PATCH] fix installation of cmake config files - -Signed-off-by: Bernd Waibel <waebbl@gmail.com> ---- - CMakeLists.txt | 2 +- - adm/cmake/occt_macros.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 100d6133..bc8cdb92 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1156,7 +1156,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES}) - endforeach() - # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration - install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") --install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") -+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") - - foreach (OCCT_MODULE ${OCCT_MODULES}) - if (BUILD_MODULE_${OCCT_MODULE}) -diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake -index 0a387945..f10fe5e3 100644 ---- a/adm/cmake/occt_macros.cmake -+++ b/adm/cmake/occt_macros.cmake -@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE) - "cmake_policy(PUSH) - cmake_policy(SET CMP0007 NEW) - string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) -- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") -+ file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") - foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES}) - file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT) - file (REMOVE \"\${TARGET_FILENAME}\") --- -2.30.0 - diff --git a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch deleted file mode 100644 index 38770ac9a541..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://github.com/Open-Cascade-SAS/OCCT/commit/740833a6a88e481f474783c426b6f6311ed586d3 - -From 740833a6a88e481f474783c426b6f6311ed586d3 Mon Sep 17 00:00:00 2001 -From: kgv <kgv@opencascade.com> -Date: Mon, 29 Nov 2021 21:26:45 +0300 -Subject: [PATCH] 0032697: Configuration - fix compilation errors with oneTBB - 2021 - -Removed usage of no more existing tbb::task_scheduler_init and tbb::captured_exception. ---- a/src/OSD/OSD_Parallel_TBB.cxx -+++ b/src/OSD/OSD_Parallel_TBB.cxx -@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS - #include <tbb/parallel_for.h> - #include <tbb/parallel_for_each.h> - #include <tbb/blocked_range.h> --#include <tbb/task_scheduler_init.h> -+#if TBB_VERSION_MAJOR < 2021 -+ #include <tbb/task_scheduler_init.h> -+#endif - Standard_ENABLE_DEPRECATION_WARNINGS - - //======================================================================= -@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin, - const FunctorInterface& theFunctor, - Standard_Integer theNbItems) - { -+#if TBB_VERSION_MAJOR >= 2021 -+ // task_scheduler_init is removed, -+ // exceptions are captured without proxy tbb::captured_exception object -+ (void )theNbItems; -+ tbb::parallel_for_each (theBegin, theEnd, theFunctor); -+#else - try - { - const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool(); -- const Standard_Integer aNbThreads = theNbItems > 0 ? -- aThreadPool->NbDefaultThreadsToLaunch() : -1; -- -+ const Standard_Integer aNbThreads = theNbItems > 0 ? aThreadPool->NbDefaultThreadsToLaunch() : -1; - tbb::task_scheduler_init aScheduler (aNbThreads); - tbb::parallel_for_each (theBegin, theEnd, theFunctor); - } -@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin, - { - throw Standard_ProgramError (anException.what()); - } -+#endif - } - - #endif /* HAVE_TBB */ - diff --git a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch deleted file mode 100644 index 144047fba163..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/831800 -https://dev.opencascade.org/content/dont-pre-strip-binaries - -From 88e59e0199daaf66184833e366e9deb1299078a9 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sun, 5 Jun 2022 09:48:09 +0200 -Subject: [PATCH] avoid pre-stripping binaries - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/adm/cmake/occt_defs_flags.cmake -+++ b/adm/cmake/occt_defs_flags.cmake -@@ -133,8 +133,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang") - # does not support option "-std=c++0x" - set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") - endif() -- # Optimize size of binaries -- set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}") - elseif(MINGW) - add_definitions(-D_WIN32_WINNT=0x0601) - # _WIN32_WINNT=0x0601 (use Windows 7 SDK) -@@ -150,9 +148,6 @@ elseif(MINGW) - elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX) - # Require C++11 - set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") -- # Optimize size of binaries -- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") -- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") - endif() - - if (BUILD_RELEASE_DISABLE_EXCEPTIONS) --- -2.35.1 - diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch deleted file mode 100644 index 2bc59319864a..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 44a30819131496bf41f2e1dcfd362b23173db6fb Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Wed, 5 Oct 2022 21:55:06 +0200 -Subject: [PATCH] add missing #include <limits> - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/src/ViewerTest/ViewerTest_CmdParser.cxx -+++ b/src/ViewerTest/ViewerTest_CmdParser.cxx -@@ -21,6 +21,7 @@ - - #include <algorithm> - #include <iostream> -+#include <limits> - - namespace - { --- -2.38.0 - diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml index cf700b6db37e..38b85e513a1f 100644 --- a/sci-libs/opencascade/metadata.xml +++ b/sci-libs/opencascade/metadata.xml @@ -10,11 +10,9 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="eigen">Enable support for eigenvalues through the header-only <pkg>dev-cpp/eigen</pkg> package.</flag> <flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag> <flag name="freetype">Enable <pkg>media-libs/freetype</pkg> support</flag> <flag name="inspector">Build Inspector tool</flag> - <flag name="jemalloc">Enable jemalloc allocator support via <pkg>dev-libs/jemalloc</pkg></flag> <flag name="json">Enable JSON support through <pkg>dev-libs/rapidjson</pkg></flag> <flag name="optimize">Don't clear allocated memory. Use optimized memory manager unlesstbb USE flag is set.</flag> <flag name="tbb">Enable multithreading with the Intel Threads Building Block <pkg>dev-cpp/tbb</pkg></flag> @@ -22,6 +20,9 @@ <flag name="vtk">Enable Visualization Toolkit support via <pkg>sci-libs/vtk</pkg></flag> </use> <upstream> + <bugs-to>https://github.com/Open-Cascade-SAS/OCCT/issues</bugs-to> + <changelog>https://github.com/Open-Cascade-SAS/OCCT/releases</changelog> + <doc>https://github.com/Open-Cascade-SAS/OCCT/wiki</doc> <remote-id type="github">Open-Cascade-SAS/OCCT</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild deleted file mode 100644 index 2e561ce32b79..000000000000 --- a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_SLOT="$(ver_cut 1-2)" -COMMIT="b079fb9877ef64d4a8158a60fa157f59b096debb" -COMMIT_SHORT="${COMMIT:0:7}" - -DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" -HOMEPAGE="https://www.opencascade.com" -SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" -S="${WORKDIR}/occt-${COMMIT_SHORT}" - -LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="0/${MY_SLOT}" -KEYWORDS="amd64 ~arm64 ~riscv ~x86" -IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk" - -REQUIRED_USE="?? ( optimize tbb )" - -# There's no easy way to test. Testing needs a rather big environment -# properly set up. -RESTRICT="test" - -# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5 -RDEPEND=" - dev-lang/tcl:= - dev-lang/tk:= - dev-tcltk/itcl - dev-tcltk/itk - dev-tcltk/tix - media-libs/fontconfig - media-libs/freetype:2 - media-libs/ftgl - virtual/glu - virtual/opengl - x11-libs/libX11 - examples? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - ffmpeg? ( <media-video/ffmpeg-5:= ) - freeimage? ( media-libs/freeimage ) - tbb? ( dev-cpp/tbb:= ) - vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) -" -DEPEND=" - ${RDEPEND} - eigen? ( dev-cpp/eigen ) - json? ( dev-libs/rapidjson ) - vtk? ( dev-libs/utfcpp ) -" -BDEPEND=" - doc? ( app-text/doxygen[dot] ) - examples? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch - "${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch - "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch - "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch - "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch - "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch - "${FILESDIR}"/${PN}-7.7.0-musl.patch -) - -src_prepare() { - cmake_src_prepare - - sed -e 's|/lib\$|/'$(get_libdir)'\$|' \ - -i adm/templates/OpenCASCADEConfig.cmake.in || die - - # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some - # assumptions it makes about installation paths. Rather than fixing it, just - # get rid of the mechanism altogether - its purpose is to allow a - # side-by-side installation of release and debug libraries. - sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ - -i adm/cmake/occt_toolkit.cmake || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOC_Overview=$(usex doc) - -DBUILD_Inspector=$(usex examples) - -DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916 - - -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" - -DINSTALL_DIR_DATA="share/${PN}/data" - -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_INCLUDE="include/${PN}" - -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" - -DINSTALL_DIR_RESOURCE="share/${PN}/resources" - -DINSTALL_DIR_SAMPLES="share/${PN}/samples" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_WITH_VERSION=OFF - -DINSTALL_SAMPLES=$(usex examples) - -DINSTALL_TEST_CASES=NO - - -DUSE_D3D=NO - # no package yet in tree - -DUSE_DRACO=OFF - -DUSE_EIGEN=$(usex eigen) - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_FREEIMAGE=$(usex freeimage) - -DUSE_FREETYPE=ON - -DUSE_GLES2=$(usex gles2) - # no package in tree - -DUSE_OPENVR=OFF - -DUSE_RAPIDJSON=$(usex json) - -DUSE_TBB=$(usex tbb) - -DUSE_VTK=$(usex vtk) - -DUSE_XLIB=ON - # suppress CMake dev warnings - -Wno-dev - ) - - use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON ) - - if use examples; then - mycmakeargs+=( - -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr - -DBUILD_SAMPLES_QT=ON - ) - fi - - if use vtk; then - local vtk_ver=$(best_version "sci-libs/vtk") - vtk_ver=${vtk_ver#sci-libs/vtk-} - vtk_ver=$(ver_cut 1-2 ${vtk_ver}) - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver} - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) - fi - - cmake_src_configure - - sed -e "s|lib/|$(get_libdir)/|" \ - -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ - < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die - - # use TBB for memory allocation optimizations - if use tbb; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die - fi - - # use internal optimized memory manager and don't clear memory with this - # memory manager. - if use optimize ; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \ - -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \ - -i "${T}"/99${PN} || die - fi -} - -src_install() { - cmake_src_install - - doenvd "${T}/99${PN}" - - docompress -x /usr/share/doc/${PF}/overview/html -} diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild deleted file mode 100644 index 9db1978c27a0..000000000000 --- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# USE_{DRACO,FFMPEG,FREEIMAGE,FREETYPE,GLES2,OPENGL,OPENVR,RAPIDJSON,TBB,TK,VTK,XLIB} - -EAPI=8 - -inherit cmake flag-o-matic - -MY_SLOT="$(ver_cut 1-2)" -MY_PV="$(ver_rs 3 '-')" - -DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" -HOMEPAGE="https://www.opencascade.com" -SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=185d29b92f6764ffa9fc195b7dbe7bba3c4ac855;sf=tgz -> ${P}.tar.gz" -S="${WORKDIR}/occt-185d29b" - -LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="0/${MY_SLOT}" -KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" -IUSE="doc examples ffmpeg freeimage gles2 json optimize tbb vtk" - -REQUIRED_USE="?? ( optimize tbb )" - -# There's no easy way to test. Testing needs a rather big environment -# properly set up. -RESTRICT="test" - -# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871 -RDEPEND=" - dev-lang/tcl:= - dev-lang/tk:= - media-libs/fontconfig - media-libs/freetype:2 - virtual/opengl - x11-libs/libX11 - examples? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - ffmpeg? ( <media-video/ffmpeg-5:= ) - freeimage? ( media-libs/freeimage ) - tbb? ( dev-cpp/tbb:= ) - vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - json? ( dev-libs/rapidjson ) - vtk? ( dev-libs/utfcpp ) -" -BDEPEND=" - doc? ( app-text/doxygen ) - examples? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch - "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch - "${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch - "${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch - "${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch - "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch - "${FILESDIR}"/${PN}-7.7.0-musl.patch -) - -src_prepare() { - cmake_src_prepare - - sed -e 's|/lib\$|/'$(get_libdir)'\$|' \ - -i adm/templates/OpenCASCADEConfig.cmake.in || die - - # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some - # assumptions it makes about installation paths. Rather than fixing it, just - # get rid of the mechanism altogether - its purpose is to allow a - # side-by-side installation of release and debug libraries. - sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ - -i adm/cmake/occt_toolkit.cmake || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862912 - # https://tracker.dev.opencascade.org/view.php?id=33091 - filter-lto - - local mycmakeargs=( - -DBUILD_DOC_Overview=$(usex doc) - -DBUILD_Inspector=$(usex examples) - -DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916 - - -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" - -DINSTALL_DIR_DATA="share/${PN}/data" - -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_INCLUDE="include/${PN}" - -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" - -DINSTALL_DIR_RESOURCE="share/${PN}/resources" - -DINSTALL_DIR_SAMPLES="share/${PN}/samples" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_WITH_VERSION=OFF - -DINSTALL_SAMPLES=$(usex examples) - -DINSTALL_TEST_CASES=NO - - -DUSE_D3D=NO - # no package yet in tree - -DUSE_DRACO=OFF - # has no function in 7.7.0_beta - # see https://dev.opencascade.org/content/occt-770-beta-version-available#comment-23733 - -DUSE_EIGEN=OFF - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_FREEIMAGE=$(usex freeimage) - -DUSE_FREETYPE=ON - -DUSE_GLES2=$(usex gles2) - # no package in tree - -DUSE_OPENVR=OFF - -DUSE_RAPIDJSON=$(usex json) - -DUSE_TBB=$(usex tbb) - -DUSE_VTK=$(usex vtk) - -DUSE_XLIB=ON - # suppress CMake dev warnings - -Wno-dev - ) - - use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON ) - - if use examples; then - mycmakeargs+=( - -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr - -DBUILD_SAMPLES_QT=ON - ) - fi - - if use tbb; then - mycmakeargs+=( -D3RDPARTY_TBB_DIR="${ESYSROOT}"/usr ) - fi - - if use vtk; then - local vtk_ver=$(best_version "sci-libs/vtk") - vtk_ver=${vtk_ver#sci-libs/vtk-} - vtk_ver=$(ver_cut 1-2 ${vtk_ver}) - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver} - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) - fi - - cmake_src_configure - - sed -e "s|lib/|$(get_libdir)/|" \ - -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ - < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die - - # use TBB for memory allocation optimizations - if use tbb; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die - fi - - # use internal optimized memory manager and don't clear memory with this - # memory manager. - if use optimize ; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \ - -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \ - -i "${T}"/99${PN} || die - fi -} - -src_install() { - cmake_src_install - - doenvd "${T}/99${PN}" - - docompress -x /usr/share/doc/${PF}/overview/html -} diff --git a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild deleted file mode 100644 index ebb48f6acc7e..000000000000 --- a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic virtualx - -DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" -HOMEPAGE="https://www.opencascade.com" - -MY_PN="OCCT" - -MY_TEST_PV="7.7.0" -MY_TEST_PV2="${MY_TEST_PV//./_}" - -SRC_URI=" - test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tgz - -> ${PN}-dataset-${MY_TEST_PV}.tar.gz ) -" - -if [[ ${PV} = *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git" -else - MY_PV="${PV//./_}" - SRC_URI+=" - https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz - " - S="${WORKDIR}/${MY_PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="0/$(ver_cut 1-2)" -IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector json +opengl optimize tbb test testprograms tk vtk" - -REQUIRED_USE=" - ?? ( optimize tbb ) - ?? ( opengl gles2-only ) - test? ( freeimage json opengl ) -" - -# There's no easy way to test. Testing needs a rather big environment properly set up. -RESTRICT="!test? ( test )" - -# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871 -RDEPEND=" - dev-lang/tcl:= - tk? ( dev-lang/tk:= ) - dev-libs/double-conversion - freetype? ( - media-libs/fontconfig - media-libs/freetype:2 - ) - gles2-only? ( - media-libs/libglvnd - ) - opengl? ( - media-libs/libglvnd[X] - ) - X? ( - x11-libs/libX11 - ) - examples? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - ffmpeg? ( <media-video/ffmpeg-5:= ) - freeimage? ( media-libs/freeimage ) - inspector? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - tbb? ( dev-cpp/tbb:= ) - vtk? ( - dev-lang/tk:= - sci-libs/vtk:=[rendering] - tbb? ( - sci-libs/vtk:=[tbb,-cuda] - ) - ) -" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) - json? ( dev-libs/rapidjson ) -" -BDEPEND=" - doc? ( app-text/doxygen[dot] ) - inspector? ( - dev-qt/linguist-tools:5 - ) - test? ( dev-tcltk/thread ) -" - -PATCHES=( - "${FILESDIR}/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch" - "${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch" - "${FILESDIR}/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch" - "${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch" - "${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch" - "${FILESDIR}/${PN}-7.7.0-musl.patch" - "${FILESDIR}/${PN}-7.7.0-tbb-detection.patch" - "${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch" - "${FILESDIR}/${PN}-7.8.0-tests.patch" -) - -src_unpack() { - if [[ ${PV} = *9999* ]] ; then - git-r3_src_unpack - else - unpack "${P}.tar.gz" - fi - - if use test; then - mkdir "${WORKDIR}/data" - pushd "${WORKDIR}/data" > /dev/null || die - # should be in paths indicated by CSF_TestDataPath environment variable, - # or in subfolder data in the script directory - unpack "${PN}-dataset-${MY_TEST_PV}.tar.gz" - popd > /dev/null || die - fi -} - -src_prepare() { - cmake_src_prepare - - sed -e 's|/lib\$|/'"$(get_libdir)"'\$|' \ - -i adm/templates/OpenCASCADEConfig.cmake.in || die - - # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some - # assumptions it makes about installation paths. Rather than fixing it, just - # get rid of the mechanism altogether - its purpose is to allow a - # side-by-side installation of release and debug libraries. - sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ - -i adm/cmake/occt_toolkit.cmake || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862912 - # https://tracker.dev.opencascade.org/view.php?id=33091 - filter-lto - - local mycmakeargs=( - -D3RDPARTY_DIR="${ESYSROOT}/usr" - -DBUILD_CPP_STANDARD="C++17" - -DBUILD_SOVERSION_NUMBERS=2 - - -DBUILD_DOC_Overview="$(usex doc)" - -DBUILD_Inspector="$(usex inspector)" - - -DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)" - -DBUILD_USE_PCH="no" - # -DBUILD_OPT_PROFILE="Default" # Production - # -DBUILD_RESOURCES="yes" - # -DBUILD_YACCLEX="yes" - - -DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916 - -DINSTALL_DIR="${EPREFIX}/usr" - -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" - -DINSTALL_DIR_DATA="share/${PN}/data" - -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_INCLUDE="include/${PN}" - -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" - -DINSTALL_DIR_RESOURCE="share/${PN}/resources" - -DINSTALL_DIR_SAMPLES="share/${PN}/samples" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_TESTS="share/${PN}/tests" - -DINSTALL_DIR_WITH_VERSION="no" - -DINSTALL_SAMPLES="$(usex examples)" - - -DINSTALL_TEST_CASES="$(usex testprograms)" - - # no package yet in tree - -DUSE_DRACO="no" - -DUSE_FFMPEG="$(usex ffmpeg)" - -DUSE_FREEIMAGE="$(usex freeimage)" - -DUSE_FREETYPE="$(usex freetype)" - # Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module - -DUSE_GLES2="$(usex gles2-only)" - # Indicates whether OpenGL desktop should be used in OCCT visualization module - -DUSE_OPENGL="$(usex opengl)" - # no package in tree - -DUSE_OPENVR="no" - -DUSE_RAPIDJSON="$(usex json)" - -DUSE_TBB="$(usex tbb)" - -DUSE_TK="$(usex tk)" - -DUSE_VTK="$(usex vtk)" - -DUSE_XLIB="$(usex X)" - ) - - if use doc; then - mycmakeargs+=( - -DINSTALL_DOC_Overview="yes" - -D3RDPARTY_SKIP_DOT_EXECUTABLE="no" - ) - fi - - if use examples || use inspector; then - mycmakeargs+=( - -D3RDPARTY_QT_DIR="${ESYSROOT}/usr" - -DBUILD_SAMPLES_QT="$(usex examples)" - ) - fi - - if use tbb; then - mycmakeargs+=( - -D3RDPARTY_TBB_DIR="${ESYSROOT}/usr" - ) - fi - - if use vtk; then - local vtk_ver - vtk_ver="$(best_version "sci-libs/vtk")" - vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}") - mycmakeargs+=( - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}" - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)" - ) - fi - - cmake_src_configure - - sed -e "s|lib/|$(get_libdir)/|" \ - -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ - < "${FILESDIR}/${PN}.env.in" > "${T}/99${PN}" || die - - # use TBB for memory allocation optimizations - if use tbb; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/99${PN}" || die - fi - - # use internal optimized memory manager and don't clear memory with this - # memory manager. - if use optimize ; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \ - -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \ - -i "${T}/99${PN}" || die - fi -} - -src_test() { - echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die - - if has_version media-fonts/dejavu; then - cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal - fi - - local test_file=${T}/testscript.tcl - - local draw_opts=( - i # see ${BUILD_DIR}/custom*.sh - # -b # batch mode (no GUI, no viewers) - -v # no GUI, use virtual (off-screen) windows for viewers - ) - - local test_names=( - "demo draw bug30430" # prone to dying due to cpu limit - ) - local test_opts=( # run single tests - -overwrite - ) - for test_name in "${test_names[@]}"; do - cat >> "${test_file}" <<- _EOF_ || die - test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]} - _EOF_ - done - - local testgrid_opts=() - - local SKIP_TESTS=() - - if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then - SKIP_TESTS+=( - 'blend complex F4' - 'bugs' - 'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11} - 'heal checkshape bug32448_1' - 'hlr exact_hlr bug25813_2' - - 'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate} - 'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703} - 'lowalgos proximity '{A4,A5} - 'opengl background bug27836' - 'opengl drivers opengles' - 'opengles3' - - 'offset wire_closed_inside_0_005 D1' - 'offset wire_unclosed_outside_0_025 A1' - - 'demo draw bug30430' - ) - - local DEL_TESTS=( - 'opengl/data/background/bug27836' - 'perf/mesh/bug26965' - 'v3d/trsf/bug26029' - ) - - for test in "${DEL_TESTS[@]}"; do - rm "${CMAKE_USE_DIR}/tests/${test}" || die - done - fi - - if ! use vtk; then - SKIP_TESTS+=( - 'vtk' - ) - echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules" - fi - - if [[ -n "${SKIP_TESTS[*]}" ]]; then - testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" ) - fi - - testgrid_opts+=( - # -refresh 5 - -overwrite - ) - cat >> "${test_file}" <<- _EOF_ || die - testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]} - _EOF_ - - # # regenerate summary in case we have to - # cat >> "${test_file}" <<- _EOF_ || die - # testsummarize "${BUILD_DIR}/test_results" - # _EOF_ - - # Work around zink warnings - export LIBGL_ALWAYS_SOFTWARE="true" - - export CASROOT="${BUILD_DIR}" - - virtx \ - "${BUILD_DIR}/draw.sh" \ - "${draw_opts[@]}" \ - -f "${test_file}" - - if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then - eerror "tests never ran!" - die - fi - failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")" - if [[ -n ${failed_tests} ]]; then - eerror "Failed tests:" - eerror "${failed_tests}" - die - fi -} - -src_install() { - cmake_src_install - - doenvd "${T}/99${PN}" - - docompress -x "/usr/share/doc/${PF}/overview/html" -} diff --git a/sci-libs/opencascade/opencascade-7.8.1.ebuild b/sci-libs/opencascade/opencascade-7.8.1.ebuild index 30e00b7a18a0..3dd89af46c7c 100644 --- a/sci-libs/opencascade/opencascade-7.8.1.ebuild +++ b/sci-libs/opencascade/opencascade-7.8.1.ebuild @@ -26,7 +26,7 @@ else https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz " S="${WORKDIR}/${MY_PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild index 5bcb22cdbeda..1b03b5cf145c 100644 --- a/sci-libs/openlibm/openlibm-0.8.3.ebuild +++ b/sci-libs/openlibm/openlibm-0.8.3.ebuild @@ -13,7 +13,7 @@ IUSE="static-libs" LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+" # See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm SLOT="0/4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" PATCHES=( "${FILESDIR}"/${P}-stack-protection.patch diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index dad0e7d950fa..2881865ca64c 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -1,4 +1 @@ -DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117 -DIST p4est-2.3.6.tar.gz 2645384 BLAKE2B f6763e6a5b8b371eeead8a9d6481ea63e01ec5f13ea0dd9748aeaaec5551d39ac5d73f75f92275bfe61370e578ba1b1d0940c569e48fbd83997eaad4ab65b088 SHA512 99df91ee9d351cc889a532764096428e3f575c5f71199fca9f217c3dac5030a263308aa9c698476e7a12774d0751409f27e70ac2e9cd27847b2345b3f909b195 -DIST p4est-2.8.5.tar.gz 2721258 BLAKE2B 07fd70f5b7ce0d2dcdc0d913cd9ae7920272a0e459c7db7f9d180b592570a5232c7d2bd03547eec3333dcdc6fdc83adcce30c71eb9c44ab6e6b9b9a314707471 SHA512 22b5a9bbfb51e972f4b93a90f5fa0f9557770ccbe357044b5bb97b31d02783affef188cde38c86bb4ece31ba23ce47e4eb95a6e7c5f02d11549cf986e85f68a0 DIST p4est-2.8.6.tar.gz 4589078 BLAKE2B 7f868cf38aa4e0abc50b4c1071ca39ada2fa9cc973f31bb0365eb1bf447f9a23fa570ada525b1482cb8120a534582cf978ccae83048d27c439ea07572171e928 SHA512 e5892cf153cb4204c2ae3c1389c6a872113b037abda1d0f95df062ad2651a2231b1e3cabdc8e86f3f61ad021274a069acf7ec801281164740a8018ac46b07c96 diff --git a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch b/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch deleted file mode 100644 index a3209d5064fb..000000000000 --- a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index e8b7e67..1817e37 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,6 @@ - # This file is part of p4est. - # Makefile.am in toplevel directory - --ACLOCAL_AMFLAGS = -I config @P4EST_SC_AMFLAGS@ - if P4EST_SC_MK_USE - @P4EST_SC_MK_INCLUDE@ - endif diff --git a/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch b/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch deleted file mode 100644 index 40f032c109b7..000000000000 --- a/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index b30f0e3..2c636f9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -82,7 +82,7 @@ src_libp4est_la_SOURCES = \ - src_libp4est_la_CPPFLAGS = $(AM_CPPFLAGS) $(P4EST_CPPFLAGS) - ## This is the official API versioning scheme of libtool. Please see: - ## Read https://www.gnu.org/software/libtool/manual/libtool.html#Versioning --src_libp4est_la_LDFLAGS = -version-info 1:0:0 -+src_libp4est_la_LDFLAGS = -release $(VERSION) - src_libp4est_la_LIBADD = @P4EST_SC_LDADD@ - LDADD += src/libp4est.la @P4EST_SC_LDADD@ - EXTRA_src_libp4est_la_DEPENDENCIES = @P4EST_SC_LDADD@ diff --git a/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch deleted file mode 100644 index 0063acf9c5c1..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78c02bf..d1b2094 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ - DESCRIPTION "p4est manages a collection---a forest---of octrees in parallel." - VERSION ${PROJECT_VERSION}) - -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - include(CTest) - - list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) -@@ -68,8 +70,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_BINARY_DIR}/include/ - - install(TARGETS p4est - EXPORT ${PROJECT_NAME}-targets --ARCHIVE DESTINATION lib --LIBRARY DESTINATION lib -+ARCHIVE DESTINATION ${library_reldir} -+LIBRARY DESTINATION ${library_reldir} - RUNTIME DESTINATION bin - ) - diff --git a/sci-libs/p4est/files/p4est-2.8.5-fix_cmake_path.patch b/sci-libs/p4est/files/p4est-2.8.5-fix_cmake_path.patch deleted file mode 100644 index 8202a4007ede..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-fix_cmake_path.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1b2094..e5fe188 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,9 +104,8 @@ endif(BUILD_TESTING) - # --- packaging - - install(FILES --${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSC.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindP4EST.cmake --DESTINATION cmake) -+DESTINATION ${library_reldir}/cmake/P4est) - - include(cmake/pkgconf.cmake) - include(cmake/install.cmake) -diff --git a/cmake/install.cmake b/cmake/install.cmake -index f4f92c4..0f31976 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -4,7 +4,7 @@ include(CMakePackageConfigHelpers) - - configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake --INSTALL_DESTINATION cmake -+INSTALL_DESTINATION ${library_reldir}/cmake/P4est - ) - - write_basic_package_version_file( -@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion - - install(EXPORT ${PROJECT_NAME}-targets - NAMESPACE ${PROJECT_NAME}:: --DESTINATION cmake -+DESTINATION ${library_reldir}/cmake/P4est - ) - - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}ConfigVersion.cmake --DESTINATION cmake -+DESTINATION ${library_reldir}/cmake/P4est - ) - - # --- CPack diff --git a/sci-libs/p4est/files/p4est-2.8.5-set_version.patch b/sci-libs/p4est/files/p4est-2.8.5-set_version.patch deleted file mode 100644 index 061081a0da9e..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-set_version.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/cmake/git.cmake b/cmake/git.cmake -index f88e984..f04f52b 100644 ---- a/cmake/git.cmake -+++ b/cmake/git.cmake -@@ -1,39 +1,5 @@ --# --- extract version from Git -- --set(PROJECT_MAJOR 0) --set(PROJECT_MINOR 0) --set(PROJECT_PATCH 0) --set(PROJECT_VERSION 0.0.0) --find_program(GIT_VERSION_GEN NAMES git-version-gen -- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) --if(GIT_VERSION_GEN) -- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball-version -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- RESULT_VARIABLE _err -- OUTPUT_VARIABLE git_version -- OUTPUT_STRIP_TRAILING_WHITESPACE) --endif() --if(_err EQUAL 0) -- if(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") -- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") -- set(PROJECT_MINOR "${CMAKE_MATCH_2}") -- set(PROJECT_PATCH "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}.999) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") -- set(PROJECT_MINOR "${CMAKE_MATCH_2}") -- set(PROJECT_PATCH "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") -- set(PROJECT_MINOR "${CMAKE_MATCH_2}") -- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)") -- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") -- set(PROJECT_VERSION ${PROJECT_MAJOR}) -- endif() --endif() -+set(git_version 2.8.5) -+set(PROJECT_MAJOR 2) -+set(PROJECT_MINOR 8) -+set(PROJECT_PATCH 5) -+set(PROJECT_VERSION 2.8.5) diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml index c58dd131de04..f29f22e517cb 100644 --- a/sci-libs/p4est/metadata.xml +++ b/sci-libs/p4est/metadata.xml @@ -17,7 +17,6 @@ processor cores. </longdescription> <use> <flag name="vtk-binary">Enable binary vtk output. If disabled vtk files will be written in ASCII text format.</flag> - <flag name="romio">Build with support for the ROMIO MPI-IO component</flag> </use> <upstream> <remote-id type="github">cburstedde/libsc</remote-id> diff --git a/sci-libs/p4est/p4est-2.3.6.ebuild b/sci-libs/p4est/p4est-2.3.6.ebuild deleted file mode 100644 index 27b596c41c15..000000000000 --- a/sci-libs/p4est/p4est-2.3.6.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools flag-o-matic lua-single toolchain-funcs - -DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" -HOMEPAGE="http://www.p4est.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI=" - https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" - -# TODO petsc -IUSE="debug doc examples mpi openmp romio threads +vtk-binary" -REQUIRED_USE="${LUA_REQUIRED_USE} - romio? ( mpi )" - -RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=] - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio=] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch - "${FILESDIR}"/${PN}-2.3.6-override_soname.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - lua-single_pkg_setup -} - -src_prepare() { - default - - # Inject libsc to get all parts of the build system... - if ! [[ ${PV} = *9999* ]]; then - rmdir "${S}/sc" || die "rmdir failed" - mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed" - fi - - # Inject a version number into the build system - echo "${PV}" > "${S}"/.tarball-version - - AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config" - eautoreconf - - sed -i \ - "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \ - "${S}"/configure || die "sed failed" - - sed -i \ - "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \ - "${S}"/configure || die "sed failed" -} - -src_configure() { - # avoid underlinkage - append-libs -lsc - - local myeconfargs=( - --disable-static - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp) - $(use_enable romio mpiio) - $(use_enable threads pthread) - $(use_enable vtk-binary) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${ESYSROOT}/usr" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - use doc && dodoc -r doc/* - - if use examples - then - docinto examples - dodoc -r example/* - docompress -x /usr/share/doc/${PF}/examples - else - # Remove compiled example binaries in case of -examples: - rm -r "${ED}"/usr/bin || die "rm failed" - fi - - # Fix wrong installation paths: - dodir /usr/share/p4est - mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" - mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/p4est/p4est-2.8.5-r3.ebuild b/sci-libs/p4est/p4est-2.8.5-r3.ebuild deleted file mode 100644 index 253f6ee31911..000000000000 --- a/sci-libs/p4est/p4est-2.8.5-r3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" -HOMEPAGE="http://www.p4est.org/" - -LIBSC_VERSION="${PV}" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" - -# TODO petsc -IUSE="debug doc examples mpi openmp threads +vtk-binary" - -RDEPEND=" - ~sci-libs/libsc-${LIBSC_VERSION}[mpi=,openmp=,threads=] - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-fix_build_system.patch - "${FILESDIR}"/${P}-set_version.patch - "${FILESDIR}"/${P}-fix_cmake_path.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - # avoid using debug codepaths that are manually enabled with the - # RelWithDebInfo build type - local CMAKE_BUILD_TYPE="Release" - - local mycmakeargs=( - -Dmpi="$(usex mpi)" - -Dopenmp="$(usex openmp)" - -Dlibrary_reldir="$(get_libdir)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - [ ! "$(get_libdir)" = "lib" ] && mv "${ED}"/usr/{lib,$(get_libdir)}/pkgconfig || die "mv failed" - - mkdir -p "${ED}"/usr/share/doc/${PF} - mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${PF}/ || die "mv failed" - rm -r "${ED}"/usr/share/docs || die "rm failed" -} diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 9b9b818237e4..ba9f05542d86 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,2 +1 @@ -DIST pcl-1.14.0.tar.gz 68662907 BLAKE2B 5e797666b2a6cd5b828b399592daaa78c3bcbc0968c1ec5dafe441717bb4067de4604cdab11d3317370c7f69a1b29db0cca6348e91697d16846ae44c1952ce3e SHA512 0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f DIST pcl-1.14.1.tar.gz 68672885 BLAKE2B 207389d844ac2793f6f321504c05282ace2d8e51aaf0277c13fb11f5be22ac93f7e044f34fc2259aca7d7e34ae3b9b00287ee9df0d15f851f1f4b4bd651578c7 SHA512 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b diff --git a/sci-libs/pcl/files/pcl-1.14.1-boost.patch b/sci-libs/pcl/files/pcl-1.14.1-boost.patch new file mode 100644 index 000000000000..8f99023f741a --- /dev/null +++ b/sci-libs/pcl/files/pcl-1.14.1-boost.patch @@ -0,0 +1,31 @@ +From c6bbf02a084a39a02d9e2fc318a59fe2f1ff55c1 Mon Sep 17 00:00:00 2001 +From: Transporter <OgreTransporter@users.noreply.github.com> +Date: Sun, 26 May 2024 10:37:57 +0200 +Subject: [PATCH] Fix boost hash data type (#6053) + +* Fix boost hash data type + +* Change file name generation. +--- + visualization/src/pcl_visualizer.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp +index 5f073646ac1..bc9b959c246 100644 +--- a/visualization/src/pcl_visualizer.cpp ++++ b/visualization/src/pcl_visualizer.cpp +@@ -4591,10 +4591,12 @@ pcl::visualization::PCLVisualizer::getUniqueCameraFile (int argc, char **argv) + // Build camera filename + if (valid) + { +- unsigned int digest[5]; ++ boost::uuids::detail::sha1::digest_type digest; + sha1.get_digest (digest); + sstream << "."; +- sstream << std::hex << digest[0] << digest[1] << digest[2] << digest[3] << digest[4]; ++ for (int i = 0; i < 5; ++i) { ++ sstream << std::hex << *(reinterpret_cast<unsigned int*>(&digest[0]) + i); ++ } + sstream << ".cam"; + } + } diff --git a/sci-libs/pcl/pcl-1.14.0.ebuild b/sci-libs/pcl/pcl-1.14.0.ebuild deleted file mode 100644 index 6fc89d2b0d70..000000000000 --- a/sci-libs/pcl/pcl-1.14.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake cuda - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" -else - KEYWORDS="amd64 ~arm" - SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" -fi - -HOMEPAGE="https://pointclouds.org/" -DESCRIPTION="2D/3D image and point cloud processing" -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials" -# tests need the gtest sources to be available at build time -RESTRICT="test" - -RDEPEND=" - >=sci-libs/flann-1.7.1 - dev-libs/boost:= - dev-cpp/eigen:3 - opengl? ( virtual/opengl media-libs/freeglut ) - openni? ( dev-libs/OpenNI ) - openni2? ( dev-libs/OpenNI2 ) - pcap? ( net-libs/libpcap ) - png? ( media-libs/libpng:0= ) - qhull? ( media-libs/qhull:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtopengl:5 - vtk? ( sci-libs/vtk[qt5] ) - ) - qt6? ( - !qt5? ( - dev-qt/qtbase:6[concurrent,gui,opengl] - vtk? ( sci-libs/vtk[-qt5,qt6] ) - ) - ) - usb? ( virtual/libusb:1 ) - vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) -" -DEPEND="${RDEPEND} - !!dev-cpp/metslib -" -BDEPEND=" - doc? ( - app-text/doxygen[dot] - virtual/latex-base - ) - tutorials? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme - dev-python/sphinxcontrib-doxylink - ) - virtual/pkgconfig" - -REQUIRED_USE=" - openni? ( usb ) - openni2? ( usb ) - tutorials? ( doc ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch - "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch -) - -src_prepare() { - if use cuda; then - cuda_src_prepare - cuda_add_sandbox -w - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DDOC_INSTALL_DIR=share/doc/${PF}" - "-DLIB_INSTALL_DIR=$(get_libdir)" - "-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)" - "-DWITH_CUDA=$(usex cuda TRUE FALSE)" - "-DWITH_LIBUSB=$(usex usb TRUE FALSE)" - "-DWITH_OPENGL=$(usex opengl TRUE FALSE)" - "-DWITH_PNG=$(usex png TRUE FALSE)" - "-DWITH_QHULL=$(usex qhull TRUE FALSE)" - "-DWITH_VTK=$(usex vtk TRUE FALSE)" - "-DWITH_PCAP=$(usex pcap TRUE FALSE)" - "-DWITH_OPENNI=$(usex openni TRUE FALSE)" - "-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)" - "-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)" - "-DWITH_DOCS=$(usex doc TRUE FALSE)" - "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)" - "-DBUILD_global_tests=FALSE" - ) - - if use qt5; then - mycmakeargs+=( "-DWITH_QT=QT5" ) - elif use qt6; then - mycmakeargs+=( "-DWITH_QT=QT6" ) - else - mycmakeargs+=( "-DWITH_QT=NO" ) - fi - - cmake_src_configure -} diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1-r1.ebuild index b5d59362af57..42b8092fcda8 100644 --- a/sci-libs/pcl/pcl-1.14.1.ebuild +++ b/sci-libs/pcl/pcl-1.14.1-r1.ebuild @@ -5,44 +5,45 @@ EAPI=8 inherit cmake cuda -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" else - KEYWORDS="~amd64 ~arm" SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz" S="${WORKDIR}/${PN}-${P}" + KEYWORDS="amd64 ~arm" fi DESCRIPTION="2D/3D image and point cloud processing" HOMEPAGE="https://pointclouds.org/" + LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials" +IUSE="cuda doc opengl openni openni2 pcap png +qhull qt6 usb vtk cpu_flags_x86_sse test tutorials" + +REQUIRED_USE=" + openni? ( usb ) + openni2? ( usb ) + tutorials? ( doc ) +" RESTRICT="!test? ( test )" RDEPEND=" - >=sci-libs/flann-1.7.1 dev-libs/boost:= dev-cpp/eigen:3 - opengl? ( virtual/opengl media-libs/freeglut ) + >=sci-libs/flann-1.7.1 + opengl? ( + media-libs/freeglut + virtual/opengl + ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtopengl:5 - vtk? ( sci-libs/vtk[qt5] ) - ) qt6? ( - !qt5? ( - dev-qt/qtbase:6[concurrent,gui,opengl] - vtk? ( sci-libs/vtk[-qt5,qt6] ) - ) + dev-qt/qtbase:6[concurrent,gui,opengl] + vtk? ( sci-libs/vtk[-qt5(-),qt6] ) ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] ) @@ -65,17 +66,12 @@ BDEPEND=" virtual/pkgconfig " -REQUIRED_USE=" - openni? ( usb ) - openni2? ( usb ) - tutorials? ( doc ) -" - PATCHES=( "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch - "${FILESDIR}/${PN}-1.14.1-gcc15.patch" - "${FILESDIR}/${PN}-1.14.1-tests.patch" + "${FILESDIR}"/${PN}-1.14.1-gcc15.patch + "${FILESDIR}"/${PN}-1.14.1-tests.patch + "${FILESDIR}"/${PN}-1.14.1-boost.patch ) src_prepare() { @@ -107,9 +103,7 @@ src_configure() { -DBUILD_global_tests="$(usex test)" ) - if use qt5; then - mycmakeargs+=( "-DWITH_QT=QT5" ) - elif use qt6; then + if use qt6; then mycmakeargs+=( "-DWITH_QT=QT6" ) else mycmakeargs+=( "-DWITH_QT=NO" ) diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild index b5d59362af57..fee79ca912be 100644 --- a/sci-libs/pcl/pcl-9999.ebuild +++ b/sci-libs/pcl/pcl-9999.ebuild @@ -5,44 +5,45 @@ EAPI=8 inherit cmake cuda -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" else - KEYWORDS="~amd64 ~arm" SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz" S="${WORKDIR}/${PN}-${P}" + KEYWORDS="~amd64 ~arm" fi DESCRIPTION="2D/3D image and point cloud processing" HOMEPAGE="https://pointclouds.org/" + LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials" +IUSE="cuda doc opengl openni openni2 pcap png +qhull qt6 usb vtk cpu_flags_x86_sse test tutorials" + +REQUIRED_USE=" + openni? ( usb ) + openni2? ( usb ) + tutorials? ( doc ) +" RESTRICT="!test? ( test )" RDEPEND=" - >=sci-libs/flann-1.7.1 dev-libs/boost:= dev-cpp/eigen:3 - opengl? ( virtual/opengl media-libs/freeglut ) + >=sci-libs/flann-1.7.1 + opengl? ( + media-libs/freeglut + virtual/opengl + ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtopengl:5 - vtk? ( sci-libs/vtk[qt5] ) - ) qt6? ( - !qt5? ( - dev-qt/qtbase:6[concurrent,gui,opengl] - vtk? ( sci-libs/vtk[-qt5,qt6] ) - ) + dev-qt/qtbase:6[concurrent,gui,opengl] + vtk? ( sci-libs/vtk[-qt5(-),qt6] ) ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] ) @@ -65,17 +66,11 @@ BDEPEND=" virtual/pkgconfig " -REQUIRED_USE=" - openni? ( usb ) - openni2? ( usb ) - tutorials? ( doc ) -" - PATCHES=( "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch - "${FILESDIR}/${PN}-1.14.1-gcc15.patch" - "${FILESDIR}/${PN}-1.14.1-tests.patch" + "${FILESDIR}"/${PN}-1.14.1-gcc15.patch + "${FILESDIR}"/${PN}-1.14.1-tests.patch ) src_prepare() { @@ -107,9 +102,7 @@ src_configure() { -DBUILD_global_tests="$(usex test)" ) - if use qt5; then - mycmakeargs+=( "-DWITH_QT=QT5" ) - elif use qt6; then + if use qt6; then mycmakeargs+=( "-DWITH_QT=QT6" ) else mycmakeargs+=( "-DWITH_QT=NO" ) diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest index 284dc6241b45..29077fa26b92 100644 --- a/sci-libs/pdal/Manifest +++ b/sci-libs/pdal/Manifest @@ -1,4 +1,2 @@ -DIST PDAL-2.5.3-src.tar.bz2 102669314 BLAKE2B 1c6c8406f8de65a04364cc1141be809c00ea716fcfd5578833883357258855b3f7e70ea03c86f487dff0bc98072c29bed45a613c14ace05aef6ae49627b40374 SHA512 f67a303711b7d9e9dc14260afb96d299bcd5327ba0cc947143a583f55bd532a248b131e4602fd37d711ad0084e8601420828dacac40c414b95b8e9f9e8175e1b -DIST PDAL-2.6.2-src.tar.bz2 87274819 BLAKE2B 5855a268889064fdc72d15ec1dbe7ab3ed8eb6bee2fa4ec724e9f287f25d6b9f9f9171829a2121e156bec575c96a42f26e223c807c8aa9d3a88f77c245c3d01c SHA512 4a9c07deaca6fbe994808904a6b90e09beb418155c662369046b6ddea03c8aa57ca2e9b4c2057c8e409bb197b90adb36e334c9c2136034a021be84763fa93551 -DIST PDAL-2.7.2-src.tar.bz2 87431434 BLAKE2B f5093008a84c9e5250bb9e8124c694a919b2a31c0f55b750f8d186e954c51c6672b5e63824203dfeb4efa24e6b0a8c0d354229a655416d5ef56336dc2bcd3a80 SHA512 81e4d4b136e292f5a2e4145f730e00375a26a6a2aa52af679bea6d9d371b55c92641475ea332fc8301fe35d237415b70ea311da3fc1bc4ff69013a7448f66896 DIST PDAL-2.8.0-src.tar.bz2 87483358 BLAKE2B 8d15187f2b6a7110d52e2621d65ee8eedce0dd21c415c18fbb1e48dbdb0b24307b42487f4631f227875079ba47031c27196399970458236c7139b8f1418aa3b8 SHA512 d3b02f13e56423c5086e72908f932db384cb0d64f3d3e5cec121c1e283268f8e38f6123ff852d77c07ea9777001a78595bdafed458dc06aa52402d92e76ce995 +DIST PDAL-2.8.1-src.tar.bz2 87507277 BLAKE2B 634ba5f2c5548bfa1fbdcc257185dcd99d2c8bda73e3ac24cf092d378150285912d9c5b48c88e21df14d5502221865273fa6167b82886ef848fc7d445c8937dc SHA512 fb1d0e892ea38518526ce0086415fffd92f356d104d9982f8883d254a206a75b51ff796dbf5db266a4dc8345ae91b825e8a50ae78eb21552c86ab600905850ad diff --git a/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch b/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch deleted file mode 100644 index 29edb8518b9d..000000000000 --- a/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch +++ /dev/null @@ -1,37 +0,0 @@ -From https://github.com/PDAL/PDAL/commit/516e33ad7f40e54affd5754617fbe26d70ef2dd4 -From: Jorge Gustavo Rocha <jgr@geomaster.pt> -Date: Thu, 20 Apr 2023 13:11:46 +0100 -Subject: [PATCH] prevent invalid conversion from const compile error (#4030) -squashed with -From https://github.com/dg0yt/PDAL/commit/49eb31840dc1c07d6ff235ea292c7c0703f8a884 -From: Kai Pastor <dg0yt@darc.de> -Date: Fri, 12 May 2023 07:44:59 +0200 -Subject: [PATCH] Don't use const_cast - -Amends #4030. ---- - pdal/Geometry.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pdal/Geometry.cpp b/pdal/Geometry.cpp -index 10d185dbe4..8b010d3378 100644 ---- a/pdal/Geometry.cpp -+++ b/pdal/Geometry.cpp -@@ -153,7 +153,7 @@ Geometry& Geometry::operator=(const Geometry& input) - - bool Geometry::srsValid() const - { -- OGRSpatialReference *srs = m_geom->getSpatialReference(); -+ const OGRSpatialReference *srs = m_geom->getSpatialReference(); - return srs && srs->GetRoot(); - } - -@@ -172,7 +172,7 @@ Utils::StatusWithReason Geometry::transform(SpatialReference out) - return StatusWithReason(-2, - "Geometry::transform() failed. NULL target SRS."); - -- OGRSpatialReference *inSrs = m_geom->getSpatialReference(); -+ const OGRSpatialReference *inSrs = m_geom->getSpatialReference(); - SrsTransform transform(*inSrs, OGRSpatialReference(out.getWKT().data())); - if (m_geom->transform(transform.get()) != OGRERR_NONE) - return StatusWithReason(-1, "Geometry::transform() failed."); diff --git a/sci-libs/pdal/pdal-2.5.3-r1.ebuild b/sci-libs/pdal/pdal-2.5.3-r1.ebuild deleted file mode 100644 index a3c13fdd4978..000000000000 --- a/sci-libs/pdal/pdal-2.5.3-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="A C++ library for translating and manipulating point cloud data" -HOMEPAGE="https://pdal.io/" -SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.bz2" - -LICENSE="BSD" -SLOT="0/15" -KEYWORDS="amd64 ~arm ~arm64 ~x86" -IUSE="postgres test" -RESTRICT="!test? ( test )" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - net-misc/curl - app-arch/zstd:= - dev-libs/libxml2 - dev-libs/openssl:= - sci-libs/gdal:= - sci-libs/libgeotiff:= - sys-libs/libunwind:= - sys-libs/zlib - postgres? ( dev-db/postgresql:*[xml] ) -" -DEPEND=" - test? ( sci-libs/gdal[geos,jpeg,png] ) - ${RDEPEND} -" - -S="${WORKDIR}/PDAL-${PV}-src" - -PATCHES=( - "${FILESDIR}/${PN}-2.4.3-fix-gdal37.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)" - -DWITH_COMPLETION=ON - ) - - cmake_src_configure -} - -src_test() { - local myctestargs=( - --exclude-regex '(pgpointcloudtest|pdal_io_bpf_base_test|pdal_io_bpf_zlib_test|pdal_filters_overlay_test|pdal_filters_stats_test|pdal_app_plugin_test|pdal_merge_test|pdal_io_stac_reader_test)' - --output-on-failure - -j1 - ) - - cmake_src_test -} diff --git a/sci-libs/pdal/pdal-2.6.2.ebuild b/sci-libs/pdal/pdal-2.6.2.ebuild deleted file mode 100644 index a5c701ad7ee0..000000000000 --- a/sci-libs/pdal/pdal-2.6.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="A C++ library for translating and manipulating point cloud data" -HOMEPAGE="https://pdal.io/" -SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.bz2" - -LICENSE="BSD" -SLOT="0/16" -KEYWORDS="amd64 ~arm ~arm64 ~x86" -IUSE="debug postgres test" -RESTRICT="!test? ( test )" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - net-misc/curl - app-arch/zstd:= - dev-libs/libxml2 - dev-libs/openssl:= - sci-libs/gdal:= - sci-libs/libgeotiff:= - sys-libs/zlib - debug? ( sys-libs/libunwind:= ) - postgres? ( dev-db/postgresql:*[xml] ) -" - -DEPEND=" - test? ( sci-libs/gdal[geos,jpeg,png] ) - ${RDEPEND} -" - -S="${WORKDIR}/PDAL-${PV}-src" - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/862915 - # https://github.com/PDAL/PDAL/issues/3836 - # - # only occurs inside unwind support - if use debug; then - append-flags -fno-strict-aliasing - filter-lto - fi - - local mycmakeargs=( - -DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)" - -DWITH_COMPLETION=ON - -DWITH_BACKTRACE="$(usex debug)" - ) - - cmake_src_configure -} - -src_test() { - local myctestargs=( - --exclude-regex '(pgpointcloudtest|pdal_info_test|pdal_io_bpf_base_test|pdal_io_bpf_zlib_test|pdal_filters_overlay_test|pdal_filters_stats_test|pdal_app_plugin_test|pdal_merge_test|pdal_io_stac_reader_test)' - --output-on-failure - -j1 - ) - - cmake_src_test -} diff --git a/sci-libs/pdal/pdal-2.8.0.ebuild b/sci-libs/pdal/pdal-2.8.0.ebuild index f18bb365d8a9..559c3beba909 100644 --- a/sci-libs/pdal/pdal-2.8.0.ebuild +++ b/sci-libs/pdal/pdal-2.8.0.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/PDAL-${PV}-src" LICENSE="BSD" SLOT="0/18" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="debug postgres test" BDEPEND=" diff --git a/sci-libs/pdal/pdal-2.7.2.ebuild b/sci-libs/pdal/pdal-2.8.1.ebuild index 84959cdb0a36..f18bb365d8a9 100644 --- a/sci-libs/pdal/pdal-2.7.2.ebuild +++ b/sci-libs/pdal/pdal-2.8.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar S="${WORKDIR}/PDAL-${PV}-src" LICENSE="BSD" -SLOT="0/17" +SLOT="0/18" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="debug postgres test" diff --git a/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild b/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild index 9ea598c98339..fa9054aa7b7e 100644 --- a/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild +++ b/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild @@ -56,7 +56,7 @@ RDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] - qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) + qt5? ( dev-python/pyqt5[${PYTHON_USEDEP}] ) ') ) qhull? ( media-libs/qhull:0= ) diff --git a/sci-libs/primegen/primegen-0.97-r2.ebuild b/sci-libs/primegen/primegen-0.97-r2.ebuild deleted file mode 100644 index 3394131d63df..000000000000 --- a/sci-libs/primegen/primegen-0.97-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Small, fast library to generate primes in order" -HOMEPAGE="http://cr.yp.to/primegen.html" -SRC_URI="http://cr.yp.to/primegen/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -PATCHES=( - "${FILESDIR}"/${P}-man.patch - "${FILESDIR}"/${P}-missing-headers.patch - "${FILESDIR}"/${P}-respect-ar-ranlib.patch -) - -src_prepare() { - default - - local file - while IFS="" read -d $'\0' -r file; do - sed -i -e 's:\(primegen.a\):lib\1:' "${file}" || die - done < <(find . -type f -print0) - mkdir usr || die -} - -src_configure() { - # Fixes bug #161015 - append-flags -fsigned-char - echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die - echo "${S}/usr" > conf-home || die - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die - tc-export AR RANLIB -} - -src_test() { - [[ $(./primes 1 100000000 | md5sum ) == "4e2b0027288a27e9c99699364877c9db "* ]] || die "test failed" -} - -src_install() { - dobin primegaps primes primespeed - doman primegaps.1 primes.1 primespeed.1 primegen.3 - dolib.a libprimegen.a - # include the 2 typedefs to avoid collision (bug #248327) - sed -i \ - -e "s/#include \"uint32.h\"/$(grep typedef uint32.h)/" \ - -e "s/#include \"uint64.h\"/$(grep typedef uint64.h)/" \ - primegen.h || die - - doheader primegen.h - dodoc BLURB CHANGES README TODO -} diff --git a/sci-libs/proj/proj-9.4.1.ebuild b/sci-libs/proj/proj-9.4.1.ebuild index 4c1965549bb9..c841419ed12b 100644 --- a/sci-libs/proj/proj-9.4.1.ebuild +++ b/sci-libs/proj/proj-9.4.1.ebuild @@ -22,7 +22,7 @@ else https://download.osgeo.org/proj/${P}.tar.gz https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz " - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi LICENSE="MIT" diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index abce85ddf365..4564491a43b5 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -1,4 +1,3 @@ -DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c -DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587 DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631 +DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289 diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch b/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch deleted file mode 100644 index 69c2ddc5947e..000000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/torch/__init__.py b/torch/__init__.py -index 03f6eca622..297fb169a4 100644 ---- a/torch/__init__.py -+++ b/torch/__init__.py -@@ -412,7 +412,7 @@ def manager_path(): - - - # Shared memory manager needs to know the exact location of manager executable --_C._initExtension(manager_path()) -+_C._initExtension(b"/usr/bin/torch_shm_manager") - del manager_path - - # Appease the type checker: it can't deal with direct setting of globals(). diff --git a/sci-libs/pytorch/files/pytorch-2.0.0-global-dlopen.patch b/sci-libs/pytorch/files/pytorch-2.0.0-global-dlopen.patch deleted file mode 100644 index 0f1b400e234d..000000000000 --- a/sci-libs/pytorch/files/pytorch-2.0.0-global-dlopen.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/torch/__init__.py 2023-04-05 11:12:25.682681130 +0200 -+++ b/torch/__init__.py 2023-04-05 11:13:00.640170307 +0200 -@@ -165,7 +165,7 @@ - lib_path = os.path.join(os.path.dirname(here), 'lib', lib_name) - - try: -- ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL) -+ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL) - except OSError as err: - # Can only happen for wheel with cuda libs as PYPI deps - # As PyTorch is not purelib, but nvidia-*-cu11 is -@@ -187,7 +187,7 @@ - raise err - for lib_folder, lib_name in cuda_libs.items(): - _preload_cuda_deps(lib_folder, lib_name) -- ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL) -+ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL) - - - if (USE_RTLD_GLOBAL_WITH_LIBTORCH or os.getenv('TORCH_USE_RTLD_GLOBAL')) and \ diff --git a/sci-libs/pytorch/files/pytorch-2.1.1-dontbuildagain.patch b/sci-libs/pytorch/files/pytorch-2.5.1-dontbuildagain.patch index f031a7345c69..3a3d24e155d9 100644 --- a/sci-libs/pytorch/files/pytorch-2.1.1-dontbuildagain.patch +++ b/sci-libs/pytorch/files/pytorch-2.5.1-dontbuildagain.patch @@ -1,13 +1,13 @@ ---- a/setup.py 2023-12-07 20:38:21.247250326 +0100 -+++ b/setup.py 2023-12-07 20:38:30.707272148 +0100 -@@ -455,14 +455,6 @@ +--- a/setup.py ++++ b/setup.py +@@ -470,14 +470,6 @@ check_submodules() check_pydep("yaml", "pyyaml") - + build_python = not BUILD_LIBTORCH_WHL - build_caffe2( - version=version, - cmake_python_library=cmake_python_library, -- build_python=True, +- build_python=build_python, - rerun_cmake=RERUN_CMAKE, - cmake_only=CMAKE_ONLY, - cmake=cmake, diff --git a/sci-libs/pytorch/files/pytorch-2.5.1-setup.patch b/sci-libs/pytorch/files/pytorch-2.5.1-setup.patch new file mode 100644 index 000000000000..10052a65c939 --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-2.5.1-setup.patch @@ -0,0 +1,10 @@ +--- a/setup.py 2023-02-14 19:34:56.327571750 +0100 ++++ b/setup.py 2023-02-14 19:35:31.073020464 +0100 +@@ -238,6 +238,7 @@ + import setuptools.command.sdist + from setuptools import Extension, find_packages, setup + from setuptools.dist import Distribution ++sys.path[:0] = os.getcwd() + from tools.build_pytorch_libs import build_caffe2 + from tools.generate_torch_version import get_torch_version + from tools.setup_helpers.cmake import CMake diff --git a/sci-libs/pytorch/pytorch-2.3.0.ebuild b/sci-libs/pytorch/pytorch-2.3.0.ebuild deleted file mode 100644 index 75fbde095842..000000000000 --- a/sci-libs/pytorch/pytorch-2.3.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_EXT=1 -inherit distutils-r1 prefix - -DESCRIPTION="Tensors and Dynamic neural networks in Python" -HOMEPAGE="https://pytorch.org/" -SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} -RDEPEND=" - ${PYTHON_DEPS} - ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/sympy[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND} - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" - -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-2.1.1-dontbuildagain.patch \ - "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ - "${FILESDIR}"/${PN}-2.0.0-global-dlopen.patch \ - "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ - "${FILESDIR}"/${PN}-1.13.0-setup.patch \ - "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \ - - # Set build dir for pytorch's setup - sed -i \ - -e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \ - tools/setup_helpers/env.py \ - || die - distutils-r1_src_prepare - - hprefixify tools/setup_helpers/env.py -} - -python_compile() { - PYTORCH_BUILD_VERSION=${PV} \ - PYTORCH_BUILD_NUMBER=0 \ - USE_SYSTEM_LIBS=ON \ - CMAKE_BUILD_DIR="${BUILD_DIR}" \ - distutils-r1_python_compile develop sdist -} - -python_install() { - USE_SYSTEM_LIBS=ON distutils-r1_python_install -} diff --git a/sci-libs/pytorch/pytorch-2.3.1.ebuild b/sci-libs/pytorch/pytorch-2.5.1-r1.ebuild index 75fbde095842..e90ea383aecb 100644 --- a/sci-libs/pytorch/pytorch-2.3.1.ebuild +++ b/sci-libs/pytorch/pytorch-2.5.1-r1.ebuild @@ -23,6 +23,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE} RDEPEND=" ${PYTHON_DEPS} ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] + >=sci-libs/caffe2-2.5.1-r5 $(python_gen_cond_dep ' dev-python/typing-extensions[${PYTHON_USEDEP}] dev-python/sympy[${PYTHON_USEDEP}] @@ -36,12 +37,8 @@ DEPEND="${RDEPEND} src_prepare() { eapply \ - "${FILESDIR}"/${PN}-2.1.1-dontbuildagain.patch \ - "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ - "${FILESDIR}"/${PN}-2.0.0-global-dlopen.patch \ - "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ - "${FILESDIR}"/${PN}-1.13.0-setup.patch \ - "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \ + "${FILESDIR}"/${P}-dontbuildagain.patch \ + "${FILESDIR}"/${P}-setup.patch # Set build dir for pytorch's setup sed -i \ @@ -50,6 +47,9 @@ src_prepare() { || die distutils-r1_src_prepare + # Get object file from caffe2 + cp /var/lib/caffe2/functorch.so functorch/functorch.so || die + hprefixify tools/setup_helpers/env.py } diff --git a/sci-libs/qd/qd-2.3.24.ebuild b/sci-libs/qd/qd-2.3.24.ebuild index 2dd5a5b3591a..9318840d7862 100644 --- a/sci-libs/qd/qd-2.3.24.ebuild +++ b/sci-libs/qd/qd-2.3.24.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/" SRC_URI="https://www.davidhbailey.com/dhbsoftware/${P}.tar.gz" LICENSE="LBNLBSD" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran" src_configure() { diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild index f8c6fd2a1367..a77c621f57ce 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild @@ -33,11 +33,11 @@ DEPEND=" test? ( virtual/blas dev-cpp/gtest - sys-libs/libomp + llvm-runtimes/openmp ) benchmark? ( virtual/blas - sys-libs/libomp + llvm-runtimes/openmp ) " diff --git a/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild index cc410094094f..9050d13eb312 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild @@ -33,11 +33,11 @@ DEPEND=" test? ( virtual/blas dev-cpp/gtest - sys-libs/libomp + llvm-runtimes/openmp ) benchmark? ( virtual/blas - sys-libs/libomp + llvm-runtimes/openmp ) " diff --git a/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild index ed39ae5207d8..80644ab20db8 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild @@ -34,11 +34,11 @@ DEPEND=" test? ( virtual/blas dev-cpp/gtest - sys-libs/libomp + llvm-runtimes/openmp ) benchmark? ( virtual/blas - sys-libs/libomp + llvm-runtimes/openmp ) " diff --git a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild index b4fe232ecfe8..b101aed6dee7 100644 --- a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild @@ -6,8 +6,10 @@ EAPI=8 DOCS_BUILDER="doxygen" DOCS_DIR="docs/.doxygen" DOCS_DEPEND="media-gfx/graphviz" +LLVM_COMPAT=( 18 ) ROCM_VERSION=${PV} -inherit cmake docs edo multiprocessing rocm + +inherit cmake docs edo multiprocessing rocm llvm-r1 DESCRIPTION="AMD's library for BLAS on ROCm" HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS" @@ -35,11 +37,11 @@ DEPEND=" test? ( virtual/blas dev-cpp/gtest - sys-libs/libomp + llvm-runtimes/openmp ) benchmark? ( virtual/blas - sys-libs/libomp + llvm-runtimes/openmp ) " diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild index 60110fcd62fc..7b75953d510f 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild @@ -34,7 +34,7 @@ DEPEND="dev-util/hip BDEPEND=" test? ( dev-cpp/gtest dev-libs/boost - >=sci-libs/fftw-3 sys-libs/libomp ) + >=sci-libs/fftw-3 llvm-runtimes/openmp ) >=dev-build/cmake-3.22 dev-build/rocm-cmake " diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild index f4ddb494bf35..0c383fa01164 100644 --- a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild @@ -39,7 +39,7 @@ DEPEND="=dev-util/hip-5* dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 - sys-libs/libomp + llvm-runtimes/openmp sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] ) " diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild index 99709902c496..d1289f597217 100644 --- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild +++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild @@ -40,7 +40,7 @@ DEPEND="=dev-util/hip-6* dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 - sys-libs/libomp + llvm-runtimes/openmp sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] ) " diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 53c3575548ce..41c1592e6c9a 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1 +1 @@ -DIST rtabmap-0.21.3.tar.gz 21956462 BLAKE2B 41c3c95715bc165d339a4a63747e40db4357ffd1b5151630689008a6856c4721805ec8def9b47ea487ca428641b5d253dfa5b62b1bbb14027168bbc0e4c350d3 SHA512 0b9b2d2fdcfdef0324fcde54a74ecec75786372f2df0bd8d9383ae71c500098bff016465a68ce2a9328d0a2beee4bf9b0af6b21435589ce1e91503fe2aca5d01 +DIST rtabmap-0.21.4.tar.gz 21963687 BLAKE2B aa1cd455624a5a0ac4529fe6f8cd95500a4e247cc71d40041d813ed551e7f0026ad73b2a7e37869cc600aacaac5d5aea5934ebc8f888bcfa2bb21359451c6f23 SHA512 72a0d2247485008c8656a6806aa0e062759debdf1ce05a6e15e73474f531e4f4d91f77b3f9f21bf01038a6cdee46aecfa2f1728537ac9571f97085b878879172 diff --git a/sci-libs/rtabmap/rtabmap-0.21.3.ebuild b/sci-libs/rtabmap/rtabmap-0.21.4.ebuild index 88c172c29ffb..89d5ba388dbb 100644 --- a/sci-libs/rtabmap/rtabmap-0.21.3.ebuild +++ b/sci-libs/rtabmap/rtabmap-0.21.4.ebuild @@ -3,45 +3,38 @@ EAPI=8 -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/introlab/rtabmap" -fi - -inherit ${SCM} cmake multilib - VER_SUFFIX=noetic +inherit cmake -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/introlab/rtabmap" else - KEYWORDS="~amd64" SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P}-${VER_SUFFIX}" + KEYWORDS="~amd64" fi DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" -HOMEPAGE="http://introlab.github.io/rtabmap/" +HOMEPAGE="https://introlab.github.io/rtabmap/" + LICENSE="BSD" SLOT="0" -IUSE="examples ieee1394 openni2 qt5" +IUSE="examples ieee1394 openni2 qt6" RDEPEND=" - media-libs/opencv:=[qt5(-)?] - sci-libs/pcl:=[openni,vtk,qt5(-)?] - sci-libs/vtk:=[qt5(-)?] - sys-libs/zlib - sci-libs/octomap:= - dev-libs/boost:= dev-cpp/yaml-cpp:= + dev-libs/boost:= + media-libs/opencv:=[qt6(-)?] + sci-libs/octomap:= + sci-libs/pcl:=[openni,vtk,qt6(-)?] + sci-libs/vtk:=[qt6(-)?] + sys-libs/zlib ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 + qt6? ( + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 ) " DEPEND="${RDEPEND}" @@ -49,10 +42,11 @@ BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( - "-DWITH_QT=$(usex qt5 ON OFF)" - "-DWITH_DC1394=$(usex ieee1394 ON OFF)" - "-DWITH_OPENNI2=$(usex openni2 ON OFF)" - "-DBUILD_EXAMPLES=$(usex examples ON OFF)" + -DRTABMAP_QT_VERSION=6 + -DWITH_QT=$(usex qt6) + -DWITH_DC1394=$(usex ieee1394) + -DWITH_OPENNI2=$(usex openni2) + -DBUILD_EXAMPLES=$(usex examples) ) cmake_src_configure } diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild index 88c172c29ffb..89d5ba388dbb 100644 --- a/sci-libs/rtabmap/rtabmap-9999.ebuild +++ b/sci-libs/rtabmap/rtabmap-9999.ebuild @@ -3,45 +3,38 @@ EAPI=8 -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/introlab/rtabmap" -fi - -inherit ${SCM} cmake multilib - VER_SUFFIX=noetic +inherit cmake -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/introlab/rtabmap" else - KEYWORDS="~amd64" SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P}-${VER_SUFFIX}" + KEYWORDS="~amd64" fi DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" -HOMEPAGE="http://introlab.github.io/rtabmap/" +HOMEPAGE="https://introlab.github.io/rtabmap/" + LICENSE="BSD" SLOT="0" -IUSE="examples ieee1394 openni2 qt5" +IUSE="examples ieee1394 openni2 qt6" RDEPEND=" - media-libs/opencv:=[qt5(-)?] - sci-libs/pcl:=[openni,vtk,qt5(-)?] - sci-libs/vtk:=[qt5(-)?] - sys-libs/zlib - sci-libs/octomap:= - dev-libs/boost:= dev-cpp/yaml-cpp:= + dev-libs/boost:= + media-libs/opencv:=[qt6(-)?] + sci-libs/octomap:= + sci-libs/pcl:=[openni,vtk,qt6(-)?] + sci-libs/vtk:=[qt6(-)?] + sys-libs/zlib ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 + qt6? ( + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 ) " DEPEND="${RDEPEND}" @@ -49,10 +42,11 @@ BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( - "-DWITH_QT=$(usex qt5 ON OFF)" - "-DWITH_DC1394=$(usex ieee1394 ON OFF)" - "-DWITH_OPENNI2=$(usex openni2 ON OFF)" - "-DBUILD_EXAMPLES=$(usex examples ON OFF)" + -DRTABMAP_QT_VERSION=6 + -DWITH_QT=$(usex qt6) + -DWITH_DC1394=$(usex ieee1394) + -DWITH_OPENNI2=$(usex openni2) + -DBUILD_EXAMPLES=$(usex examples) ) cmake_src_configure } diff --git a/sci-libs/safetensors/safetensors-0.4.3.ebuild b/sci-libs/safetensors/safetensors-0.4.3-r1.ebuild index fd009b581914..fd009b581914 100644 --- a/sci-libs/safetensors/safetensors-0.4.3.ebuild +++ b/sci-libs/safetensors/safetensors-0.4.3-r1.ebuild diff --git a/sci-libs/safetensors/safetensors-0.4.5.ebuild b/sci-libs/safetensors/safetensors-0.4.5-r1.ebuild index 637f93e00be0..637f93e00be0 100644 --- a/sci-libs/safetensors/safetensors-0.4.5.ebuild +++ b/sci-libs/safetensors/safetensors-0.4.5-r1.ebuild diff --git a/sci-libs/scalapack/metadata.xml b/sci-libs/scalapack/metadata.xml index e1ce450b30e6..09aa43fb3d1e 100644 --- a/sci-libs/scalapack/metadata.xml +++ b/sci-libs/scalapack/metadata.xml @@ -12,4 +12,7 @@ passing for interprocessor communication. It assumes matrices are laid out in a two-dimensional block cyclic decomposition. </longdescription> + <upstream> + <remote-id type="github">Reference-ScaLAPACK/scalapack</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild b/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild index ce98c63fc31a..c9f54e5d32df 100644 --- a/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild +++ b/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild @@ -47,6 +47,9 @@ src_configure() { append-flags -fno-strict-aliasing filter-lto + # https://github.com/Reference-ScaLAPACK/scalapack/issues/31 + append-cflags -std=gnu89 + scalapack_configure() { local mycmakeargs=( -DUSE_OPTIMIZED_LAPACK_BLAS=ON diff --git a/sci-libs/shapelib/shapelib-1.6.0.ebuild b/sci-libs/shapelib/shapelib-1.6.0.ebuild index 576d2163972f..5817f09926a9 100644 --- a/sci-libs/shapelib/shapelib-1.6.0.ebuild +++ b/sci-libs/shapelib/shapelib-1.6.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0/4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="doc static-libs" src_prepare() { diff --git a/sci-libs/spqr/spqr-2.0.9-r4.ebuild b/sci-libs/spqr/spqr-2.0.9-r4.ebuild index d888cf52b9be..0e88a5cfea9f 100644 --- a/sci-libs/spqr/spqr-2.0.9-r4.ebuild +++ b/sci-libs/spqr/spqr-2.0.9-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc partition tbb" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest index c75842ef8603..e3e3e3ee8cbb 100644 --- a/sci-libs/stellarsolver/Manifest +++ b/sci-libs/stellarsolver/Manifest @@ -1,2 +1 @@ -DIST stellarsolver-2.5.tar.gz 23402988 BLAKE2B ec1ab428413104a329128e3e90883884eedf2c031fb4f3f5a8ab7579243a7b7a496579f3127ad0324176cf825d02a417e1538272b931a87090f1373adf0d1239 SHA512 003522ac0b4130e0ca16ccb617743e3716aa2a182ad63abfb901ea0b47c28a745e8ca1e5b7874d17636ff948b1ebc055277557f89a159e425af7d2a64f513fe8 DIST stellarsolver-2.6.tar.gz 26565848 BLAKE2B 35cceedca14b6fc062d963a47954b1c06ef908f4f8572776ca4de6a4b618eb72445cf05aefc5c62fa7a0a55e3719e6201f5734a827fc2fe752b919a30bd9c0cc SHA512 28c15e1cbc4e5d9b852001b80e8183ea98557ef0bdf0c9b3a238485d9594058bbd7003abc77cb41caf6717c809c7a3d1babd236adbeac6bb0e383f5a73815e95 diff --git a/sci-libs/stellarsolver/files/stellarsolver-2.5-compiler-warning.patch b/sci-libs/stellarsolver/files/stellarsolver-2.5-compiler-warning.patch deleted file mode 100644 index eaae908db774..000000000000 --- a/sci-libs/stellarsolver/files/stellarsolver-2.5-compiler-warning.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 475193d28c0b33b14cecf9492a7c3cd06abcc9f5 Mon Sep 17 00:00:00 2001 -From: Tim Surber <me@timsurber.de> -Date: Wed, 10 Apr 2024 23:36:49 +0200 -Subject: [PATCH] fix another compiler warning - ---- - stellarsolver/astrometry/util/fitstable.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/stellarsolver/astrometry/util/fitstable.c b/stellarsolver/astrometry/util/fitstable.c -index 10e1bc2..5885040 100644 ---- a/stellarsolver/astrometry/util/fitstable.c -+++ b/stellarsolver/astrometry/util/fitstable.c -@@ -1227,7 +1227,11 @@ static fitstable_t* open_for_writing(const char* fn, const char* mode, FILE* fid - else { - tab->fid = fopen(fn, mode); - if (!tab->fid) { -- SYSERROR("Couldn't open output file %s for writing", fn); -+ if (fn != NULL) { -+ SYSERROR("Couldn't open output file %s for writing", fn); -+ } else { -+ SYSERROR("Couldn't open output file because the filename is null"); -+ } - goto bailout; - } - } diff --git a/sci-libs/stellarsolver/files/stellarsolver-2.5-qsort-warning.patch b/sci-libs/stellarsolver/files/stellarsolver-2.5-qsort-warning.patch deleted file mode 100644 index 72acd2adc9c6..000000000000 --- a/sci-libs/stellarsolver/files/stellarsolver-2.5-qsort-warning.patch +++ /dev/null @@ -1,291 +0,0 @@ -From efd820a1655f808107a1984d55124ea142c66fa6 Mon Sep 17 00:00:00 2001 -From: Tim Surber <me@timsurber.de> -Date: Wed, 10 Apr 2024 23:31:58 +0200 -Subject: [PATCH] backport qsort warning fix - ---- - .../astrometry/include/astrometry/ioutils.h | 9 +++ - .../include/astrometry/os-features-config.h | 4 +- - .../include/astrometry/permutedsort.h | 2 +- - stellarsolver/astrometry/os-features.h | 16 ------ - stellarsolver/astrometry/util/bl-sort.c | 3 +- - stellarsolver/astrometry/util/ioutils.c | 2 +- - .../astrometry/util/os-features-test.c | 57 ------------------- - stellarsolver/astrometry/util/os-features.c | 6 +- - stellarsolver/astrometry/util/permutedsort.c | 3 +- - .../astrometry/util/qsort_reentrant.c | 37 +++--------- - 10 files changed, 27 insertions(+), 112 deletions(-) - -diff --git a/stellarsolver/astrometry/include/astrometry/ioutils.h b/stellarsolver/astrometry/include/astrometry/ioutils.h -index 07f7eecf..e5cf63c8 100644 ---- a/stellarsolver/astrometry/include/astrometry/ioutils.h -+++ b/stellarsolver/astrometry/include/astrometry/ioutils.h -@@ -31,6 +31,15 @@ char* dirname(const char* path); - - extern uint32_t ENDIAN_DETECTOR; - -+void QSORT_R(void* base, size_t nmembers, size_t member_size, -+ void* token, int (*compar)(void *, const void *, const void *)); -+ -+/** -+ You should define the "comparison" function like this: -+ static int QSORT_COMPARISON_FUNCTION(my_comparison, void* token, const void* v1, const void* v2) { -+ */ -+#define QSORT_COMPARISON_FUNCTION(func, thunk, v1, v2) func(thunk, v1, v2) -+ - int copy_file(const char* infn, const char* outfn); - - int pad_fid(FILE* fid, size_t len, char pad); -diff --git a/stellarsolver/astrometry/include/astrometry/os-features-config.h b/stellarsolver/astrometry/include/astrometry/os-features-config.h -index a246d428..bcc336e9 100644 ---- a/stellarsolver/astrometry/include/astrometry/os-features-config.h -+++ b/stellarsolver/astrometry/include/astrometry/os-features-config.h -@@ -1,4 +1,4 @@ --#define NEED_DECLARE_QSORT_R 0 --#define NEED_QSORT_R 1 -+#define NEED_DECLARE_QSORT_R 1 -+#define NEED_QSORT_R 0 - #define NEED_SWAP_QSORT_R 0 - #define HAVE_NETPBM 0 -\ No newline at end of file -diff --git a/stellarsolver/astrometry/include/astrometry/permutedsort.h b/stellarsolver/astrometry/include/astrometry/permutedsort.h -index 23c1a7e9..d3590160 100644 ---- a/stellarsolver/astrometry/include/astrometry/permutedsort.h -+++ b/stellarsolver/astrometry/include/astrometry/permutedsort.h -@@ -7,7 +7,7 @@ - #define PERMUTED_SORT_H - - // for QSORT_COMPARISON_FUNCTION --#include "os-features.h" -+#include "ioutils.h" - - /* - Computes the permutation array that will cause the "realarray" to be -diff --git a/stellarsolver/astrometry/os-features.h b/stellarsolver/astrometry/os-features.h -index 2c2a9d19..90dd375f 100644 ---- a/stellarsolver/astrometry/os-features.h -+++ b/stellarsolver/astrometry/os-features.h -@@ -108,22 +108,6 @@ - -Ubuntu 8.10 - */ - --#if NEED_DECLARE_QSORT_R --//// NOTE: this declaration must match os-features-test.c . --void qsort_r(void *base, size_t nmemb, size_t sz, -- void *userdata, -- int (*compar)(void *, const void *, const void *)); --#endif -- --#if NEED_SWAP_QSORT_R --#define QSORT_R(a,b,c,d,e) qsort_r(a,b,c,e,d) --#define QSORT_COMPARISON_FUNCTION(func, thunk, v1, v2) func(v1, v2, thunk) -- --#else --#define QSORT_R qsort_r --#define QSORT_COMPARISON_FUNCTION(func, thunk, v1, v2) func(thunk, v1, v2) -- --#endif - - // As suggested in http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Function-Names.html - #if __STDC_VERSION__ < 199901L -diff --git a/stellarsolver/astrometry/util/bl-sort.c b/stellarsolver/astrometry/util/bl-sort.c -index 70123660..a024d271 100644 ---- a/stellarsolver/astrometry/util/bl-sort.c -+++ b/stellarsolver/astrometry/util/bl-sort.c -@@ -3,6 +3,8 @@ - # Licensed under a 3-clause BSD style license - see LICENSE - */ - -+#include "ioutils.h" // for QSORT_R -+ - #include "bl-sort.h" - // for qsort_r - #include "os-features.h" -@@ -166,4 +168,3 @@ static int sort_helper_pl(const void* v1, const void* v2, void* userdata) { - void pl_sort(pl* list, int (*compare)(const void* v1, const void* v2)) { - bl_sort_with_userdata(list, sort_helper_pl, compare); - } -- -diff --git a/stellarsolver/astrometry/util/ioutils.c b/stellarsolver/astrometry/util/ioutils.c -index c490fb8c..b4ecba0b 100644 ---- a/stellarsolver/astrometry/util/ioutils.c -+++ b/stellarsolver/astrometry/util/ioutils.c -@@ -43,7 +43,7 @@ - - #include "os-features.h" - #include "ioutils.h" --//#include "os-features.h" -+#include "qsort_reentrant.c" - #include "errors.h" - #include "log.h" - -diff --git a/stellarsolver/astrometry/util/os-features-test.c b/stellarsolver/astrometry/util/os-features-test.c -index 445ac1cd..a274c16b 100644 ---- a/stellarsolver/astrometry/util/os-features-test.c -+++ b/stellarsolver/astrometry/util/os-features-test.c -@@ -14,63 +14,6 @@ int main() { - } - #endif - --#ifdef TEST_QSORT_R --static int cmp(void* u, const void* a, const void* b) { -- return 0; --} --int main() { -- int array; -- int baton; -- qsort_r(&array, 1, sizeof(int), &baton, cmp); -- //printf("#define NEED_QSORT_R 0\n"); -- return 0; --} --#endif -- --#ifdef TEST_DECLARE_QSORT_R --// Test whether just declaring qsort_r as we do causes a compile failure. -- --void qsort_r(void *base, size_t nmemb, size_t sz, -- void *userdata, -- int (*compar)(void *, const void *, const void *)); -- --int main() { -- //printf("#define NEED_DECLARE_QSORT_R 1\n"); -- return 0; --} --#endif -- --#ifdef TEST_SWAP_QSORT_R --// Use the result of TEST_DECLARE_QSORT_R and TEST_NEED_QSORT_R, or else --// this test will fail with a warning about undefined qsort_r --// Include .c rather than .h because we test with: --// gcc -o (exec) os-features-test.c --// and if NEED_QSORT_R, os-features.c includes qsort_reentrant.c --#include "os-features-config.h.tmp" --#define DONT_INCLUDE_OS_FEATURES_CONFIG_H 1 --#include "os-features.c" --#undef DONT_INCLUDE_OS_FEATURES_CONFIG_H --// Test whether qsort_r works unswapped. (ie, qsort_r matches the definition of --// QSORT_R defined in the os-features.h documentation.) --static int sortfunc(void* thunk, const void* v1, const void* v2) { -- const int* i1 = v1; -- const int* i2 = v2; -- if (*i1 < *i2) -- return -1; -- if (*i1 > *i2) -- return 1; -- return 0; --} --int main() { -- int array[] = { 4, 17, 88, 34, 12, 12, 17 }; -- int N = sizeof(array)/sizeof(int); -- int mythunk = 42; -- qsort_r(array, N, sizeof(int), &mythunk, sortfunc); -- //printf("#define NEED_SWAP_QSORT_R 0\n"); -- return 0; --} --#endif -- - #if defined(TEST_NETPBM) || defined(TEST_NETPBM_MAKE) - #include <pam.h> - int main(int argc, char** args) { -diff --git a/stellarsolver/astrometry/util/os-features.c b/stellarsolver/astrometry/util/os-features.c -index 0c7d2b95..e95d463b 100644 ---- a/stellarsolver/astrometry/util/os-features.c -+++ b/stellarsolver/astrometry/util/os-features.c -@@ -37,8 +37,4 @@ - //int fdatasync(int fd) { - // return fsync(fd); - //} --//#endif -- --#if NEED_QSORT_R --#include "qsort_reentrant.c" --#endif -+//#endif -\ No newline at end of file -diff --git a/stellarsolver/astrometry/util/permutedsort.c b/stellarsolver/astrometry/util/permutedsort.c -index 0bc42298..e37b7e19 100644 ---- a/stellarsolver/astrometry/util/permutedsort.c -+++ b/stellarsolver/astrometry/util/permutedsort.c -@@ -17,7 +17,8 @@ - #endif - - #include "permutedsort.h" --#include "os-features.h" // for qsort_r -+#include "os-features.h" -+#include "ioutils.h" - - int* permutation_init(int* perm, int N) { - int i; -diff --git a/stellarsolver/astrometry/util/qsort_reentrant.c b/stellarsolver/astrometry/util/qsort_reentrant.c -index 982aa3e1..bce9147a 100644 ---- a/stellarsolver/astrometry/util/qsort_reentrant.c -+++ b/stellarsolver/astrometry/util/qsort_reentrant.c -@@ -35,14 +35,14 @@ - #endif - //__FBSDID("$FreeBSD: src/sys/libkern/qsort.c,v 1.15 2004/07/15 23:58:23 glebius Exp $"); - --// Astrometry: We want reentrant! --#define I_AM_QSORT_R - --#ifdef I_AM_QSORT_R -+// Astrometry.net: we lightly modified this file: -+// - renamed qsort_r to QSORT_R to avoid clashes with system version -+// - removed the preprocessor magic that support re-entrant and non- -+// functions in the same source code. -+ - typedef int cmp_t(void *, const void *, const void *); --#else --typedef int cmp_t(const void *, const void *); --#endif -+ - static __inline char *med3(char *, char *, char *, cmp_t *, void *); - static __inline void swapfunc(char *, char *, int, int); - -@@ -84,32 +84,17 @@ swapfunc(char *a, char *b, int n, int swaptype) - - #define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) - --#ifdef I_AM_QSORT_R - #define CMP(t, x, y) (cmp((t), (x), (y))) --#else --#define CMP(t, x, y) (cmp((x), (y))) --#endif - - static __inline char * --med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk --#ifndef I_AM_QSORT_R --__unused --#endif --) -+med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk) - { - return CMP(thunk, a, b) < 0 ? - (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a )) - :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c )); - } - --#ifdef I_AM_QSORT_R --void --qsort_r(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp) --#else --#define thunk NULL --void --qsort(void *a, size_t n, size_t es, cmp_t *cmp) --#endif -+void QSORT_R(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp) - { - char *pa, *pb, *pc, *pd, *pl, *pm, *pn; - int d, r, swaptype, swap_cnt; -@@ -177,11 +162,7 @@ loop: SWAPINIT(a, es); - r = min(pd - pc, pn - pd - es); - vecswap(pb, pn - r, r); - if ((r = pb - pa) > es) --#ifdef I_AM_QSORT_R -- qsort_r(a, r / es, es, thunk, cmp); --#else -- qsort(a, r / es, es, cmp); --#endif -+ QSORT_R(a, r / es, es, thunk, cmp); - if ((r = pd - pc) > es) { - /* Iterate rather than recurse to save stack space */ - a = pn - r; diff --git a/sci-libs/stellarsolver/stellarsolver-2.5-r1.ebuild b/sci-libs/stellarsolver/stellarsolver-2.5-r1.ebuild deleted file mode 100644 index c287cbf520bb..000000000000 --- a/sci-libs/stellarsolver/stellarsolver-2.5-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver" -HOMEPAGE="https://github.com/rlancaste/stellarsolver" -SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD GPL-3" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - sci-libs/cfitsio:= - sci-libs/gsl:= - sci-astronomy/wcslib:= -" -DEPEND="${RDEPEND}" - -# https://github.com/rlancaste/stellarsolver/issues/108 -PATCHES=( "${FILESDIR}"/${P}-{qsort,compiler}-warning.patch ) # git master - -src_configure() { - # bug #862930 - filter-lto - - cmake_src_configure -} diff --git a/sci-libs/stellarsolver/stellarsolver-2.6.ebuild b/sci-libs/stellarsolver/stellarsolver-2.6.ebuild index e257a6f5826b..f7c3f6d5abd8 100644 --- a/sci-libs/stellarsolver/stellarsolver-2.6.ebuild +++ b/sci-libs/stellarsolver/stellarsolver-2.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND=" diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild index e57806898e60..af59216395ed 100644 --- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild +++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" # SuiteSparse_config directory". LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="static-libs" multilib_src_configure() { diff --git a/sci-libs/sundials/sundials-7.1.1.ebuild b/sci-libs/sundials/sundials-7.1.1.ebuild index e3baf22eb43e..3b46e35d136d 100644 --- a/sci-libs/sundials/sundials-7.1.1.ebuild +++ b/sci-libs/sundials/sundials-7.1.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="doc fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads" REQUIRED_USE=" fortran? ( static-libs ) diff --git a/sci-libs/symengine/symengine-0.11.1.ebuild b/sci-libs/symengine/symengine-0.11.1.ebuild index 9e1a6ceba0d5..5d03e6c71d71 100644 --- a/sci-libs/symengine/symengine-0.11.1.ebuild +++ b/sci-libs/symengine/symengine-0.11.1.ebuild @@ -26,7 +26,7 @@ RDEPEND=" flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) mpfr? ( dev-libs/mpfr:= ) - llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) + llvm? ( <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) tcmalloc? ( dev-util/google-perftools ) " DEPEND=" diff --git a/sci-libs/symengine/symengine-0.12.0.ebuild b/sci-libs/symengine/symengine-0.12.0.ebuild index a9b7f631466a..ed537d29d76b 100644 --- a/sci-libs/symengine/symengine-0.12.0.ebuild +++ b/sci-libs/symengine/symengine-0.12.0.ebuild @@ -25,7 +25,7 @@ RDEPEND=" flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) mpfr? ( dev-libs/mpfr:= ) - llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) + llvm? ( <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) tcmalloc? ( dev-util/google-perftools ) " DEPEND=" diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild index 53f3950e78a7..c6bda0f8f2f1 100644 --- a/sci-libs/szip/szip-2.1.1.ebuild +++ b/sci-libs/szip/szip-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar. LICENSE="szip" SLOT="0/2" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" RDEPEND="!sci-libs/libaec[szip]" diff --git a/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gcc15.patch b/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gcc15.patch index e22dfbe5025b..4d99ee656920 100644 --- a/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gcc15.patch +++ b/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gcc15.patch @@ -8,3 +8,13 @@ #include <tensorpipe/common/error.h> +--- a/tensorpipe/common/memory.h 2024-11-02 14:00:40.971529014 +0100 ++++ b/tensorpipe/common/memory.h 2024-11-02 14:01:16.891890766 +0100 +@@ -10,6 +10,7 @@ + + #include <sys/mman.h> + ++#include <cstdint> + #include <memory> + + #include <tensorpipe/common/defs.h> diff --git a/sci-libs/tokenizers/Manifest b/sci-libs/tokenizers/Manifest index d1f7e45208a2..86552103df0d 100644 --- a/sci-libs/tokenizers/Manifest +++ b/sci-libs/tokenizers/Manifest @@ -1,68 +1,45 @@ -DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 DIST anes-0.1.6.crate 23857 BLAKE2B 9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f22ccfe509ef7197d4694f439084dbdb01fdf88829d181965ea9d1452253789a46fdf6d0520e3413c50d61 SHA512 f9dfaaca9ca327881ec30efaf24e208daae668b1e9d6963c8b0ca9f9fd13be777c793076a87980429f0dfa4db28ef5331ce6652a76da4d5a87485b23fc2fde29 -DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09 DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92 -DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69 -DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9a9aa0d6657965ad9c67bddd793d825737d3804961716a89bdebed9879ac43b42c897cd229c6e7bd780859e1e3c247 SHA512 cd94ad0e88ad4547a660da1473bf4e6dfed805a066782124204143c7f754c12db719bd3a1774c299f1a035740bfc4830919da191bd14e0acede410f6dbd1e2ef -DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce -DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6 DIST assert_approx_eq-1.1.0.crate 7512 BLAKE2B 6efc259426c5f61ce971a86dd434bad2dadc6613ee182df90d818a7f5ab1e4a8e1bd4b210a76d80f2c1fe93bfb91cf8a65776c419d39746e9f3d4aa78669b426 SHA512 701ed76e413f32d873fa670e307646924344bc40d56961887554bfd155ddbfc7606b76c341f66d64a75c882d40f99d803fd839f0ebedd35293ae47aeaf57782e -DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b -DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 -DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf -DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396 -DIST cc-1.0.94.crate 76456 BLAKE2B bf72e0007d9fe022a66ccc12be48acbc5dd1b716a47f18e4062b415405140764db6ed26bcab071307142167309c9c9ab55382c7973ad43fd15d06e3fe6b24b69 SHA512 67ce0e73904cf7fac81b0b914ec5fd4d9e59f358602199530f51d203a2e42be9814b04f65497a644a0e2720cc6e58c5e4bf1ad4782ded35b710b22c9b0f2bee5 -DIST cc-1.1.25.crate 84207 BLAKE2B 31ba774f7261c9fd99b12c1990556d5383eb221eb6a9c78ed96a97f1de48296e3de079dcf86fb0fb426b0cdb64af615e0ae39abd9f37d75d9530874650723fd1 SHA512 f0d68e5f8223a1c4813ef3f1d9dec60e53285bc2a2a56176f3338d13a461c78eab56492bd8990c2e0aedc59e584171a3665c0d13c014aabc6116877ab8f84d5d -DIST cc-1.1.8.crate 81843 BLAKE2B cdfa667bcfaca1e0c3719dc85a9a11525a6ee9bcbc8bfb32a99482c40c460b640f1ed1b61e25c076d87cfe4e98f40ce58a5e7ffd992d7a5bfe8cbfdf2dedd3eb SHA512 c5f98f6691dd4478551546687ef008027af315e18e6aeac482bd06848c8a5ecb4e564760f15790ff399d2e23b0ba31f53c27d36c2767de521961aeb85dfe0ef5 +DIST cc-1.1.22.crate 83509 BLAKE2B 37bcb91fcfe5d816ee9a29aca0c9c34cf7c429ee31084a47110f0b882270f7402c5e7bb59f66e8872d0f63253e2d06fc01be63e439cf01b118f33ceb4a64b2ae SHA512 c58571daed5e52033b2ab0966b3e5a167f48ce739123a4f6789fed79e9e30a3d89e289b8ea6069699eaa7c4e9efda38e03ba331119d32c75a8871a0d84aa6cb1 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05bc7677a370460549297839c4d6e913622e8a6cb3a5c2447b94b0bd17b7d5007228ea8881193d08e5b8deb072 SHA512 8d1af6a09f116e42f0098d7d0e34dd906dc3e718b257ff1a1fde655a235d40619f61f18917c0cf35c55de9160c255a9795d5e7525989037e3512807cc6a900b1 DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106 DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a DIST clap-4.5.19.crate 56377 BLAKE2B 23b6ec8ad85063177a79e6a910640e3cff4ff069925b6e608022c50df7c72718a5a05ef9ae1562f869667c21bf6c93afe13f0f15b4b9dc4f91e14e7a108202bc SHA512 55d8cb53951c2a6ecec93ace3881ba20482aefe41dd87705c15e295462d7487b24b15c1caeee5e8ca5917ca28a381cae1c0d72781d6a440c26a41f3c64dd8be4 -DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0 DIST clap_builder-4.5.19.crate 163596 BLAKE2B f709ef92a6d8a23051648ac1b2f88e9854d1123d1a21c6aed06ec4175b606b7f97ff05139c9b0d7b18492bd272580659bc0e2a0ee572d6bd4d3eb250bd0726fc SHA512 a0422134a231a9693582016a2acd74c944c4c1f12b93a40abb731a0433cae47bc97c9685c39a37d9c335ed7bf4de08a1a1536e291164600625eacb871293abf9 -DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864 -DIST clap_derive-4.5.4.crate 29159 BLAKE2B 6f7087d553102f24c9de37e1ba85c0d540ea42d9df9af26b5234ccde23175180efe21df93513df49f6ba83e46cc85cedcead29c902e426c39b25086c9f79a51c SHA512 670411136c819577c0129c6fcf5a8216cac82a47ae11ce3cd97cffd038644e06c5a21f7a69948628f01fb77f1e656678ffbfe441385866fdf90d247bda036c4d -DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380 -DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117 DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9 DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33 -DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a -DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266 DIST criterion-0.5.1.crate 110088 BLAKE2B b99018b6a6f97fe47d90a2135e3d483ee624d43088d7881bafb2c35ba385629f1a4353110bf190c04903abc4ee99ad1735bc9c5afc6c2854a1aa9221fd714617 SHA512 6a1a32437bdb95f8472bafb5b04bb5999a6ff6fee4ca5965028ec53b4867d01b529241d01809a003722ec7d5710c323274b6f3b50ca0935919a9dee693f4d3b0 DIST criterion-plot-0.5.0.crate 22706 BLAKE2B 28a50375f2871ce6f168aafabff46f4368bf55cac379c67a2b4396403259372759dba3355786e695b566b1cddee9091a469755a04c06ee949f00aee8e9a28699 SHA512 971e96dcc64a5afa7488f1a99475f0f5639c0ef63f9eeebcada351868697cbff397e99827cc07c0a52e7d7d1a87856fe1fc48c22075776b3bc9c94af62d79f14 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 -DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025 DIST darling-0.20.10.crate 32031 BLAKE2B 038c2a4d919a8e9ff6eff5f83911b40cf4e918ac27c90f313b6b9131c41770f83cc3901973fea1c6fea2886a8360f3c5cf73b807d14e579b8b8e87f15e3bc6dc SHA512 7a14eebc20e48fd39ddf7b8376dc937a04f561d723aba864432cabd5ab46eb189706b43e5121a7f4fb0d68dbfd044353875bb479d4bd5cd96b76e3571733ce55 -DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3 DIST darling_core-0.20.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d -DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751 DIST darling_macro-0.20.10.crate 1874 BLAKE2B 29cbdc6bd63e4eb0731c8f8f0a50cfcae9a88f116f8cfc0068e5d3cddc20b42b7f0f20f128ffa0f7bcb8d72f0188b04b3838b8327fa6f3ab45de4cf5c3bbf317 SHA512 565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52 -DIST darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0 DIST derive_builder-0.20.0.crate 36563 BLAKE2B 753f2a7b1ad37e4b0cd94fc032109179f559352d5d754c0258a597c0b5f819e3383a30ed5c9414b24a4b12e917f41c23bc01554727d06f130f4bfceb3a952c51 SHA512 3fb085259b8219d07c88a233c1aa0e586f6c6ec31c302896c3d2900a062a2e27b4211023f544bf139df3f4f6157773f192a96d9f1e980bf1bb7bd2125d5a7605 DIST derive_builder-0.20.1.crate 36977 BLAKE2B 30a7d6c8dc8fb484a08bedc3d06d56a5b5e7d94f2f5310b3a9d43b5a81661ef59a7cb94a164e9a0e27c1d4be5eff7d5607def1464711f27355043c2894908561 SHA512 1464d6a3e941b6dbaa77b4b7cc45260a05567491fe9567511f5561ce4a94c6cb7a7e3a4b9802ebbf7b1b3ffa39253814d3171e350058c17038e1f0e4dfc28efb DIST derive_builder_core-0.20.0.crate 32579 BLAKE2B 409890428e291f60a22ee0138cdc1a80498c26607e576a93d1d23c9def454c723b2e7a21faf3261dd106d62dff83123ebd76c3de8b2a7e7ff0aa9e700720acb9 SHA512 b4564364bea1c98563c7ec8b0bd99f260cc2b382a3a8f1156d401c57383b815a4a54e3e5f2446ccb2665eae600d6528faddf31d0f65678a3e5274073c2334073 @@ -71,33 +48,23 @@ DIST derive_builder_macro-0.20.0.crate 6308 BLAKE2B daeaf30f4548ce0796df99920515 DIST derive_builder_macro-0.20.1.crate 6363 BLAKE2B 6b614f3d27140eab4496719fe2f46878fbba5b05153e61e7e406853a910873a811601a8937c9c5785cadc64eb3dfa758b098ab9328009c7bd8a455df63a95c31 SHA512 5550557f6a9e58e0292bb5ef68a0cce81a8b19fbf50cc511cd5c6519e5187420e20ea98cdcceb870595bd1383688df2c2dd8f6f3cde42df6e52f962bf67bd3fc DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1 DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a -DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 -DIST env_filter-0.1.0.crate 11553 BLAKE2B 8e358517c0aeda431239f14610925bcfd6be3bd346c7628e1818cdbaa1796bfdf2454db99cd06bc6ffdca95e7ff47c0a621d1f4c3bb50ecd1641f9d19efe4b4d SHA512 a0ab51c2b905466d23c75fd77b430dff2956556b7687ea434050c78a497cbe63018c5730be950724c0ca6aefe29bbc379ac01c8a7cd2779a69c5a03e92a21bf1 DIST env_filter-0.1.2.crate 13327 BLAKE2B 96f888b30ec8b40032e588f8ac73e9fe23340af71d5ec69cd8b4dc2bcc272ecd64d1d3ab54bc57e7a71a44cbac497ee7ad3df52930dfe3c7ba7dd129df290b73 SHA512 b1f21a5d4aadfd940bde3e53935c04da48e48cd4f825cedaa83968a08244722aa4e92afb9fd2fdd228412754f040f7bb68f24e05c0bf9bf57783aec042808606 -DIST env_logger-0.11.3.crate 29704 BLAKE2B fd23d377d258ead87e820dd89e4175c0596b284d629563b7d04be10f80bf859d84a6e71a21d1c333a94779262608554e95bf7b44c35b3336cbedf545184ea6d1 SHA512 50df911455429a83088c87d30137fda6fc73971ffd32eb66f21e0d006bce92580c519d4a3a3fddadb7bdcce5d6dc33df853dff6373fe66f128cfd60ca26f9f02 DIST env_logger-0.11.5.crate 30683 BLAKE2B 9dd2b461be5c5cb3411ebba8bcdb53a78fff28c54fafd21a0f8c3fe578ebc3882ed5df63a5ef9adf62bce00fb6360de895457baf75fd2ed1a6730429478c32cc SHA512 e2ab1f117227ebf8840daaff971c2533830c0e481797cdcaa055a4506ffef78fc0830bfa13295275c604273d494278d43440b987132f97ed6bc1cf705e05cd8a -DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a DIST esaxx-rs-0.1.10.crate 175210 BLAKE2B 40cedcf5b281ee32e7d146763c727936af7825304e72bc3f7d39a483dab0faacbc81f3b2a303757f292ab119d7681da2622b94ad7c3f85c4e30215e92828e290 SHA512 87129723dab9588da3b0a873e47fcd1906c6089aa714701401c59d5d61fd47eca0bdad9778ac068dcc072b093688e2e5ea0cdce77f265406cb7339605be901a1 DIST fancy-regex-0.13.0.crate 85930 BLAKE2B dee797093765f8f1ea6b8896cd832983fdbeafb23828b896811f2657e135b71e374a713fc37f68ff128068d04ae140bb2864415db1edfa2e300aea04ef597474 SHA512 0e7ad0ea46ecaf9eefbeb696bc99aa725022d92f0f11b9f3efb8e81a80a058fed08816d3f9efb4c5fa0176aa1b649e13f5ea18d3352f75a7d2be772fd531f744 -DIST fastrand-2.0.2.crate 14674 BLAKE2B ea23f52d745f4fcfd4ec911d48d77c60da837f57942994b17458daac7cae38953cf679459908d68e5f393d03a90cd6eddba23d2a86c2bc11ebfeed0bb41fe4dd SHA512 3ef9c21e4928071619adbad6421165ea82feb04c26ee18893b172f9f8a510b9a2097257ae31647a907680412b68d6662eff13cb27649ed9f5e68c374619701cf DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104 DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e -DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284 DIST flate2-1.0.34.crate 109174 BLAKE2B 70fb087904e1e29243facbb9a01f05770581d91d49935290943797cf84c3d2b416a8f78b2c4f9277d86053f1bb79e858ab1d5bac427bacea9771fe1998ea498b SHA512 0526f2c7c061d57f5a39fec9726c547848f6bb36dfc977497c15fd42da6c300bcd332278c31e3acc0a72e897a7161f03deef61e95e072bf3cfe5b0302b5f98f9 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 -DIST getrandom-0.2.14.crate 37307 BLAKE2B 5904388869335ea904d950ee83ad1867a0d3f6831b7139102b53f4bb4a2c12371c9396f1f1cbcc44e3ce69a4ea316651b1674722071bfa7562385ad4b6a88c33 SHA512 6c334415e09f570e3123e3c6c6eed1727533ac6c9c4142e16ae995c237a16effe146832a891be9fdde4335bd02b454e0fdd9160f20dc02f107ad106756221658 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb -DIST half-2.4.0.crate 50666 BLAKE2B 5175650e5cb9fa08a5d45ce35b76b15454d27f214d9b9236902ffab71834b342beba0654f9c85fc796bbb499a1a979b60714a5bf7666d1faf59d61530073adbd SHA512 7357a0f84dc6ae394efdd464f5a6da2bafa48bf8d794b2c34d1507d4d66af31ece8a012b58e6f76eacea2c249488a12c20f8c7e516ddd42a70633c9dbaa13bf5 DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 -DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76 -DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045 DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f DIST hf-hub-0.3.2.crate 24295 BLAKE2B 0f7b8ebe62f4d210b61a6e2bc0b1d4da178e0a07ee47bf5fdd21047f0465588613606bba5e03b46cdf6c415ee2a88fc2a5b4f47a2566a1683c043603688a2cc3 SHA512 a6178ae68a5c9f65f0ac4f2054042d7cee85ad5b4ec97dd7e94057bf0b9eca6d1232b790355a4cda0edf91d1bb13d6de1846c4a249e7b9ecd62a431d7b9d45c2 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c @@ -105,91 +72,62 @@ DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786b DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c DIST indicatif-0.17.8.crate 64869 BLAKE2B c534020b2c7b25bb07cdd0fd4414fc817506647cf5b8e2081c22be58857d5adb170082a3756004c69187619fc5625f8b9a1904566dc51c621838e09ecda5b43e SHA512 487e73445c5c7d3c16d6f93a3d9767f41b37d2832e56851154f8b69e678ab7d9ab04eba225a6bcf8b48842ae0db0249b060e998e29a252dedf8afacdc88b1aaf DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f -DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 DIST instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb21f4c0ec0551edf07781901a28978667e92b01355b43e0e1a7ffcd3cc37b5501a7521da78f4f352e586c9fd SHA512 b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9 -DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f DIST is-terminal-0.4.13.crate 7665 BLAKE2B 47a024e135ca4931a04a8dc8151f999f816ab50c924f17321af4295dd84fd51bf98ff057de967e646a461c1cc9ffbfd7ae245a9021b3a77f3812f43707b44aa2 SHA512 ea5b18dbfc965b96a27086eabc070747fdc557a6a9acd06203164e846c2f390c4bebedb29211ec008e060dc80b10f53de6d6cdc822d4f51a543057736fe33448 DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3 DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8 DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 -DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9 DIST js-sys-0.3.70.crate 53863 BLAKE2B 15e75a94a2b7c77ff18847f98f76a1442b6e5f66960f3375534440c382a255e6b16ba3cb8c5345365d2195f7598564bf856755988f1288eb1b0b964e26446e21 SHA512 5dff8e790447a475b3c0a7068f0bdf1cced5fb8be2d66c92cb6f6c799f9d807f9d3c498e4f42c67e16d83dd4bb3be70472ece20fc42c3a8c8d57615ac8d398d7 -DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f -DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807 DIST libc-0.2.159.crate 755366 BLAKE2B 70f46eb6228b4a8958dfbee00cdfa3c7d218f30d66c8591f4ccc9c5d8eda411d83ce9450552384ac4bc29deb2869561a2111dd157c9f228f617baf8f6b537bc4 SHA512 c803939ceea5ad9bdfdd122726c7a5f12ffd8b0cb66cf0bc62c9670e1e5904a504def388c1e043c520f4ece484addf6dac465aebd58578aa6b79995077bbdf9f DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49 -DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7 -DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7 -DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71 DIST macro_rules_attribute-0.2.0.crate 15408 BLAKE2B 3a568de49448ec1aaf2abb8c361fd84d2b257a05579b8345cc66a45ecf111e0964e46d1510b458204c95169a67d0c8a3d41b604afefb8db9f642ed60587ac05d SHA512 53dd3b4d271f5aadee7877829660bdf9a6b89f1173494d102a5360866721fc6c02b9bb1c7fb14f50e214bc16a59752e69eedad5dd1d64411a1fdda76f7d62afc DIST macro_rules_attribute-proc_macro-0.2.0.crate 8264 BLAKE2B c885432d9334a3aa2c1ac66bd3c1f1e186aa259a449aa851a0663b422c9861365216e4dad10e31e7608fd970391508c9ad8a232272057dd9268e0e0299109b66 SHA512 6ce9cd867b5f6fb8459e3103688aa149275718a5bb2290994a02cbd7ae49aa23eaea41aa7247a6f9b15e2572bc95fc2f94c26b401e28a76e229a0907da6021e3 -DIST matrixmultiply-0.3.8.crate 57530 BLAKE2B 3a97130168de9dd18fcc0ed33df126f25f47a919e9f74289f809f33c2a290bc41626a743e6c446d3ed0a22fb5eecadbf29c11082704970ba9e465fdc5ce18332 SHA512 c2d31d5764cdec868fddf018b3e51b936e8bb18b131bb9899a5747ad5a4cbe892c0d62265f99077137308ea11f32254c8a8b64da07855a6c38756df42d76e5f3 DIST matrixmultiply-0.3.9.crate 57819 BLAKE2B c13f0edd4e33f9be4e562a8ad79eb4b0f42384ea6652b9e8b8b8435cc42f6ac8ff7e425a3b690b87b94ceae8d7f8ecd2d9acedac9591134a24b36cf479c14e4f SHA512 0b0a3433e81ccf7f62469bf478c430abb8b18cf499bae389dff0e25945b569810197eb110a7deb69cb8545d668350d1ac79414c82b3b9efe5e3cae4dc4c602fd -DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c -DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6 -DIST monostate-0.1.12.crate 14017 BLAKE2B 2f83f03772a47d8c7465c139c880364ef2e199c7d60df54d6aaddae042f5c66fa1d92003e85b3f3f264c98be50762ea40c6e0e7f42d2e704106d7e8e68f1b8e1 SHA512 42b14838b7f1ca46133933adbdc53f28c688ea9f7726d95737cdcb01d0e048db6b42f809c070aed3462579d8abe6fe5892fc0b3efa1b1ce673b11ba37693f524 DIST monostate-0.1.13.crate 14073 BLAKE2B ef0644850bf1d7cd2bf967f60358a231d15bf5037e8a196e804ef41437b1543af36835312296ee8022124fc20415f44ec93b6c3b998db4bcee7232210368c4bc SHA512 be6406f2dd85c8398332b1cb273816e7c765b4f8195e93c5ef2573e7445460b0368ea1d2cb6a6ba7949a8ace9eec29adf567d8f83f3fb368e11e007f2686d331 -DIST monostate-impl-0.1.12.crate 7207 BLAKE2B f0879d8631432ba032b20cb55d2a4b6cad548b87df5ed05d352576eac9da0f6f71c44426349ea56bdd387fa2b20d382cf6964166c51362c12c614ef218e8bed5 SHA512 555c8b6d9e7a2783874ce2f874b129ca259b40920308c8f5afa466526f33fcf0df530769cd32c36dcdbe59334acb3149976e256b9d7c1a02429206bf50a46cbe DIST monostate-impl-0.1.13.crate 7302 BLAKE2B bebb66e9c56341104db80a6ff1dd503b5573413be97cfcd23a6ec6e1194c6567b82f68466f2f7335591f71d0b090e031ed39b0db25e84d9329f905c53f4d5be6 SHA512 0907810517277e03e776262c5345df512e45b27066dc11355589060a98ae068e8d769c7dcfedcdc122daec089aac49e27912fd6f5eb2778f0aad423cfa4fd0ce -DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c DIST native-tls-0.2.12.crate 29517 BLAKE2B 76f4bb2aa8fefc306a04ff50a62d6617f71c3c34aa83ed35f11714ef2306fd82f76c7e26ab7ce50f8eabed40602ba02589dde2d98b55ea6113b45cc539c84bb6 SHA512 15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723 DIST ndarray-0.15.6.crate 275225 BLAKE2B f17e028e7d57670f136d777dc2bb720dd52bc3d9fdbc0e2de5f5c2fcd9f6310f0bc39299fadbb53e0d1588e1e64d9f2b5daf20e30dd95517bbfa597b9572581f SHA512 19037ba1de0ea5f8e0cba5d8735d6192c1674007529289a357e9c5e036a1af88b48ba8a26b4929663403159f6700bd00d04becd9b1fdd4c07990bbeddfc20ead DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043 -DIST num-complex-0.4.5.crate 29614 BLAKE2B 32277724d5336443768a299c835cba63906ac91b85c57ff0e57338902e32731a0e67a93c647e6a57ae53a1b4a961c8b9ca2f6937a275e51a58089378a9646e8a SHA512 7b607f240773e4f4ff1954f46b2ee85be1a4f012e2d290343f6178543d10b69c0e9e1a93b0df8efa013c3914ad48321e1d96a4578092ae4d359acdc239ce1ebf DIST num-complex-0.4.6.crate 30352 BLAKE2B b9f0465d53e8e16edc44187f8efa40681377e75fc4bbaec2c9fd8b8f5384044c3a989106ed3cdb740cb86e19659b34e4b38e7cfd7bb01904e137ddeda3d0b6b5 SHA512 11ca2c28ffbd15aacb7e184b7f3e09cbec9c955738568c1e0760c256c72b230cae7152403d834c8ed9358e42b724269e99313dde9a23027a6963ca176ca45615 DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae -DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df DIST numpy-0.21.0.crate 76859 BLAKE2B 6900342fe71f557635b94a941c9dd317024047b41ee55d9fd7a3eca2401bc2734b2902999ecd2e6b3b5783ea6398674cb00e0a6173ab15fe5a4157c9de1d4987 SHA512 27cd512692d7f9188844b9a351224ca1a87f0f8d90a5d288fb1e1f62fbe66807e1cfd6529226ea1d5dc27725d1abcce6202ffbdcf25c130d3437b0cd9bc4f7e5 -DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c -DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8 +DIST once_cell-1.20.1.crate 33345 BLAKE2B 7e56d7dd48120ebe15ede12456197ce82bb2794df5aef1ec7319b2e11ef8f601d8d99c8f5b22aa906c7af23b0119ad17b3a8b4bcbdc3e38a4d78504aaefd5a77 SHA512 6fc961fb053777c584fa7895e20d260803059d67fe172e75355376ce1ab2f8ad3be5158ad58ba1a31b9a33ebc180e00f07f7c24ae319830e101059c5d2377925 DIST onig-6.4.0.crate 32616 BLAKE2B eca949c47870f260310c69302c6a0a60b9329f7324281433170b0f6fde80f91d49267307825652830217cf44b6a77a741f526a3bca63a12fd8f28791c14a0d5c SHA512 5d388d35eaeb4ba4876b5a683010e4e38c7c54abaf15c900681a7c9ed199b6b7ff414aa1d6246153546680eab28505cfda359c3d5df5b9fd3a5cdbfba35953bf DIST onig_sys-69.8.1.crate 638216 BLAKE2B 08d5f61f4047cfc841ee9e1881deeee49478bdead87483595e9c81c722e475d137b8cf5e1caad2965ea411d3211738a6848896128b5fa1f727a0a175ac217d05 SHA512 26a7dec69abe1535d575e7db63448abd898d363ef42352605e7b7d046b5abac5733e3cc05b7d442ce67db9366dc96d4a7a82a7f486d3b9af6d298b49b0baa864 -DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9 DIST oorandom-11.1.4.crate 10201 BLAKE2B fc77678ec202bc5ef7314ed876f670575983612db9cc94ddec4ad7e9f04e2e2742d12b746803b33f1dada4a10c8afe19210fbc337803ca59a0df74998fa6de92 SHA512 8d5acd7b344b1eb9635ae597b38d65f0da519366664f02bfd083d37b5e9c88f21403066a8e93d8a61e843e06ad9323cca9796058aabd901d0adf7e7235c17562 -DIST openssl-0.10.64.crate 272306 BLAKE2B a8b618aa403cdb06a7f135cd966775f21c99739365c55aabde2680a6154d03c7d554bfae6c62a069841c70ed82ece6c3f0cd589da8c26022b7022c3c4d79a6d8 SHA512 a1fa9f71cfebbb37ed9d4a902360f2cc95a78f55b5da5d51eef69db38cef016fc03236485158d689ccf054e04937b8cddf88e3f0f31672997fb30c6cac73cbf6 DIST openssl-0.10.66.crate 273705 BLAKE2B 7892e96dac3b24ad5622833b4061bd82028210f9f26ec9772cebb65905ff6e45da8b21ad1aabfb87bb5610f534018da6bd20c10eaee8c189dd08a7ebfbf12b4b SHA512 2f4dd6e40dd8aff8c04563517fabeecd5ac0d986764649cc9af9bf4ce25757a67f75655eee207703b46fe57661a216ff00144358ffcbc70525447a063fa086c1 DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c -DIST openssl-sys-0.9.102.crate 68622 BLAKE2B 0d3d3c9ef8e2542c7f35db1d8feaf512cc7313481bfcc99354d601e8d6332adfc2e7ee8b35599a9241de35c163efd840186e904375bdc9c65ee743abbc154cba SHA512 7ecfaa0b49cea5c60f6f063fe5217252a65b27c5e6d1185e0aa1bb4b59c4cf9bf326840e8795a870a537c18ee5a987feedaaf2dd767cd6f1380f25468a1622bd DIST openssl-sys-0.9.103.crate 71552 BLAKE2B 4cc1ab93f5a444b4b985c84f6ae90f345da4639e4ff7c5502dc1ae59f842d46e3855057a7c05855f7cd739b5311f330dff361480ef2a0102fe46471506956148 SHA512 61b802f6baf918ec055be90ee47c69fe0184f6d9a1d29c748386192a11d4df115758961ec9b636126a6b42d7d8f7509248c59f7c035905558c4cc35b804a8eaf DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56 DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532 -DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389 -DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032 -DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4 -DIST plotters-0.3.5.crate 143975 BLAKE2B 57b9b37d9e5f43f12f1bbd95d0c0789a09b2f34b30278c62d8637f341a901ac4c0d70ce4a4f869429a43cafaab637d2f25af3eff12354b0e85b184f439c91320 SHA512 38bd608db346161ffa04c50aa315bf5d5eb2840490c5ad6722b9e294b8aacc3c434a1c6de073d2a29cb34de6cdc6260a227f9b7995ffbe75fbb8783708f50045 DIST plotters-0.3.7.crate 149031 BLAKE2B a53b3aa85eda3ac2278cf49c4d701642b37a5f52a3a013594101388d9d104b96e35f542ff6b8ee33bf711fb64c8c25a48c8f10b3c12e70e6e57c90fd30cb9b5f SHA512 526fa20153b445176efcd1314c2e36963561e267c566223ddbbcdaf74340aa821e9c0174c15849c55f3cb3177fd5e34aa9bdd872888476b7ff0a20ec3c1a04e1 -DIST plotters-backend-0.3.5.crate 13440 BLAKE2B 72ba042a2057f7afebad34a794df17a0c340ae0d15af2631a3f3abbe117dd8a8d17f877dd935ad59f33494c523664cbd4fc11e05f6c7ae0c495b5e9d4c4a8708 SHA512 4468e2619d7fe47cd03fefa8b1d901ddf5cd47b2899b4b9082cfb695f315cbe415fd57efbef6e0a67eb51dd8edad530c15442810fbb87dfc4b7943b1a7f55460 DIST plotters-backend-0.3.7.crate 13709 BLAKE2B 7ba96de1435beaffe0171dd4fd010f84d0bb6bf0856adb05da87dd324a5834aee3a71545a019ac899e141cec32cd15e395c56d281f498430e54b6715eaa46761 SHA512 5b53e5d369f39748d45269c82c87a0731cf23666b88d7e407162602c715a01807ebc50f8a90805f417c0e7e74dc511d1d7861052835beb8a9d548e2f33c062e3 -DIST plotters-svg-0.3.5.crate 6948 BLAKE2B 1e8df5cdf68b1e27e22ef2f383a81caf76ab598d09f31c536e86c543df78a609a33c3c426660a34a37d1313cc2937b0c678c5e1e43fd3d65bce95b59b2531935 SHA512 91c4955f62dbb8d80e01e5cbdc7ad5f1869be6025de1d2baeeb9198fb108ad8f01916cdc0728b7123ed9217abe92cdd8ad30116dd454312c8f63bf9cec98644a DIST plotters-svg-0.3.7.crate 6715 BLAKE2B 1437ad7e1c1b3e82ab1f58660ff6931e510f6ea5ea6cae6eb48582d4652bc65c5dad518d3312e25303651c03d90bf56d9abac4c2e3979f8290b4cb35c0b6ba5c SHA512 9a60e19026edfad359a7d042630b60825d7723855fc0c17881ac880c29160a81449ca672a3ae5cea4405293947ae0556f31cb37f519dad4cef56353248350cd6 -DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c DIST portable-atomic-1.7.0.crate 145385 BLAKE2B 7d9622d636677e3adae0f909405090318a9d6189fc18683ed21074e9360f213b44c5213f3561e3dd1f642547c2c2e6682b9e1efa63243c1f12636bb11bd15dbe SHA512 0849edaa7a1f9ea66182443e31691e7839c857240916521bbd6009b5e692b13f5b315df36e656134651386bc50d895ecf6155a906750009514cad8bfc7e57fe2 DIST portable-atomic-1.9.0.crate 166365 BLAKE2B 9abc31364770923847dac16f532452bc8783a5068c0f757f79122bc5b68863b58c0acfa12d28836188413c2f0b61d494cb53fa07a57e199ecd4910a2534c5bb3 SHA512 1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb -DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1 -DIST proc-macro2-1.0.81.crate 48233 BLAKE2B 94319064772c757b6bf57eb9e759e827454f719d82210271ebab9c6ee4ecfddc9099522cdc8595123efe2efb64fd50eadd7e31419c5842ff1cb8fdd32e8daa0c SHA512 7edec4b786d9fe076ced4fa5c0d369c163fd1c27c895431245a8268ab2e16665b7c0a585552d46ceee6b8103979a4201f92abb381f0e678128abed359f514de7 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434 DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53 DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795 @@ -205,49 +143,31 @@ DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3 DIST rayon-cond-0.3.0.crate 9913 BLAKE2B 4096dc35abfa825739953b92e2eb62822761e4f0eb3311bdb4a0e1639b4453fdabf49c5c6909d4f7ea3c1a674f55acee2d2cd4d116e5a30620ee62ec853e4e04 SHA512 4cd02f2ffc2a7f02db6b1c0468fe8ed78ea092c0629fae448542c11cb8c065883f6939b610dd0e0eb1463dc240aaa75117a5d910cfe5f4eab6a424b774f4b249 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e -DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d -DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e -DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4 +DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9 -DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964 DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d -DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611 -DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3 DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f -DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 -DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8 DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 -DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f DIST rustix-0.38.37.crate 371243 BLAKE2B bceaa4861747208f1f2b68f8924c7247648d88deb200e97d8ed17c5cbf9c934488065f0ee7e4406bc96e8709b292ee1fe15beb346bff57b5f05af36174420a0c SHA512 6c0ad1be1fcf1b74f670b2c7599ba68c2ce834c760ff7486674d190ae0d552165b0c2abdc35b13eee8c0333a904c67f5dd1efa742c20fd3735c7ccdf2a439619 -DIST rustls-0.22.3.crate 332877 BLAKE2B 02b6bbc7e66472ad3fe19aee0ecd5faaab06f148eec7e4f8b4addb0f5da07246f30c6331d764b31ba7612f89a1f64e60146972ab09cd0c006de030f8cb44cb42 SHA512 2289c7716a88c324976812911ca3ab5e15cbc852d6ea03f500bca3af7b241faab66fd52468015f4f83aea6b7dc1fcd468390d7b3f768c561293d233841509b23 DIST rustls-0.23.14.crate 335389 BLAKE2B b6e82a9318464a775d9c2f7eff0a677b29ea8bb42b6338dbb15a4c734bd046cf8e59cc583fe494952f7bc9ea92a4d1021cbaee644ca478322804a00fb06d6392 SHA512 0a21978d53da5f5cbfc73f78553e6b8ce198259759c847f1af9b9f417085abeffe1ec2035186568e2b6460723b67c842b5cb400147fd201c9009c7c24450cdf1 -DIST rustls-pki-types-1.4.1.crate 29437 BLAKE2B 82aa975c98e9d583ea77e6811fb6be7f7f35b9535748e38ce67424159f1a4147b0f0ea690312151a331a03b446b7aea60c13490f3ff12ebe6e9f3369c9116337 SHA512 abe47dbd2604fd4db0df59412ec8f44b6dd2cb9bf5d67e01be6c5428daa3924151d4d996b33af387a31564cbe29e1ec1e9ea1a0ce98e7aea19d8bd7dbb0d66fb DIST rustls-pki-types-1.9.0.crate 55000 BLAKE2B f503e7f7180bb5463639d55b944741083b3bb5e84dea81b521fa6888fcec030e8c7759cdd50eec74c5424648a9336339c3e7746f15b4cd875be2fdefc5b7ed30 SHA512 288e48b04da0de17625b1c53c89a7e50a735f16107de64e37a3c515bcba64337e08a7bdc023b2ecfcd52a838d298f138beb77beffeb42043a21082ddf588573e -DIST rustls-webpki-0.102.2.crate 196881 BLAKE2B 783877064d2cfbc9078d33f081b2b1edfe43218184e60a8a3b3917ba0a3ab97a226f677d4bf4addef5d19d29ac63a8268dab5bd3cf973d64df866e3e71492f9d SHA512 697d44daa5e0a8ea2d12aa6f68026eb63a6e1c4420ee92656c9479df77e3f672ca2525442be55ab6183111fe594ac85661647150326223129ec23686792f6014 DIST rustls-webpki-0.102.8.crate 204327 BLAKE2B 8db832f181b46bdecc419e1433dd5550bc181cbffa1961aa90b2533f92696ebe15d71d742225bf806e2dc3a4ebb110d48bf62b0677089df1eede6d5a072c0a28 SHA512 8cdd5d07bb8d6c3f0d1d6663babc3b7ccbe8c9b1463870a3dd095c67f46addf4097a715da796c70f1891ebc1d045ae7d7c3a352400e8bfd6687e6cddfd33b1ba -DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c -DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84 DIST schannel-0.1.24.crate 41728 BLAKE2B 37c702a78572c845602e2481946b166b8a9f0bb08c0426f491f02ba98d358539a0039168c2a97a68fc5da2f870057b4ede3ada895b9483f687750319e139c8e9 SHA512 4e8085e9320befa3841981de5b58b214e053933fb5ac507156b1f22fd8e88142aabd42d40f52c3bf7d3864245672dadc4da3d9976ac07c75dcc8172cd9de1335 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb -DIST security-framework-2.10.0.crate 79723 BLAKE2B 9978af62742c6f58c6720a7a9d76aef3627531a4e5cb2b131584727237ec743eb1e688029c8abfcecdc8280b16e6fc85fb9c6fd93be65621363b0e3945899a83 SHA512 693944670032db795ceb944b187ecd96f094449fc801cc5f8b903a5cf117832a4db97c23dd0ab6d66a61da7ab56b5e9433b5993cbcd0b8dfd88f96e819958a5e DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1 -DIST security-framework-sys-2.10.0.crate 18676 BLAKE2B 4c16983b5bad471b18c52e34fb6a2762097bcbb0891c7c8a8423777e01bb27341576114f6ed90aaa80cc3e0ee264b3bbe9335886565f7b2a91e37f0ac3f555e2 SHA512 10c006488bd52bffba72f7aa44cc58e292c186259054aa85f882c3f0198586574a9c722ba80f101710b867148e823596f8d1ead1b6a753e6b50e702f5fcbf904 DIST security-framework-sys-2.12.0.crate 20103 BLAKE2B 4277ccd8d983c2c1a60666dc443637a22b242811a71191b86e177adfe37783e15090d74b7070d6ad49ce13e127c0b12347ddb107eae26bb13b2766463a777cd9 SHA512 676a587b716894339fd65d1e558acca3c5fa1c23bb556fbeeb2b92721d54671b1014420c8893776fc1d21e544b3acf8298f07953ea30c2c118535b0dcb31240b -DIST serde-1.0.198.crate 77577 BLAKE2B 10d18e00a17f38e6eca67f78a3df6bea777053b4c510be7fb89ecde7d0ac2ffe37399031ea0cdc6113a0b80f8f3f1095271bc6aa3f2147e2d675cb3f5df713d1 SHA512 561e4ec8858148e9cf59f1b824c489ab259b63819e6b031205db8d89b30a5b0c12c3828fc587cef67316d1b9752f3618d089fa21b3a27cb87a074d943f27c7ff DIST serde-1.0.205.crate 78248 BLAKE2B c50ae85cc9fc922ea868cc6137e18885cdecdb58fe7ed6980cbed30209180dce17173254ec1bf238150720389c0ba6ef8bbb309a371455fa6ddfcdbb07664e70 SHA512 1ce1b680f573e0d9d15c7ee243f36cff3d425560d62c0ba50201e0e76aeb5390a17122bbd95440d9ed60d83a056a2c08d49c046fb989af063e754fd501500bf3 DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae -DIST serde_derive-1.0.198.crate 55787 BLAKE2B 6fb5b68d3bd0010283a1f61d9af5471845d9f2f5a6b476245348c6bf3d3c5d3026325de87cc8ffab0300d31dfe03e093acc40e4a7f334d33b9d33cb8e03645c0 SHA512 f33fd1e1ced08a305a41114e354ec174e09c8918e28bd486549ffbb859a139e41b5de27932cb24767f4b3db4703c25e6987c55c9b3ea566d60b9f6cd893b38ef DIST serde_derive-1.0.205.crate 55886 BLAKE2B 3744050608d782ac8250ad94f3b16bbf7b44690a691a062caad1943823c9af1207c83e09a3848b6c4f492a0fae4b031b68bc2a5b93931a265a2c4e6bff274401 SHA512 4b5999eaf8990c98c273cbd9b283eba45eb9a1b1a0dffa7e51608ba6328ac623af4cfefdca8b7154dbd754d6b56163ee79b1e8d93c14f4d33fd21c1df4738d74 DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5 -DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337 DIST serde_json-1.0.122.crate 147200 BLAKE2B e678f61791da51bfc9df8e0184ee3d43c7eeef51c10ea5ea7b14f887ba22d6eb8ccd80a3080a35fc35279b36e635fa00ca3f102c4f6f2366a831d48014692407 SHA512 140830b38ca4e79eb66bb9d2b55c69434dde9208be926e7aaf7eb561af3c19148f9abd93d1526a7f77e249ac44d9226e4d6ae63eacfb6214544913480f668160 DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb @@ -255,111 +175,77 @@ DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee DIST spm_precompiled-0.1.4.crate 557527 BLAKE2B 18a5955f1f7581acb1988b9d30dedd0ab1742f508cb7de95f7e47202aff6ab69bfbdcef33fa8297c4c3d9c68876b47d8990792ef1f5231b65a8d7faa4854975c SHA512 164f37f20a6cf9bb3dd0bb63704b74f8810c79a2bf4ac229fb50ec4e80d0a3892fb37f5c0fc838ab18e47079da952bfc5e6eeae71bce6b43fa630d128f597623 -DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c -DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0 DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd -DIST syn-2.0.60.crate 255808 BLAKE2B d7a8e415dd72267fd92da48ba8b3e6feb728f0639797db1aa74aeaa2a57935b7565eec37cbd32eec826154e2c54075b121737369eb15af36c322c34b3cfd7930 SHA512 20bfa02b03c193672a9922f9a5e196185341e082a262f7c00d7c2d467d9e2d77f4af3994634923cfaeee34aa9eab510415165f052ffd9b1ed0b1b581e272898d DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89 DIST syn-2.0.79.crate 268981 BLAKE2B 2bf4bde1890ce4ee91fbacca81bd298d15f0111fedb27b9cf8d675dc2489f46026c1804f9e4e24afbd0718539820096cd5c4ed2c2da02e598370dbfd2b18c293 SHA512 1ee073fa3428c031e53bff8ff305bcd6b37ac142bee3955dcdb44fec1c77c733eb78760c8bfb30b83fc3dacdad8a384e2b6f9f31a89c4cc300359e33457fd433 -DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27 -DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66 DIST tempfile-3.13.0.crate 34910 BLAKE2B 736378935088ccd8b540997c0554444c3752a74c9a4bd82cfcb700a9b22f572d0f2b3e61252064d4a631b57783199cfb42309e518826346a83fb5adb44843c49 SHA512 68701bee80309cd8dfa96c237b2344f26bd03702d2fc2e1a253820c98654c85d802aee1e0fc856f6372159a92ecbf624f78c8146f34a0cf924f5b56284915f85 -DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a -DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753 DIST thiserror-1.0.64.crate 21574 BLAKE2B d2c7cd7c1a8850dcd3f188aa1af61d4727c4bfc27a069f0e743adf86b7934e6db85d9ee9af14e78c7391e99f4ac828c00277a1354bfe1a47ddf5964211bb2037 SHA512 cff21ebd9d5d37e548c35dd1dc0e6e885a47363cbd8ce3cc8508e8e9b5f844c168b9f3d9ab12ca8d5910a53a9e09b4ddc75a0c32f983e27727fc104e4ff77618 -DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102 DIST thiserror-impl-1.0.64.crate 16073 BLAKE2B 8b0eee3d70f926c2719d084676cd14674dc5cf7c474c72e3e628a3cdda7afadd67a78f76224d2a05f1fe04ac59a178b879e467bac1981fc56c5904073153c88e SHA512 75e55f204a290eb38b2215fcdfa91f9f1cb002b121ffdf56bd5f6d75476614e3ce06360da7d74b870c45f6b107fa9e61f85ce39c0e65e713f8c191d79f96f443 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9 -DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e -DIST tokenizers-0.19.1.gh.tar.gz 1521372 BLAKE2B c9027cd93950b17016d8674ff0a90cd97a7191bf9cd7614dc4593fb801d7765b142573e85e77fb06eb797c7023f9627eea185f006ca79622a055f5ee7f9a6016 SHA512 7d0eec43ed97ff12075d93a81345439cdd39ac41f2c4606d26aa01249fade8549c778f44e411556b1ebd142fe761fce63eb15cd159cc49cae9fc15a2233b10bd -DIST tokenizers-0.20.0.gh.tar.gz 1537041 BLAKE2B 88c6b63240da44b684f5f10b00f28924f06a3a5c70505b572713f1c17d71a8c0a4dcbdabf95b54fd7c7e54e523b75653d396cc5439ee423b9bb25ca9b03ed97c SHA512 12ecdeb2a53e831cf53e04be757e28104a4f0eb79097b3ab8be47053ba66073f3acefab8b877bb56dc129ab35eb45adbd46bcad2d76ce4cf462c7892464737df +DIST tokenizers-0.20.1.gh.tar.gz 1538802 BLAKE2B a15e93c09c17181845b99c4b38f394446951edd39948ca385c4eee0a558bd751d3ce1c5ca01b1b9760edb9a60989428c9229a0b5736c5dd9dcc8e2e54fff0eab SHA512 3465c29540b0f0ec23106258b98459202440b8450667e2210efe7ee39e5e44d7d542d61198c85e1c50c3fa056656e494c099322eab7fb5feecacdd01ab5cc3e7 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0 DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285 DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1 -DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8 DIST unicode-bidi-0.3.17.crate 58120 BLAKE2B 9d7759554e265136ab9d95dda90bab84763189d3613522a5cb966ad6417ac0ee726d79e296c8821ccca589ef09a999701149c88a9189cabe0ed7d32902040832 SHA512 cf523ff9a2e1face42da035f81bba2476e80d1154f73f3e34cbaf5ce322504e93a520114a54e0a4b2e5d6b930e508ce31b5d8b4f4ed4d39159a8c9a9c7b94d91 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51 -DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5 DIST unicode-normalization-0.1.24.crate 126536 BLAKE2B 1d6d535a1236562918d2625172d38c261854cd8c45cccc81c5d5aefb052db5d0e33981d95f5c87e8760cf77b3651c60b7ec1762421a7a9caa72fe7eac3f562a0 SHA512 f7af59688773319b9d1523955ce9b82e6735bd72358715ba5c056f41956ca050b6a612cae1b39199cc089674b3c71e4016d85d48167277c794c5cef3df881754 DIST unicode-normalization-alignments-0.1.12.crate 91546 BLAKE2B 18aa85b935f2bbd4eab91cd160fbfc75a7f919090dd5874162d1ca76851c53bfbaf1b0e3aa23cdcb2b7a9f15e576736521be1fe45c9ff7de6db23cbc6c59e78f SHA512 b51d9096088c14a84b5c179402b1618f26b0e9bf5250ee86c9d5e26e318149829e3e57802a4c9e437c3ec29ee31ee311491e683abe50ecac5432c0a593478e6f DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef DIST unicode-segmentation-1.12.0.crate 106323 BLAKE2B 268b60aff6694434f05afb7e2b8187eeccdceb77460f8ce2ac0f84d470f8a4e03182ce3f7906177cd2f00f989273a7e69061a763006245f0876bf21b15076804 SHA512 55eebfe5e9972b39d7c0011d80eb5f517d636de37870999119a3d8f064f21f67b66a5ba9761d562738b05f220e21d56b5be7bbd9cc51662994e40dd67c38f946 -DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4 DIST unicode-width-0.1.14.crate 271615 BLAKE2B dd2e1504caedecb5d37c397ba05446d3d762b8b6833a8032ebbc213e324d53d89db5e96ed2f7223096e5754d800b39a54105906effc88d9437d7acb9e7beb81e SHA512 3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb DIST unicode_categories-0.1.1.crate 87298 BLAKE2B f52b83d204b90ce0ec26e0500bc80b0547610f3417616603c4e837fbec0a41a6a715de19f88432f4c15ddb6b2ba55ee75a472fb7e2c888accfc77e1ef1d85fee SHA512 2d15499ee9318ee54910d657339820acfa88183e4f9aa146ac655129d2c4d76d3fd0550b601702ad2ccac4c8647dd2f26528d8003f39181e09b8ef480351a3cb DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505 DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416 DIST ureq-2.10.1.crate 113163 BLAKE2B aece4293775ee9bed49dfd7c1761fdee20c92322dedf70431b6214e8a40fd9f63e43d2846c1929135005c5260ffba4a388d779a2cb2808eb892b6b869f65fa08 SHA512 9944f0790b9c342a3584bb9217d0546dc4272b011bdaa47d22b42684dd7f655aad22750d395875c63e7c92d8d44ddf1ef610061b485f9600dfd79b4db5743656 -DIST ureq-2.9.6.crate 113677 BLAKE2B a795b9a3b0985daf2bb27e489b32387693bbcaf32a126b083d584693a921c8b3dc900987846209497d468b655d30c9b364112905cbad870c6758aec28a5c3268 SHA512 c2c860006e33146589107aa191552530749c143ab93a60ff3fa959dd53bbd03c48d7f4b410ecc4c92c28c2b483ec3c2c720373a6ee54ef8f9c31b069da205f9e -DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a -DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f -DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5 DIST wasm-bindgen-0.2.93.crate 43769 BLAKE2B e1abf981a042ebbc5c506975d5c2258942278fc000ac62aafe4221725fc52003c4032dc04a396e8fc8ec6712155e056ea9381a72070ee7c45b348ce470f52c7c SHA512 0c0a63b04b02b57fca78d2c0b885ea752ef1e8e4317c27dc84fd35843c9c396ae20557a1321c03a405b050f21895e6f25e95ddb56f3a3e8cec13928858ae8422 -DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa DIST wasm-bindgen-backend-0.2.93.crate 30344 BLAKE2B d0b9f0cd0e6191dc3f57869023450952f2d73c0432fd4516522df5f63090de021f44f11ce7676fd2f87b31f6b236eb155b22b36eb80c3ccf3880f55ca23d4b0b SHA512 c67dad5fa26f78b233612cb6ebd44f48edd84253e46a2f5094e95da935185cf2a7be14d49247e8b8cd1d916721ed82ea44046080a40b2fe37ad88175a5f96597 -DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462 DIST wasm-bindgen-macro-0.2.93.crate 6822 BLAKE2B 3704c01b90ae900032e455a265b614d1057a7ed7b7eef1ebfdce75a7b0f0b97083211db562d1602160cf9e70843a1949be836465398787315d66ccf85fbe0801 SHA512 8b1a690bf4fc344728bae21a11c8ce4641d81b02e215d88a489f8155433d8e579ed367c96bc19a345b561f2ddb42afa44056b71e15dc935a4fe38fd7f937a632 -DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7 DIST wasm-bindgen-macro-support-0.2.93.crate 20642 BLAKE2B 3fef9d35c09e97317e8531f11c3cfcafc5cb58126ab7a96374cd5e2e3f8736ef016b4c0b3b16bcdc0bef686e9f07439f263c54dc980649e9963b12d0a6814ddc SHA512 9fe590636e229184a944acbb8472c03db0a48a9094cd9ee204c09cee6c5241194a9757f06b09e7c30ba9db1a2feca616cd1e7dc0e52c7f1c1560c50c9d3adbb8 -DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07 DIST wasm-bindgen-shared-0.2.93.crate 7527 BLAKE2B a2df995ba72d83beb3f347909c004d9693ee06cec62de248a1f96b0244c05dd8b62d46356f1b7eb0a29122517bc23270eb4eaf045e6cdbb7122089dc84829d9f SHA512 4e9271a746d3b3ea44bae472b7d9722edbcf262fdec2e03c18788d95b923c71c26f309e316ad3c621d5773311d6b1d5ad468cd7bdff015d162193b6effaf8420 -DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b DIST web-sys-0.3.70.crate 615438 BLAKE2B cbc8b7ec572a3df1b42d603efb3af1914621957a79f0217e75b6eaa192db6dcf2de9782e130ebc364f704e624913a13cf9dbbe816087db340bcff4a4021b7526 SHA512 337a12d7eaf2a643a7a49a026bccebde73fbef44f729daa6feb71c228d7d8ef72155f9f501b7ef9ea5c22a619b8a8591487841a67a1e12a6d1105d92f3cc708b -DIST webpki-roots-0.26.1.crate 249748 BLAKE2B 6a2468eb2f868c65c599d2f6664798f75e77cb7a7228a2c7285ee5256cb01d110709474feb389991f12ba0d143211770c6922932c7fab01b4b0e37b612cbd453 SHA512 89ac53267d850953aa78550a60f58f5bcb0f9e885c4c448911dc55bbb8dbc3fb845cd7545fc40ff26998b0c360756de85206adcb148ca6190e50bc2daea7f61f DIST webpki-roots-0.26.6.crate 255384 BLAKE2B 8a5d94e2ac66343fb8833f0b2ae67a5292707ca5d34386502f7514380f62bf86b812967e6b10f51015d63744c7e20a0f4cf6ad9142256c981c31a9bcc7ef8f90 SHA512 a2e3a406caf6ff8261bfd2d52699bea10214e8c0d6ae69631918566bdf156be2e6fe7e0d91120ad4cb10d20862215b25c8ad454e908bffbebf1c046e1787b11f DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9 DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 DIST windows-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061 DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 -DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 -DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5 DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff -DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a -DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2 DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822 -DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e -DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634 DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 -DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8 DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa -DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08 DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 -DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb -DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe diff --git a/sci-libs/tokenizers/tokenizers-0.19.1.ebuild b/sci-libs/tokenizers/tokenizers-0.19.1.ebuild deleted file mode 100644 index 2b4a43284046..000000000000 --- a/sci-libs/tokenizers/tokenizers-0.19.1.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Autogenerated by pycargoebuild 0.10 - -EAPI=8 - -DISTUTILS_USE_PEP517=maturin -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_EXT=1 -DISTUTILS_SINGLE_IMPL=1 - -CRATES=" - adler@1.0.2 - aho-corasick@1.1.3 - anes@0.1.6 - anstream@0.6.13 - anstyle-parse@0.2.3 - anstyle-query@1.0.2 - anstyle-wincon@3.0.2 - anstyle@1.0.6 - assert_approx_eq@1.1.0 - autocfg@1.2.0 - base64@0.13.1 - base64@0.21.7 - bit-set@0.5.3 - bit-vec@0.6.3 - bitflags@1.3.2 - bitflags@2.5.0 - bumpalo@3.15.4 - cast@0.3.0 - cc@1.0.94 - cfg-if@1.0.0 - ciborium-io@0.2.2 - ciborium-ll@0.2.2 - ciborium@0.2.2 - clap@4.5.4 - clap_builder@4.5.2 - clap_derive@4.5.4 - clap_lex@0.7.0 - colorchoice@1.0.0 - console@0.15.8 - core-foundation-sys@0.8.6 - core-foundation@0.9.4 - crc32fast@1.4.0 - criterion-plot@0.5.0 - criterion@0.5.1 - crossbeam-deque@0.8.5 - crossbeam-epoch@0.9.18 - crossbeam-utils@0.8.19 - crunchy@0.2.2 - darling@0.20.8 - darling_core@0.20.8 - darling_macro@0.20.8 - derive_builder@0.20.0 - derive_builder_core@0.20.0 - derive_builder_macro@0.20.0 - derive_builder@0.20.1 - derive_builder_core@0.20.1 - derive_builder_macro@0.20.1 - dirs-sys@0.4.1 - dirs@5.0.1 - either@1.11.0 - encode_unicode@0.3.6 - env_filter@0.1.0 - env_logger@0.11.3 - errno@0.3.8 - esaxx-rs@0.1.10 - fancy-regex@0.13.0 - fastrand@2.0.2 - flate2@1.0.28 - fnv@1.0.7 - foreign-types-shared@0.1.1 - foreign-types@0.3.2 - form_urlencoded@1.2.1 - getrandom@0.2.14 - half@2.4.0 - heck@0.4.1 - heck@0.5.0 - hermit-abi@0.3.9 - hf-hub@0.3.2 - humantime@2.1.0 - ident_case@1.0.1 - idna@0.5.0 - indicatif@0.17.8 - indoc@2.0.5 - instant@0.1.12 - is-terminal@0.4.12 - itertools@0.10.5 - itertools@0.11.0 - itertools@0.12.1 - itoa@1.0.11 - js-sys@0.3.69 - lazy_static@1.4.0 - libc@0.2.153 - libredox@0.1.3 - linux-raw-sys@0.4.13 - lock_api@0.4.11 - log@0.4.21 - macro_rules_attribute-proc_macro@0.2.0 - macro_rules_attribute@0.2.0 - matrixmultiply@0.3.8 - memchr@2.7.2 - memoffset@0.9.1 - minimal-lexical@0.2.1 - miniz_oxide@0.7.2 - monostate-impl@0.1.12 - monostate@0.1.12 - native-tls@0.2.11 - ndarray@0.15.6 - nom@7.1.3 - num-complex@0.4.5 - num-integer@0.1.46 - num-traits@0.2.18 - number_prefix@0.4.0 - numpy@0.21.0 - once_cell@1.19.0 - onig@6.4.0 - onig_sys@69.8.1 - oorandom@11.1.3 - openssl-macros@0.1.1 - openssl-probe@0.1.5 - openssl-sys@0.9.102 - openssl@0.10.64 - option-ext@0.2.0 - parking_lot@0.12.1 - parking_lot_core@0.9.9 - paste@1.0.14 - percent-encoding@2.3.1 - pkg-config@0.3.30 - plotters-backend@0.3.5 - plotters-svg@0.3.5 - plotters@0.3.5 - portable-atomic@1.6.0 - ppv-lite86@0.2.17 - proc-macro2@1.0.81 - pyo3-build-config@0.21.2 - pyo3-ffi@0.21.2 - pyo3-macros-backend@0.21.2 - pyo3-macros@0.21.2 - pyo3@0.21.2 - quote@1.0.36 - rand@0.8.5 - rand_chacha@0.3.1 - rand_core@0.6.4 - rawpointer@0.2.1 - rayon-cond@0.3.0 - rayon-core@1.12.1 - rayon@1.10.0 - redox_syscall@0.4.1 - regex-automata@0.4.5 - regex-syntax@0.8.2 - redox_users@0.4.5 - regex-automata@0.4.6 - regex-syntax@0.8.3 - regex@1.10.4 - ring@0.17.8 - rustc-hash@1.1.0 - rustix@0.38.32 - rustls-pki-types@1.4.1 - rustls-webpki@0.102.2 - rustls@0.22.3 - ryu@1.0.17 - scopeguard@1.2.0 - same-file@1.0.6 - schannel@0.1.23 - scopeguard@1.2.0 - security-framework-sys@2.10.0 - security-framework@2.10.0 - serde@1.0.198 - serde_derive@1.0.198 - serde_json@1.0.116 - smallvec@1.13.2 - spin@0.9.8 - spm_precompiled@0.1.4 - strsim@0.10.0 - strsim@0.11.1 - subtle@2.5.0 - syn@2.0.60 - target-lexicon@0.12.14 - tempfile@3.10.1 - termcolor@1.4.1 - thiserror-impl@1.0.58 - thiserror@1.0.58 - tinytemplate@1.2.1 - tinyvec@1.6.0 - tinyvec_macros@0.1.1 - unicode-bidi@0.3.15 - unicode-ident@1.0.12 - unicode-normalization-alignments@0.1.12 - unicode-normalization@0.1.23 - unicode-segmentation@1.11.0 - unicode-width@0.1.11 - unicode_categories@0.1.1 - unindent@0.2.3 - untrusted@0.9.0 - ureq@2.9.6 - url@2.5.0 - utf8parse@0.2.1 - vcpkg@0.2.15 - walkdir@2.5.0 - wasi@0.11.0+wasi-snapshot-preview1 - wasm-bindgen-backend@0.2.92 - wasm-bindgen-macro-support@0.2.92 - wasm-bindgen-macro@0.2.92 - wasm-bindgen-shared@0.2.92 - wasm-bindgen@0.2.92 - web-sys@0.3.69 - webpki-roots@0.26.1 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-util@0.1.6 - winapi-x86_64-pc-windows-gnu@0.4.0 - winapi@0.3.9 - windows-sys@0.48.0 - windows-sys@0.52.0 - windows-targets@0.48.5 - windows-targets@0.52.5 - windows_aarch64_gnullvm@0.48.5 - windows_aarch64_gnullvm@0.52.5 - windows_aarch64_msvc@0.48.5 - windows_aarch64_msvc@0.52.5 - windows_i686_gnullvm@0.52.5 - windows_i686_gnu@0.48.5 - windows_i686_gnu@0.52.5 - windows_i686_msvc@0.48.5 - windows_i686_msvc@0.52.5 - windows_x86_64_gnu@0.48.5 - windows_x86_64_gnu@0.52.5 - windows_x86_64_gnullvm@0.48.5 - windows_x86_64_gnullvm@0.52.5 - windows_x86_64_msvc@0.48.5 - windows_x86_64_msvc@0.52.5 - zeroize@1.7.0 -" - -inherit cargo distutils-r1 - -DESCRIPTION="Implementation of today's most used tokenizers" -HOMEPAGE="https://github.com/huggingface/tokenizers" -SRC_URI=" - https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} -" - -LICENSE="Apache-2.0" -# Dependent crate licenses -LICENSE+=" - Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 - Unicode-DFS-2016 -" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=" - test? ( sci-libs/datasets[${PYTHON_SINGLE_USEDEP}] ) - $(python_gen_cond_dep ' - dev-python/setuptools-rust[${PYTHON_USEDEP}] - ') -" - -distutils_enable_tests pytest - -QA_FLAGS_IGNORED="/usr/bin/cli .*/site-packages/tokenizers/.*so" - -src_unpack() { - cargo_src_unpack -} - -src_prepare() { - default - cd bindings/python - eapply "${FILESDIR}"/${PN}-0.15.2-test.patch - distutils-r1_src_prepare -} - -src_configure() { - cd tokenizers - cargo_src_configure - cd ../bindings/python - distutils-r1_src_configure -} - -src_compile() { - cd tokenizers - cargo_src_compile - cd ../bindings/python - distutils-r1_src_compile -} - -src_test() { - cd tokenizers - # Tests do not work - #cargo_src_test - cd ../bindings/python - local EPYTEST_DESELECT=( - "tests/bindings/test_tokenizer.py::TestTokenizer::test_encode_formats" - "tests/documentation/test_tutorial_train_from_iterators.py::TestTrainFromIterators::test_datasets" - ) - distutils-r1_src_test -} - -src_install() { - cd tokenizers - cd ../bindings/python - distutils-r1_src_install -} diff --git a/sci-libs/tokenizers/tokenizers-0.20.0.ebuild b/sci-libs/tokenizers/tokenizers-0.20.1-r1.ebuild index 5842ed5b10cd..e5255c274cb5 100644 --- a/sci-libs/tokenizers/tokenizers-0.20.0.ebuild +++ b/sci-libs/tokenizers/tokenizers-0.20.1-r1.ebuild @@ -31,8 +31,7 @@ CRATES=" bumpalo@3.16.0 byteorder@1.5.0 cast@0.3.0 - cc@1.1.25 - cc@1.1.8 + cc@1.1.22 cfg-if@1.0.0 ciborium-io@0.2.2 ciborium-ll@0.2.2 @@ -119,8 +118,7 @@ CRATES=" num-traits@0.2.19 number_prefix@0.4.0 numpy@0.21.0 - once_cell@1.19.0 - once_cell@1.20.2 + once_cell@1.20.1 onig@6.4.0 onig_sys@69.8.1 oorandom@11.1.4 @@ -161,7 +159,7 @@ CRATES=" redox_users@0.4.6 regex-automata@0.4.8 regex-syntax@0.8.5 - redox_syscall@0.5.3 + redox_syscall@0.5.7 regex-automata@0.4.7 regex-syntax@0.8.4 regex@1.10.6 @@ -299,6 +297,11 @@ src_unpack() { cargo_src_unpack } +pkg_setup() { + python-single-r1_pkg_setup + rust_pkg_setup +} + src_prepare() { default cd bindings/python @@ -327,7 +330,45 @@ src_test() { cd ../bindings/python local EPYTEST_DESELECT=( "tests/bindings/test_tokenizer.py::TestTokenizer::test_encode_formats" + "tests/bindings/test_encoding.py::TestEncoding::test_sequence_ids" + "tests/bindings/test_encoding.py::TestEncoding::test_n_sequences" + "tests/bindings/test_encoding.py::TestEncoding::test_word_to_tokens" + "tests/bindings/test_encoding.py::TestEncoding::test_word_to_chars" + "tests/bindings/test_encoding.py::TestEncoding::test_token_to_sequence" + "tests/bindings/test_encoding.py::TestEncoding::test_token_to_chars" + "tests/bindings/test_encoding.py::TestEncoding::test_token_to_word" + "tests/bindings/test_encoding.py::TestEncoding::test_char_to_token" + "tests/bindings/test_encoding.py::TestEncoding::test_char_to_word" + "tests/bindings/test_encoding.py::TestEncoding::test_truncation" + "tests/bindings/test_encoding.py::TestEncoding::test_invalid_truncate_direction" + "tests/bindings/test_models.py::TestBPE::test_instantiate" + "tests/bindings/test_models.py::TestWordLevel::test_instantiate" + "tests/bindings/test_models.py::TestWordPiece::test_instantiate" + "tests/bindings/test_processors.py::TestByteLevelProcessing::test_processing" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_encode_add_special_tokens" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_from_pretrained" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_from_pretrained_revision" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_encode_special_tokens" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_splitting" + "tests/bindings/test_trainers.py::TestUnigram::test_continuing_prefix_trainer_mistmatch" + "tests/bindings/test_trainers.py::TestUnigram::test_train" + "tests/documentation/test_pipeline.py::TestPipeline::test_pipeline" + "tests/documentation/test_pipeline.py::TestPipeline::test_bert_example" + "tests/documentation/test_quicktour.py::TestQuicktour::test_quicktour" "tests/documentation/test_tutorial_train_from_iterators.py::TestTrainFromIterators::test_datasets" + "tests/documentation/test_tutorial_train_from_iterators.py::TestTrainFromIterators::test_gzip" + "tests/implementations/test_bert_wordpiece.py::TestBertWordPieceTokenizer::test_basic_encode" + "tests/implementations/test_bert_wordpiece.py::TestBertWordPieceTokenizer::test_multiprocessing_with_parallelism" + "tests/implementations/test_byte_level_bpe.py::TestByteLevelBPE::test_basic_encode" + "tests/implementations/test_byte_level_bpe.py::TestByteLevelBPE::test_add_prefix_space" + "tests/implementations/test_byte_level_bpe.py::TestByteLevelBPE::test_lowerspace" + "tests/implementations/test_byte_level_bpe.py::TestByteLevelBPE::test_multiprocessing_with_parallelism" + "tests/implementations/test_char_bpe.py::TestCharBPETokenizer::test_basic_encode" + "tests/implementations/test_char_bpe.py::TestCharBPETokenizer::test_lowercase" + "tests/implementations/test_char_bpe.py::TestCharBPETokenizer::test_decoding" + "tests/implementations/test_char_bpe.py::TestCharBPETokenizer::test_multiprocessing_with_parallelism" + "tests/test_serialization.py::TestSerialization::test_full_serialization_albert" + "tests/test_serialization.py::TestSerialization::test_str_big" ) local -x EPYTEST_IGNORE=(benches/) distutils-r1_src_test diff --git a/sci-libs/transformers/Manifest b/sci-libs/transformers/Manifest index 702812166274..aede1c3cb4e8 100644 --- a/sci-libs/transformers/Manifest +++ b/sci-libs/transformers/Manifest @@ -1 +1 @@ -DIST transformers-4.40.2.gh.tar.gz 18236908 BLAKE2B f62bdd15b98fb8b4ae7adbe497ad2ab33bf19acab10017aaf8df38832a3e3981aa72c0a21a91712125ba9981c829deff626092f3c43733d580e032a85e3ddd7f SHA512 f1c471c471e31672b4923e6a3cecf31cd1ea2ad7b3b3c520fd93d200d4d21f1dddd993eb29ef58ba137a9e4fbcfd48a00b61243c1c7566b68385f32ede8ee42c +DIST transformers-4.45.2.gh.tar.gz 19105135 BLAKE2B 7bccd916de08d480789597c76f042b3941663e9bc9882c9c6b2c3d12ca49a505725ebc944306318fe5f418a36105247ef0729b8a8afc63adfe7c321a2367dea1 SHA512 1006949935b44d6ae0dc464cef9cc23b6c2074ef4a4947c4296ae177fb5348ea8ab0f4fed7da01ed9b67e20985494b07820605b396c30fd02d3ecc01549746d2 diff --git a/sci-libs/transformers/transformers-4.40.2.ebuild b/sci-libs/transformers/transformers-4.45.2.ebuild index afe16f800ffc..00493e1100e1 100644 --- a/sci-libs/transformers/transformers-4.40.2.ebuild +++ b/sci-libs/transformers/transformers-4.45.2.ebuild @@ -22,7 +22,7 @@ KEYWORDS="~amd64" RESTRICT="test" # Need some modules, not yet packaged RDEPEND=" - =sci-libs/tokenizers-0.19*[${PYTHON_SINGLE_USEDEP}] + =sci-libs/tokenizers-0.20*[${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' dev-python/filelock[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] diff --git a/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild b/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild index 2ff5dcef327d..c3f8fbebcec8 100644 --- a/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild +++ b/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="+cholmod doc" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/volk/volk-3.1.2.ebuild b/sci-libs/volk/volk-3.1.2.ebuild index a6c27ce5a74e..12e15e0de7b4 100644 --- a/sci-libs/volk/volk-3.1.2.ebuild +++ b/sci-libs/volk/volk-3.1.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) #https://github.com/gnuradio/volk/issues/383 CMAKE_BUILD_TYPE="None" diff --git a/sci-libs/volk/volk-9999.ebuild b/sci-libs/volk/volk-9999.ebuild index f86ccd6d99f6..adb8767c35ea 100644 --- a/sci-libs/volk/volk-9999.ebuild +++ b/sci-libs/volk/volk-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) #https://github.com/gnuradio/volk/issues/383 CMAKE_BUILD_TYPE="None" diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 51b1e50afdd1..35b64e6287e6 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,18 +1,12 @@ -DIST VTK-9.2.5.tar.gz 53807732 BLAKE2B 8d25ec8f23c12868b2321eca84644dbf44704e58b7b79b2fd3a1260f7a240a78e4007fd99633ba93359103afc8ec00c7fa84f62778aed3d3361e1774a87b5626 SHA512 b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf -DIST VTK-9.2.6.tar.gz 53810904 BLAKE2B e3f9736a9b38415e0edd4b4c4bfe83aa154221c3c2c582e527996f88386b1b4d7864ddd2a364c0e83596ff45902cb7cde548ac3a4eebe06c2e43925c2608c4d3 SHA512 f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc DIST VTK-9.3.0.tar.gz 99932810 BLAKE2B 59c2cdfe1c2525ac0f89df77a668783d928b55d2e72b42df45ea9b789da1bb150d52ce4108f2bc39cb8840cdd1998f57d3aedf96c72e402f6115d9efeebf4486 SHA512 2722dc8186779df1af5c534f26b20186ea33cb3bca2cef8cb333542b12e738382616e26e8d4d0341cb98c30403f8a896d77ddb04adb07e26d0d548c4a34b7d2f -DIST VTKData-9.2.5.tar.gz 594016050 BLAKE2B 7f03f5640ee648275a9771f990f98a3b5dfee10c0e291b353e6f067a098d50e2653c577b7c9c4e19c1d554e14469968014d1dfe9e70a91ecbff75397a53c9be9 SHA512 c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3 -DIST VTKData-9.2.6.tar.gz 594029678 BLAKE2B b3d6990a8098d9bec02a031b6d804049ce649bcd58fbcd74001e893ba41159e49f4dea74c5957737098a39a399d347b3bc65db4feadf152dd3fb8e705da16eb4 SHA512 5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080 +DIST VTK-9.3.1.tar.gz 99964158 BLAKE2B b85aae0aef1a22bd0496e0f5d2c7d3a5c20bbd7db8951ab1f9fe29a48c01ce960e90dc85f36cb6858c2b7dfd7f12cd1cf2e7d0fbb115fc9fd709dd7b481c598e SHA512 5dcd6764b2d9fe476bcc7bd195fab8230b7628579d94656ab037dcaecd07c7d40d0fc4afba446942ca15cd881df17f4c84581047e75a6e11d2e2d339d97c7fa3 DIST VTKData-9.3.0.tar.gz 612388942 BLAKE2B 66d73ddaf5f2ddf52cf5c6dda5a918a86ae630df207983534478c92a66c39e38b1f4abfb93900b36899a93ad0e26260763573e925bd128c1646a1bc3bef8c54d SHA512 385d609c2adc1746c073690b58a3fc25e496946c03f08e6c9e0a69ee406cee447e66d267986c3e5ba9006dd1cb0015b68134bb3c375ae41aef8f3b1e0d923d51 -DIST VTKDataFiles-9.2.5.tar.gz 609038837 BLAKE2B e6a5aa5a865664cf407914c9598497f6304b914748ce9d9145b5b7d53f5897b4056b6f7615bb8221c9a9747caf13ba632e21b060b1c8963bb7d6b257bb1da559 SHA512 c0cf7e0fb79f626e25946f1154d9e4c3e7ec995a823a01fc9638976f89af26ae8978a5b6c8a78d62f42f7f81b5fbe0cddc6afc5836c214f3dcaddb917a1ccc79 -DIST VTKDataFiles-9.2.6.tar.gz 609045751 BLAKE2B c8a4a8472dcc05f5b1d35c8f6923b4ed2e7adb593a3037ae7673a5e674583ef9ccc5bc1ec8cf29e87fd5b168c0bba5ed27b89c51fe2e5da432ef5d50e415af94 SHA512 f7c104641d25126956a50671934c10b25589e435d7cce6a5107c8dcf83a81f48ed3ae8a325b635f341a5a47579f9200689aa5eb34fe0d1c37acddfeedd33cd01 +DIST VTKData-9.3.1.tar.gz 612744946 BLAKE2B 6b3a09f6cc98630e817aaeca8094c6a6625372269abfa9003212cd1cdbc101b198f5eeb3474ca675be7f03046c58a5d11b4092ab19ed230422c4100011abfee4 SHA512 befc6b68e33d2c2fb6928006d4fe6feda7e0bbaf31df4488911ab8e3865e3fc1cf3834301301aa2b6de94c4489eebf5e2e8521e8830315d2a1f0e65cb73a6fd3 DIST VTKDataFiles-9.3.0.tar.gz 628646039 BLAKE2B c2a4e875536c0b06f1edc8a8df17defbe1038067d7a04fc07e71ea49cad46139ef25f64d4b434a095ced16a7ff39d5346d34c528c099ea2e126c9f29afe92482 SHA512 c6788acfa790ce6b02aa5545fa4e411d00896b7542416c18b5e5955909f26a8fab9267e44db1c2a86f95f7a7f093695453f3fd0ec4e2c9a73449f9caf3fc09d5 -DIST VTKLargeData-9.2.5.tar.gz 247523496 BLAKE2B edc785e271ba605c730b9c8d9d62d2d95d818ebf18e4b20468c247187720a27897ecbf701e1eff61ba135545e6ea8f573ef120206813ee5ca11be33d8c5ff728 SHA512 7a994024aa42b48d3633cdcc528d89a2e7e07bcc47d01a0001578720dbc2eb991b90dc2f9caafe8f26a1f10185efb1bc2c0506f799da2b96e63ba08cb564117d -DIST VTKLargeData-9.2.6.tar.gz 247521022 BLAKE2B ee6e5f627a5cb96aac6a53b7ff14d4a40f1e243a095c7d145412d899ab9d509af5a62ab889fc48c96ff78359443afbeecfa70cb937affdad7225071374b28bec SHA512 f0b71baa4e346746e186c6a0cc93588d227b91cd4993ee6afe15708006250b0b3aa9447822845e01432728c12af56c68a213831b6dc809807ca341ff6912f55f +DIST VTKDataFiles-9.3.1.tar.gz 628903288 BLAKE2B cf5919a627ee49809f79d29577d65a48c3332255551c3c229875b25fce911c75c3edeca8d0dfdf9926f93543963ab0e2c992c7469e2c9eed041c39cfd995647d SHA512 360fadd31ab304a27b208745c674eb31759552e98f587569f481c1bda62c7f8ae72598cd40b2c628bb211aace8f62df2ea7ca66f192f8d2e71bca7a4deaa9e89 DIST VTKLargeData-9.3.0.tar.gz 247520869 BLAKE2B e01f3d0997d0b328d6c5909d6b891443c1246bdbc36aa978004a1d4bb2770f7923afed2c0d78f7844aae95e067425b9dd25a1c47601c8137ba0a8a958b708cab SHA512 d87eb0fb4ce27ae9f4363c54bb711e66c5d2dbcdf508cb5fae9fcc1574407df2816f29d20037297b834440cd8a54fcf8e1d6db14700054f057bff2fe48404d33 -DIST VTKLargeDataFiles-9.2.5.tar.gz 247506616 BLAKE2B 45cd462a11dfa65260a5aa178b2004636eb8ec000af9103fd2fc64ca55b0f607cdf39c40f5f0a9ef843b7b2e468e0f84a34dafb8b8655efce5c8d39c80961422 SHA512 da96e4f1d0e21bc597832d8cd0730dcdd8a8f7d6c1f41f74ec41a7a1d0b2a2d61e86bcb5fade7d3210b9d66cae975b537e25280767e37fe08e0965b3e98c1cae -DIST VTKLargeDataFiles-9.2.6.tar.gz 247505945 BLAKE2B dafec016a17bc4371972e85fe95e5032f385ef090ca7f3cc4e060976798c18015e34d74aa008a0532a37b3a51df406886a1d70c2eae18f6092a1c16cc861a81a SHA512 5266d7761987d651e1185e7a8fcc556634e129bb2dab892f8bba0e408a950f38c3f96c521a2079bfdc16a6cefb7b4cebc0b63aea945c4f3f0b6a99c55d638197 +DIST VTKLargeData-9.3.1.tar.gz 247523669 BLAKE2B 88ec5046f502db14dd6a26ef81e386babaf560619e16d769834e96046eab46cf762d8c80f9b51c434b77e4e145d8f60e32efbdb4f57d8305494177abec0806ef SHA512 edf5610edfae90f8465d68e0e06e82018978ba27f5b2ae9701939aeb72019acaabeda435c15787f1c4828b44e34c79e2837565a81d6a3accd368a92c6eacebd1 DIST VTKLargeDataFiles-9.3.0.tar.gz 247503839 BLAKE2B 68007af36148eaae43fc0fd75b9f8d3b165c977b7bc44efa4ce7077dc4977514f49a4d7d5e4a9e43fc9dec6562d741bdee5df87efa285b3361f865023da14f55 SHA512 f7def947ff492acbfdaa3d360064c42fdd3fedab27fd5d7bed1dbf8054b814cc8843ba0fed7078926648d1e8949235b877de97747be079ea478b79558975e6ea -DIST vtkDocHtml-9.2.5.tar.gz 158865725 BLAKE2B ccfb6276955bda567e7f2b6fdc5e3e601766bae0314821c243a3d009e1557c5732bfbab59358670c4bc6cd598ba80c284971763e5279bc53c37d954ec30fcc03 SHA512 7901e9fb987ef3b88e8c507ecc7538b551c81d04a9cc65a84ff43b40dc1aeca2a694dd9842a030979a1370873b9fed0c8746a0634b486566086d7784a19181d6 -DIST vtkDocHtml-9.2.6.tar.gz 158833419 BLAKE2B 04686ee0373191fec454738b5e745f3f6d913120dd55727732ab31a021eeaf1395e6a39ee0e2a943c80dc9d32a929dacfc1325afad5a412964dabb4eda32c898 SHA512 e72cfda5cfeb3df0f915f6515bbd34bcb32052af940760cfb1c9845a5c0a81fae38837fb2e192eb95446cd27b65b37b79263f5396631e4665c9d8c57455dcf43 +DIST VTKLargeDataFiles-9.3.1.tar.gz 247505524 BLAKE2B 5de069309c59a8a73365fb9faba9904189d723fb72976f372e40db3eb100342a19fecd582bd0aa42fc1012675b442a8e42611632004d6b6d6708468c27a4265e SHA512 bbbf0c193432cb5d8a5618c41e66609c7e6f3e4f24f588124c46b537ecec28b5670420b7f77185da534e4098f8b95d8ec4e392fc017df934a84bfc9dc833f634 DIST vtkDocHtml-9.3.0.tar.gz 165538725 BLAKE2B 27874998679090d5442ecb3a394b53db05a0215cfee9f912bd01af1d5567efc51b4f56dacb960401195da4f3d385b335bbefc922a45d0199c99d619df0941f08 SHA512 8bf9cc87c4653a65ccc39d88d70b421a7b4353986d380cbf558cbf6e8a96435695a5d54aa7ce5bb1240cb46ca0fd9225a51183a39d1af1101d3f2876a2afc10b +DIST vtkDocHtml-9.3.1.tar.gz 165542400 BLAKE2B da8084137b2848f82bf091535950738bd718e65cac8f461fdfb8e9c63ef6db68acfa02655531c8fe22e35f89395d2d066aa5b051abac0e774883552c898de6d9 SHA512 de0d2153c97864b49a8b99e6fbfc8bab78c1522d25bf40ed1f271a8bb4f1f205b008d6bd39f835816972c8439d01f78b68f34d1f88f87755174f0d559841ba29 diff --git a/sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch b/sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch deleted file mode 100644 index c47bced20f22..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 225a077898eb714e5ecb80255796aa70625e6cea Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 12 Nov 2022 02:01:35 +0100 -Subject: [PATCH] VTKm respect user CXXFLAGS - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/Accelerators/Vtkm/Core/CMakeLists.txt -+++ b/Accelerators/Vtkm/Core/CMakeLists.txt -@@ -79,6 +79,16 @@ if (TARGET vtkm::cuda) - vtk_module_set_properties(VTK::AcceleratorsVTKmCore - LANGUAGE CUDA - CUDA_SEPARABLE_COMPILATION ON) -+ -+ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) -+ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) -+ set(cxx_flags -Wall) -+ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) -+ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) -+ endforeach() -+ vtk_module_compile_options(VTK::AcceleratorsVTKmCore -+ PUBLIC -+ ${cxx_flags}) - endif() - - if (MSVC) ---- a/Accelerators/Vtkm/DataModel/CMakeLists.txt -+++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt -@@ -89,6 +89,16 @@ if (TARGET vtkm::cuda) - - vtk_module_compile_options(VTK::AcceleratorsVTKmDataModel - PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=extra_semicolon>) -+ -+ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) -+ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) -+ set(cxx_flags -Wall) -+ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) -+ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) -+ endforeach() -+ vtk_module_compile_options(VTK::AcceleratorsVTKmDataModel -+ PUBLIC -+ ${cxx_flags}) - endif () - - if (MSVC) ---- a/Accelerators/Vtkm/Filters/CMakeLists.txt -+++ b/Accelerators/Vtkm/Filters/CMakeLists.txt -@@ -138,6 +138,16 @@ if (TARGET vtkm::cuda) - - vtk_module_compile_options(VTK::AcceleratorsVTKmFilters - PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=extra_semicolon>) -+ -+ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) -+ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) -+ set(cxx_flags -Wall) -+ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) -+ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) -+ endforeach() -+ vtk_module_compile_options(VTK::AcceleratorsVTKmFilters -+ PUBLIC -+ ${cxx_flags}) - endif () - - if (MSVC) ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmCompilerFlags.cmake -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmCompilerFlags.cmake -@@ -126,6 +126,12 @@ elseif(VTKM_COMPILER_IS_ICC) - elseif(VTKM_COMPILER_IS_GNU OR VTKM_COMPILER_IS_CLANG) - set(cxx_flags -Wall -Wcast-align -Wextra -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wunused -fno-common -Wno-unused-function) - set(cuda_flags -Xcompiler=-Wall,-Wcast-align,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-fno-common,-Wunused,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-function) -+ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) -+ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) -+ foreach(elem ${cmake_cxx_flags_list}) -+ list(PREPEND cxx_flags ${elem}) -+ list(PREPEND cuda_flags -Xcompiler=${elem}) -+ endforeach() - - #Clang does not support the -Wchar-subscripts flag for warning if an array - #subscript has a char type. --- -2.38.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.2-link-with-glut-library-for-freeglut.patch b/sci-libs/vtk/files/vtk-9.2.2-link-with-glut-library-for-freeglut.patch deleted file mode 100644 index 39b7e7ab0f15..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.2-link-with-glut-library-for-freeglut.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 801654a5f1c3991ff9bb3ea5798afdd252d214b6 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Mon, 21 Nov 2022 15:35:58 +0100 -Subject: [PATCH] link with glut library for freeglut - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/Rendering/External/Testing/Cxx/CMakeLists.txt -+++ b/Rendering/External/Testing/Cxx/CMakeLists.txt -@@ -12,5 +12,5 @@ if(NOT APPLE) - - vtk_test_cxx_executable(vtkRenderingExternalCxxTests tests) - target_link_libraries(vtkRenderingExternalCxxTests PRIVATE -- ${GLUT_LIBRARY}) -+ ${GLUT_LIBRARIES}) - endif() --- -2.38.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch b/sci-libs/vtk/files/vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch deleted file mode 100644 index 287d804847bb..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch +++ /dev/null @@ -1,20 +0,0 @@ -From https://gitlab.kitware.com/vtk/vtk/-/commit/57767732c4d54db89004c685022ac828bb51eccd - -From 57767732c4d54db89004c685022ac828bb51eccd Mon Sep 17 00:00:00 2001 -From: Andrew Bauer <bauer.andrew.c@gmail.com> -Date: Wed, 27 Jul 2022 09:31:13 -0400 -Subject: [PATCH 033/614] vtkGeometryFilter: add missing mutex header file - ---- a/Filters/Geometry/vtkGeometryFilter.cxx -+++ b/Filters/Geometry/vtkGeometryFilter.cxx -@@ -52,6 +52,7 @@ - #include "vtkWedge.h" - - #include <memory> -+#include <mutex> - - vtkStandardNewMacro(vtkGeometryFilter); - vtkCxxSetObjectMacro(vtkGeometryFilter, Locator, vtkIncrementalPointLocator); --- -2.38.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch deleted file mode 100644 index 82bf19b6b07f..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://gitlab.kitware.com/vtk/vtk/-/merge-requests/9857 - -From ef95422b62296e4c136917095eace14f48cefb82 Mon Sep 17 00:00:00 2001 -From: Laurent Rineau <laurent.rineau@cgal.org> -Date: Tue, 17 Jan 2023 16:18:53 +0100 -Subject: [PATCH] Add #include <cstdint> to compile with gcc13 - -The `vtkSEPReader` was introduced by MRs !4909 (from my former -collaborator Maxime) and !4938. Then it was highly modified by -!7516. The later MR is the one that introduced the uses of -`std::uint8_t` and `std::uint32_t`. - -Those types needs the inclusion of `<cstdint>`. ---- a/IO/Image/vtkSEPReader.h -+++ b/IO/Image/vtkSEPReader.h -@@ -25,8 +25,9 @@ - #include "vtkImageAlgorithm.h" - #include "vtkNew.h" // for ivars - --#include <array> // for std::array --#include <string> // for std::string -+#include <array> // for std::array -+#include <cstdint> // for std::uint8_t and std::uint32_t -+#include <string> // for std::string - - namespace details - { --- -GitLab - diff --git a/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch b/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch deleted file mode 100644 index 9b8583fa61e2..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://894646.bugs.gentoo.org/attachment.cgi?id=851914 -https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2972/diffs - -From be96ea7d85fefcad876729377c1b73a295d1c732 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" <laguest@archeia.com> -Date: Thu, 16 Feb 2023 16:57:32 +0000 -Subject: [PATCH] Fix compilation error with CUDA 12. - ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ExecutionPolicy.h -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ExecutionPolicy.h -@@ -17,6 +17,7 @@ - #include <vtkm/exec/cuda/internal/ThrustPatches.h> - VTKM_THIRDPARTY_PRE_INCLUDE - #include <thrust/execution_policy.h> -+#include <thrust/sort.h> - #include <thrust/system/cuda/execution_policy.h> - #include <thrust/system/cuda/memory.h> - VTKM_THIRDPARTY_POST_INCLUDE --- -2.39.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch deleted file mode 100644 index 356efbb4da9a..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/905387 -https://github.com/Kitware/VTK/commit/4d8283bcb460ff60d8df1b7b67b5db19876a5ca3 - -From 890f7574f01cf58cb1522772a62ca07deb438479 Mon Sep 17 00:00:00 2001 -From: Mathieu Westphal <mathieu.westphal@kitware.com> -Date: Thu, 23 Feb 2023 18:06:07 +0100 -Subject: [PATCH 1580/2105] More #include <cstdint> to compile with gcc13 - ---- a/IO/PIO/PIOData.h -+++ b/IO/PIO/PIOData.h -@@ -1,6 +1,7 @@ - #if !defined(_PIODATA_H) - #define _PIODATA_H - -+#include <cstdint> - #include <fstream> - #include <iostream> - #include <list> ---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -49,7 +49,8 @@ - #include "vtkMathTextUtilities.h" - #include "vtkRenderingMatplotlibModule.h" // For export macro - --#include <vector> // for std::vector -+#include <cstdint> // for std::uint64_t -+#include <vector> // for std::vector - - struct _object; - typedef struct _object PyObject; --- -2.40.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch deleted file mode 100644 index b7b2e233cdb4..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Wrapping/Java/CMakeLists.txt -+++ b/Wrapping/Java/CMakeLists.txt -@@ -201,10 +201,10 @@ set(VTK_JAVA_TARGET_VERSION "<DEFAULT>" CACHE STRING "javac target version") - mark_as_advanced(VTK_JAVA_TARGET_VERSION) - - if (VTK_JAVA_SOURCE_VERSION STREQUAL "<DEFAULT>") -- set(VTK_JAVA_SOURCE_VERSION "1.7") -+ set(VTK_JAVA_SOURCE_VERSION "1.8") - endif () - if (VTK_JAVA_TARGET_VERSION STREQUAL "<DEFAULT>") -- set(VTK_JAVA_TARGET_VERSION "1.7") -+ set(VTK_JAVA_TARGET_VERSION "1.8") - endif () - - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_JARDIR}") diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch index df2d6fc61167..b69d399f3c2a 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch @@ -44,3 +44,4 @@ Subject: [PATCH] include cstdint + correct case/words #include <type_traits> #include <cstddef> #include <memory> + diff --git a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch index 52c37250c7e7..4be0e88b769c 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch @@ -1,3 +1,8 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> +Subject: [PATCH] vtkm: too many initializer values + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + --- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx +++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx @@ -334,7 +334,7 @@ diff --git a/sci-libs/vtk/files/vtk-9.3.0-update-for-cuda-12.6.patch b/sci-libs/vtk/files/vtk-9.3.0-update-for-cuda-12.6.patch new file mode 100644 index 000000000000..6a913a551315 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-update-for-cuda-12.6.patch @@ -0,0 +1,22 @@ +From f568d669465f5825006be2fba8a117060e832618 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Sun, 8 Sep 2024 22:27:09 +0200 +Subject: [PATCH] update for cuda 12.6 + +https://github.com/NVIDIA/cccl/commit/733eb94a2b98b8d5b5ab1e39cbd8ac1aed9173ec + +Bug: https://bugs.gentoo.org/938673 +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/WrappedOperators.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/WrappedOperators.h +@@ -195,7 +195,7 @@ namespace detail + // + template <typename T, typename F> + struct is_commutative<vtkm::exec::cuda::internal::WrappedBinaryOperator<T, F>> +- : public thrust::detail::is_arithmetic<T> ++ : public ::cuda::std::is_arithmetic<T> + { + }; + } + diff --git a/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch b/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch new file mode 100644 index 000000000000..ddca73f492a6 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch @@ -0,0 +1,20 @@ +From e9977b71f31525aea5084b3fef9c2bd4c9ad93f1 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Sat, 7 Sep 2024 13:29:24 +0200 +Subject: [PATCH] vtkm: drop template-id from cdtor + +warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor] + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/openmp/internal/RuntimeDeviceConfigurationOpenMP.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/openmp/internal/RuntimeDeviceConfigurationOpenMP.h +@@ -31,7 +31,7 @@ class RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagOpenMP> + : public vtkm::cont::internal::RuntimeDeviceConfigurationBase + { + public: +- RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagOpenMP>() ++ RuntimeDeviceConfiguration() + : HardwareMaxThreads(InitializeHardwareMaxThreads()) + , CurrentNumThreads(this->HardwareMaxThreads) + { diff --git a/sci-libs/vtk/files/vtk-9.3.1-fix-fmt-11.patch b/sci-libs/vtk/files/vtk-9.3.1-fix-fmt-11.patch new file mode 100644 index 000000000000..64643c82723f --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.1-fix-fmt-11.patch @@ -0,0 +1,70 @@ +From a811c0c4aca246a89f85a1eecc805e388a645178 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Tue, 17 Sep 2024 18:45:03 +0200 +Subject: [PATCH] fix fmt-11 + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C b/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C +index 388d524..a94afc6 100644 +--- a/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C ++++ b/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C +@@ -15,6 +15,7 @@ + #include <cassert> + #include "vtk_fmt.h" + #include VTK_FMT(fmt/ostream.h) ++#include VTK_FMT(fmt/ranges.h) + #include <numeric> + + #if !defined(NO_ZOLTAN_SUPPORT) +diff --git a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C +index 440f352..ca71a90 100644 +--- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C ++++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C +@@ -12,6 +12,7 @@ + #include <cstddef> // for nullptr + #include "vtk_fmt.h" + #include VTK_FMT(fmt/ostream.h) ++#include VTK_FMT(fmt/ranges.h) + #include <map> // for _Rb_tree_iterator, etc + #include <ostream> // for basic_ostream, etc + #include <set> +diff --git a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C +index 1609c31..85b67e2 100644 +--- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C ++++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C +@@ -15,6 +15,7 @@ + #include <Ioss_StructuredBlock.h> + #include "vtk_fmt.h" + #include VTK_FMT(fmt/ostream.h) ++#include VTK_FMT(fmt/ranges.h) + + #include <cstddef> // for size_t + #include <numeric> +diff --git a/ThirdParty/ioss/vtkioss/Ioss_Utils.C b/ThirdParty/ioss/vtkioss/Ioss_Utils.C +index 57021ab..cc5b8a4 100644 +--- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C ++++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C +@@ -21,6 +21,7 @@ + #include VTK_FMT(fmt/chrono.h) + #include VTK_FMT(fmt/format.h) + #include VTK_FMT(fmt/ostream.h) ++#include VTK_FMT(fmt/ranges.h) + #include <fstream> + #include <sstream> + #include <string> +diff --git a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C +index 5d32481..5cb3c02 100644 +--- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C ++++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C +@@ -9,6 +9,7 @@ + #include <cstddef> // for size_t + #include "vtk_fmt.h" + #include VTK_FMT(fmt/ostream.h) ++#include VTK_FMT(fmt/ranges.h) + #include <string> // for string + #include <vector> // for vector + +-- +2.46.0 + diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml index 6fb9cf742a2d..ce67b30442e4 100644 --- a/sci-libs/vtk/metadata.xml +++ b/sci-libs/vtk/metadata.xml @@ -16,6 +16,7 @@ <use> <flag name="all-modules">Build all modules</flag> <flag name="boost">Add support for boost</flag> + <flag name="cgns">Build support to handle CGNS data files</flag> <flag name="freetype">Build support for font rendering</flag> <flag name="gdal">Support for gdal formated data</flag> <flag name="imaging">Building Imaging modules</flag> diff --git a/sci-libs/vtk/vtk-9.2.5-r2.ebuild b/sci-libs/vtk/vtk-9.2.5-r2.ebuild deleted file mode 100644 index 4af7d8df0261..000000000000 --- a/sci-libs/vtk/vtk-9.2.5-r2.ebuild +++ /dev/null @@ -1,746 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: -# - add USE flag for remote modules? Those modules can be downloaded -# properly before building. -# - replace usex by usev where applicable - -PYTHON_COMPAT=( python3_{9..11} ) -WEBAPP_OPTIONAL=yes -WEBAPP_MANUAL_SLOT=yes - -inherit check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp - -# Short package version -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="The Visualization Toolkit" -HOMEPAGE="https://www.vtk.org/" -SRC_URI=" - https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz - doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz ) - examples? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz - ) - test? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz - ) -" -S="${WORKDIR}/VTK-${PV}" - -LICENSE="BSD LGPL-2" -SLOT="0/${MY_PV}" -KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" -# TODO: Like to simplifiy these. Mostly the flags related to Groups. -IUSE="all-modules boost cuda debug doc examples ffmpeg freetype gdal imaging - java las +logging mpi mysql odbc openmp openvdb pdal postgres python qt5 - qt6 +rendering sdl tbb test +threads tk video_cards_nvidia views vtkm web" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - all-modules? ( - boost ffmpeg freetype gdal imaging las mysql odbc openvdb pdal - postgres rendering views - ) - cuda? ( video_cards_nvidia vtkm ) - java? ( rendering ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( rendering ) - qt6? ( rendering ) - sdl? ( rendering ) - tk? ( python rendering ) - web? ( python ) -" - -# for <pegtl-3 dependency see -# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929 -# eigen, nlohmann_json, pegtl and utfcpp are referenced in the cmake files -# and need to be available when VTK consumers configure the dependencies. -RDEPEND=" - app-arch/lz4:= - app-arch/xz-utils - dev-cpp/eigen - dev-cpp/nlohmann_json - dev-db/sqlite:3 - dev-libs/double-conversion:= - dev-libs/expat - dev-libs/icu:= - dev-libs/jsoncpp:= - >=dev-libs/libfmt-8.1.1:= - dev-libs/libxml2:2 - dev-libs/libzip:= - <dev-libs/pegtl-3 - dev-libs/pugixml - dev-libs/utfcpp - media-libs/freetype - media-libs/libjpeg-turbo - >=media-libs/libharu-2.4.2:= - media-libs/libogg - media-libs/libpng:= - media-libs/libtheora - media-libs/tiff:= - >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] - sci-libs/hdf5:=[mpi=] - sci-libs/proj:= - sci-libs/netcdf:=[mpi=] - sys-libs/zlib - boost? ( dev-libs/boost:=[mpi?] ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( media-video/ffmpeg:= ) - freetype? ( media-libs/fontconfig ) - gdal? ( sci-libs/gdal:= ) - java? ( >=virtual/jdk-1.8:* ) - las? ( sci-geosciences/liblas ) - mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( dev-db/mariadb-connector-c ) - odbc? ( dev-db/unixODBC ) - openvdb? ( media-gfx/openvdb:= ) - pdal? ( <sci-libs/pdal-2.6.0:= ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,opengl,sql,widgets] - dev-qt/qtdeclarative:6[opengl] - dev-qt/qtshadertools:6 - x11-libs/libxkbcommon - ) - sdl? ( media-libs/libsdl2 ) - rendering? ( - media-libs/glew:= - virtual/opengl - x11-libs/gl2ps - x11-libs/libICE - x11-libs/libXcursor - x11-libs/libXext - ) - tbb? ( dev-cpp/tbb:= ) - tk? ( dev-lang/tk:= ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) - views? ( - x11-libs/libICE - x11-libs/libXext - ) - web? ( ${WEBAPP_DEPEND} ) -" - -# for <pegtl-3 dependency see -# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929 -DEPEND=" - ${RDEPEND} - dev-cpp/eigen - dev-cpp/nlohmann_json - <dev-libs/pegtl-3 - dev-libs/utfcpp - test? ( - media-libs/glew - x11-libs/libXcursor - rendering? ( media-libs/freeglut ) - ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch - "${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch - "${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch - "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch - "${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch - "${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch -) - -DOCS=( CONTRIBUTING.md README.md ) - -vtk_check_reqs() { - local dsk=4096 - local mem=$(( $(usex cuda 7168 0) )) - - dsk=$(( $(usex doc 3072 0) + ${dsk} )) - dsk=$(( $(usex examples 3072 0) + ${dsk} )) - dsk=$(( $(usex cuda 8192 0) + ${dsk} )) - - # In case users are not aware of the extra NINJAOPTS, check - # for the more common MAKEOPTS, in case NINJAOPTS is empty - local jobs=1 - if [[ -n "${NINJAOPTS}" ]]; then - jobs=$(makeopts_jobs "${NINJAOPTS}" "$(get_nproc)") - else - if [[ -n "${MAKEOPTS}" ]]; then - jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - fi - fi - mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) )) - - use cuda && export CHECKREQS_MEMORY=${mem}M - export CHECKREQS_DISK_BUILD=${dsk}M - - check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp - - if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then - # FIXME: better use eerror? - ewarn "GCC 11 is know to fail building with CUDA support in some cases." - ewarn "See bug #820593" - fi - - if use qt6 && use qt5; then - ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - fi - - # bug #835659 - if use cuda; then - if [[ ${VTK_CUDA_ARCH} = native ]]; then - eerror "Using native CUDA arches is currently broken." - eerror "Please set it to one of the common arch names:" - eerror "kepler, maxwell, pascal, turing or ampere." - die "Please set VTK_CUDA_ARCH environment variable!" - fi - fi - - vtk_check_reqs -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp - - if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then - # FIXME: better use eerror? - ewarn "GCC 11 is know to fail building with CUDA support in some cases." - ewarn "See bug #820593" - fi - - if use qt6 && use qt5; then - ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - fi - - # bug #835659 - if use cuda; then - if [[ ${VTK_CUDA_ARCH} = native ]]; then - eerror "Using native CUDA arches is currently broken." - eerror "Please set it to one of the common arch names:" - eerror "kepler, maxwell, pascal, turing or ampere." - die "Please set VTK_CUDA_ARCH environment variable!" - fi - fi - - vtk_check_reqs - - use java && java-pkg-opt-2_pkg_setup - use python && python-single-r1_pkg_setup - use web && webapp_pkg_setup -} - -# Note: The following libraries are marked as internal by kitware -# and can currently not unbundled: -# diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic, -# vtkm, xdmf{2,3}, zfp -# TODO: cli11 (::guru), exprtk, ioss -# Note: As of v9.2.2 we no longer drop bundled libraries, when using system -# libraries. This just saves a little space. CMake logic of VTK on ThirdParty -# libraries avoids automagic builds, so deletion is not needed to catch these. -src_prepare() { - if use doc; then - einfo "Removing .md5 files from documents." - rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes" - sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \ - -i Utilities/Doxygen/CMakeLists.txt || die - fi - - cmake_src_prepare - - if use cuda; then - cuda_add_sandbox -w - cuda_src_prepare - fi - - if use test; then - ebegin "Copying data files to ${BUILD_DIR}" - mkdir -p "${BUILD_DIR}/ExternalData" || die - pushd "${BUILD_DIR}/ExternalData" >/dev/null || die - ln -sf ../../VTK-${PV}/.ExternalData/README.rst . || die - ln -sf ../../VTK-${PV}/.ExternalData/SHA512 . || die - popd >/dev/null || die - eend "$?" - fi -} - -# TODO: check these and consider to use them -# VTK_BUILD_SCALED_SOA_ARRAYS -# VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_LICENSEDIR="share/${PN}/licenses" - - -DVTK_ANDROID_BUILD=OFF - -DVTK_IOS_BUILD=OFF - - -DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF) - # we use the pre-built documentation and install these with USE=doc - -DVTK_BUILD_DOCUMENTATION=OFF - -DVTK_BUILD_EXAMPLES=$(usex examples ON OFF) - - # no package in the tree: https://github.com/LLNL/conduit - -DVTK_ENABLE_CATALYST=OFF - -DVTK_ENABLE_KITS=OFF - -DVTK_ENABLE_LOGGING=$(usex logging ON OFF) - # defaults to ON: USE flag for this? - -DVTK_ENABLE_REMOTE_MODULES=OFF - - # disable fetching files during build - -DVTK_FORBID_DOWNLOADS=ON - - -DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_StandAlone="YES" - -DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT") - - -DVTK_INSTALL_SDK=ON - - -DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT" - -DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT" - -DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite - -DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IOXML="WANT" - -DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_cgns="WANT" - -DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT" - -DVTK_MODULE_ENABLE_VTK_eigen="WANT" - -DVTK_MODULE_ENABLE_VTK_expat="WANT" - -DVTK_MODULE_ENABLE_VTK_fmt="WANT" - -DVTK_MODULE_ENABLE_VTK_freetype="WANT" - -DVTK_MODULE_ENABLE_VTK_hdf5="WANT" - -DVTK_MODULE_ENABLE_VTK_jpeg="WANT" - -DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT" - -DVTK_MODULE_ENABLE_VTK_libharu="WANT" - -DVTK_MODULE_ENABLE_VTK_libproj="WANT" - -DVTK_MODULE_ENABLE_VTK_libxml2="WANT" - -DVTK_MODULE_ENABLE_VTK_lz4="WANT" - -DVTK_MODULE_ENABLE_VTK_lzma="WANT" - -DVTK_MODULE_ENABLE_VTK_netcdf="WANT" - -DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT" - -DVTK_MODULE_ENABLE_VTK_ogg="WANT" - -DVTK_MODULE_ENABLE_VTK_pegtl="WANT" - -DVTK_MODULE_ENABLE_VTK_png="WANT" - -DVTK_MODULE_ENABLE_VTK_pugixml="WANT" - -DVTK_MODULE_ENABLE_VTK_sqlite="WANT" - -DVTK_MODULE_ENABLE_VTK_theora="WANT" - -DVTK_MODULE_ENABLE_VTK_tiff="WANT" - -DVTK_MODULE_ENABLE_VTK_utf8="WANT" - -DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_zlib="WANT" - - # not packaged in Gentoo - -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF - -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF - - -DVTK_RELOCATABLE_INSTALL=ON - - -DVTK_SMP_ENABLE_OPENMP=$(usex openmp ON OFF) - -DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF) - -DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF) - - -DVTK_UNIFIED_INSTALL_TREE=ON - - -DVTK_USE_CUDA=$(usex cuda ON OFF) - # use system libraries where possible - -DVTK_USE_EXTERNAL=ON - # avoid finding package from either ::guru or ::sci - -DVTK_USE_MEMKIND=OFF - -DVTK_USE_MPI=$(usex mpi ON OFF) - -DVTK_USE_TK=$(usex tk ON OFF) - -DVTK_USE_X=ON - - -DVTK_WHEEL_BUILD=OFF - - -DVTK_WRAP_JAVA=$(usex java ON OFF) - -DVTK_WRAP_PYTHON=$(usex python ON OFF) - ) - - if use all-modules; then - mycmakeargs+=( - # no package in ::gentoo - -DVTK_ENABLE_OSPRAY=OFF - # TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES - # option. Check whether we can download them clean and enable - # them. - -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO" - -DVTK_MODULE_ENABLE_VTK_fides="NO" - -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO" - -DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO" - -DVTK_MODULE_ENABLE_VTK_IOFides="NO" - - -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO" - -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO" - - # available in ::guru, so avoid detection if installed - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF - ) - fi - - if use boost; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT" - -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT" - ) - fi - - # TODO: checks this on updates of nvidia-cuda-toolkit and update - # the list of available arches if necessary, i.e. add new arches - # once they are released at the end of the list before all. - # See https://en.wikipedia.org/wiki/CUDA#GPUs_supported - # CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake, - # as of 3.25.1 doesn't recognize these keywords. - # FIXME: better use numbers than names? - if use cuda; then - local cuda_arch= - case ${VTK_CUDA_ARCH:-native} in - # we ignore fermi arch, because current nvidia-cuda-toolkit-11* - # no longer supports it - kepler|maxwell|pascal|volta|turing|ampere|all) - cuda_arch=${VTK_CUDA_ARCH} - ;; -# native) -# ewarn "If auto detection fails for you, please try and export the" -# ewarn "VTK_CUDA_ARCH environment variable to one of the common arch" -# ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all." -# cuda_arch=native -# ;; - *) - eerror "Please properly set the VTK_CUDA_ARCH environment variable to" - eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all" - die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!" - ;; - esac - ewarn "Using CUDA architecture '${cuda_arch}'" - - mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} ) - fi - - if use debug; then - mycmakeargs+=( - -DVTK_DEBUG_LEAKS=ON - -DVTK_DEBUG_MODULE=ON - -DVTK_DEBUG_MODULE_ALL=ON - -DVTK_ENABLE_SANITIZER=ON - -DVTK_EXTRA_COMPILER_WARNINGS=ON - -DVTK_WARN_ON_DISPATCH_FAILURE=ON - ) - if use rendering; then - mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON ) - fi - fi - - if use examples || use test; then - mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON ) - fi - - if use ffmpeg; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="WANT" ) - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" ) - fi - fi - - if use gdal; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT" - -DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT" - -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT" - ) - fi - - if use imaging; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" ) - fi - - if ! use java && ! use python; then - # defaults to ON - mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF ) - fi - - if use java; then - mycmakeargs+=( - -DCMAKE_INSTALL_JARDIR="share/${PN}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Java="WANT" - ) - fi - - if use mpi; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_MPI="YES" - -DVTK_MODULE_ENABLE_VTK_IOH5part="WANT" - -DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT" - -DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT" - -DVTK_MODULE_ENABLE_VTK_h5part="WANT" - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF - ) - use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" ) - if use rendering; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT" - ) - fi - use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" ) - fi - - use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" ) - use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" ) - use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" ) - use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" ) - - if use python; then - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Python="WANT" - -DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT" - -DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT" - -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" ) - fi - - if use qt5 && use qt6; then - # prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" - -DVTK_QT_VERSION="5" - ) - else - if use qt5; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" - -DVTK_QT_VERSION="5" - ) - elif use qt6; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" - -DVTK_QT_VERSION="6" - ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) - fi - fi - - if use qt5 || use qt6; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_Qt:STRING="YES" - -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" - -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT" - ) - if use mysql || use postgres; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" ) - fi - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" ) - fi - if use views; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" ) - fi - fi - - if use rendering; then - mycmakeargs+=( - -DVTK_ENABLE_OSPRAY=OFF - - -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_gl2ps="WANT" - -DVTK_MODULE_ENABLE_VTK_glew="WANT" - -DVTK_MODULE_ENABLE_VTK_opengl="WANT" - - -DVTK_USE_SDL2=$(usex sdl "YES" "NO") - ) - use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" ) - use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" ) - use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" ) - fi - - # Testing has been changed in 9.2.5: it is now allowed without - # requiring to download, if the data files are available locally! - if use test; then - mycmakeargs+=( - -DVTK_BUILD_TESTING=ON - # disable fetching data files for the default 'all' target - -DVTK_DATA_EXCLUDE_FROM_ALL=ON - - # requested even if all use flags are off - -DVTK_MODULE_ENABLE_VTK_octree="WANT" - -DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT" - - # available in ::guru, so avoid detection if installed - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF - ) - else - mycmakeargs+=( -DVTK_BUILD_TESTING=OFF ) - fi - - # FIXME: upstream provides 4 threading models, as of 9.1.0. These are - # sequential, stdthread, openmp and tbb. AFAICS all of them can be - # enabled at the same time. Sequential and Stdthread are enabled by - # default. The default selected type for the build is sequential. - # Assuming sequential < stdpthread < openmp < tbb wrt speed, although - # this is dependent on the actual scenario where threading is used. - if use tbb; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) - elif use openmp; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" ) - elif use threads; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" ) - else - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) - fi - - use tk && mycmakeargs+=( -DVTK_GROUP_ENABLE_Tk="YES" ) - - if use views; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT" - -DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT" - ) - fi - - if use vtkm; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT" - - -DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221 - -DVTKm_Vectorization=native - ) - fi - - if use web; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_WebCore="WANT" - -DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT" - ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" ) - fi - - use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" - - cmake_src_configure -} - -src_compile() { - use test && cmake_build VTKData - cmake_src_compile -} - -# FIXME: avoid nonfatal? -# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043 -src_test() { -# nonfatal virtx cmake_src_test - virtx cmake_src_test -} - -src_install() { - use web && webapp_src_preinst - - # Stop web page images from being compressed - if use doc; then - HTML_DOCS=( "${WORKDIR}/html/." ) - fi - - cmake_src_install - - use java && java-pkg_regjar "${ED}"/usr/share/${PN}/${PN}.jar - - # install examples - if use examples; then - einfo "Installing examples" - mv -v {E,e}xamples || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - - einfo "Installing datafiles" - insinto /usr/share/${PN}/data - doins -r "${S}/.ExternalData" - fi - - use python && python_optimize - - use web && webapp_src_install -} - -# webapp.eclass exports these but we want it optional #534036 -pkg_postinst() { - use web && webapp_pkg_postinst - - if use examples; then - einfo "You can get more and updated examples at" - einfo "https://kitware.github.io/vtk-examples/site/" - fi -} - -pkg_prerm() { - use web && webapp_pkg_prerm -} diff --git a/sci-libs/vtk/vtk-9.2.6-r3.ebuild b/sci-libs/vtk/vtk-9.2.6-r3.ebuild deleted file mode 100644 index 9520c47ec4fd..000000000000 --- a/sci-libs/vtk/vtk-9.2.6-r3.ebuild +++ /dev/null @@ -1,747 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: -# - add USE flag for remote modules? Those modules can be downloaded -# properly before building. -# - replace usex by usev where applicable - -PYTHON_COMPAT=( python3_{9..11} ) -WEBAPP_OPTIONAL=yes -WEBAPP_MANUAL_SLOT=yes - -inherit check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp - -# Short package version -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="The Visualization Toolkit" -HOMEPAGE="https://www.vtk.org/" -SRC_URI=" - https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz - doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz ) - examples? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz - ) - test? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz - ) -" -S="${WORKDIR}/VTK-${PV}" - -LICENSE="BSD LGPL-2" -SLOT="0/${MY_PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" -# TODO: Like to simplifiy these. Mostly the flags related to Groups. -IUSE="all-modules boost cuda debug doc examples ffmpeg freetype gdal imaging - java las +logging mpi mysql odbc openmp openvdb pdal postgres python qt5 - qt6 +rendering sdl tbb test +threads tk video_cards_nvidia views vtkm web" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - all-modules? ( - boost ffmpeg freetype gdal imaging las mysql odbc openvdb pdal - postgres rendering views - ) - cuda? ( video_cards_nvidia vtkm ) - java? ( rendering ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( rendering ) - qt6? ( rendering ) - sdl? ( rendering ) - tk? ( python rendering ) - web? ( python ) -" - -# for <pegtl-3 dependency see -# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929 -# eigen, nlohmann_json, pegtl and utfcpp are referenced in the cmake files -# and need to be available when VTK consumers configure the dependencies. -RDEPEND=" - app-arch/lz4:= - app-arch/xz-utils - dev-cpp/eigen - dev-cpp/nlohmann_json - dev-db/sqlite:3 - dev-libs/double-conversion:= - dev-libs/expat - dev-libs/icu:= - dev-libs/jsoncpp:= - >=dev-libs/libfmt-8.1.1:= - dev-libs/libxml2:2 - dev-libs/libzip:= - <dev-libs/pegtl-3 - dev-libs/pugixml - dev-libs/utfcpp - media-libs/freetype - media-libs/libjpeg-turbo - >=media-libs/libharu-2.4.2:= - media-libs/libogg - media-libs/libpng:= - media-libs/libtheora - media-libs/tiff:= - >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] - sci-libs/hdf5:=[mpi=] - sci-libs/proj:= - sci-libs/netcdf:=[mpi=] - sys-libs/zlib - boost? ( dev-libs/boost:=[mpi?] ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( media-video/ffmpeg:= ) - freetype? ( media-libs/fontconfig ) - gdal? ( sci-libs/gdal:= ) - java? ( >=virtual/jdk-1.8:* ) - las? ( sci-geosciences/liblas ) - mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( dev-db/mariadb-connector-c ) - odbc? ( dev-db/unixODBC ) - openvdb? ( media-gfx/openvdb:= ) - pdal? ( <sci-libs/pdal-2.6.0:= ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,opengl,sql,widgets] - dev-qt/qtdeclarative:6[opengl] - dev-qt/qtshadertools:6 - x11-libs/libxkbcommon - ) - sdl? ( media-libs/libsdl2 ) - rendering? ( - media-libs/glew:= - virtual/opengl - x11-libs/gl2ps - x11-libs/libICE - x11-libs/libXcursor - x11-libs/libXext - ) - tbb? ( dev-cpp/tbb:= ) - tk? ( dev-lang/tk:= ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) - views? ( - x11-libs/libICE - x11-libs/libXext - ) - web? ( ${WEBAPP_DEPEND} ) -" - -# for <pegtl-3 dependency see -# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929 -DEPEND=" - ${RDEPEND} - dev-cpp/eigen - dev-cpp/nlohmann_json - <dev-libs/pegtl-3 - dev-libs/utfcpp - test? ( - media-libs/glew - x11-libs/libXcursor - rendering? ( media-libs/freeglut ) - ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch - "${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch - "${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch - "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch - "${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch - "${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch - "${FILESDIR}"/vtk-9.2.6-Java21.patch -) - -DOCS=( CONTRIBUTING.md README.md ) - -vtk_check_reqs() { - local dsk=4096 - local mem=$(( $(usex cuda 7168 0) )) - - dsk=$(( $(usex doc 3072 0) + ${dsk} )) - dsk=$(( $(usex examples 3072 0) + ${dsk} )) - dsk=$(( $(usex cuda 8192 0) + ${dsk} )) - - # In case users are not aware of the extra NINJAOPTS, check - # for the more common MAKEOPTS, in case NINJAOPTS is empty - local jobs=1 - if [[ -n "${NINJAOPTS}" ]]; then - jobs=$(makeopts_jobs "${NINJAOPTS}" "$(get_nproc)") - else - if [[ -n "${MAKEOPTS}" ]]; then - jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - fi - fi - mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) )) - - use cuda && export CHECKREQS_MEMORY=${mem}M - export CHECKREQS_DISK_BUILD=${dsk}M - - check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp - - if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then - # FIXME: better use eerror? - ewarn "GCC 11 is know to fail building with CUDA support in some cases." - ewarn "See bug #820593" - fi - - if use qt6 && use qt5; then - ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - fi - - # bug #835659 - if use cuda; then - if [[ ${VTK_CUDA_ARCH} = native ]]; then - eerror "Using native CUDA arches is currently broken." - eerror "Please set it to one of the common arch names:" - eerror "kepler, maxwell, pascal, turing or ampere." - die "Please set VTK_CUDA_ARCH environment variable!" - fi - fi - - vtk_check_reqs -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp - - if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then - # FIXME: better use eerror? - ewarn "GCC 11 is know to fail building with CUDA support in some cases." - ewarn "See bug #820593" - fi - - if use qt6 && use qt5; then - ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - fi - - # bug #835659 - if use cuda; then - if [[ ${VTK_CUDA_ARCH} = native ]]; then - eerror "Using native CUDA arches is currently broken." - eerror "Please set it to one of the common arch names:" - eerror "kepler, maxwell, pascal, turing or ampere." - die "Please set VTK_CUDA_ARCH environment variable!" - fi - fi - - vtk_check_reqs - - use java && java-pkg-opt-2_pkg_setup - use python && python-single-r1_pkg_setup - use web && webapp_pkg_setup -} - -# Note: The following libraries are marked as internal by kitware -# and can currently not unbundled: -# diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic, -# vtkm, xdmf{2,3}, zfp -# TODO: cli11 (::guru), exprtk, ioss -# Note: As of v9.2.2 we no longer drop bundled libraries, when using system -# libraries. This just saves a little space. CMake logic of VTK on ThirdParty -# libraries avoids automagic builds, so deletion is not needed to catch these. -src_prepare() { - if use doc; then - einfo "Removing .md5 files from documents." - rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes" - sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \ - -i Utilities/Doxygen/CMakeLists.txt || die - fi - - cmake_src_prepare - - if use cuda; then - cuda_add_sandbox -w - cuda_src_prepare - fi - - if use test; then - ebegin "Copying data files to ${BUILD_DIR}" - mkdir -p "${BUILD_DIR}/ExternalData" || die - pushd "${BUILD_DIR}/ExternalData" >/dev/null || die - ln -sf ../../VTK-${PV}/.ExternalData/README.rst . || die - ln -sf ../../VTK-${PV}/.ExternalData/SHA512 . || die - popd >/dev/null || die - eend "$?" - fi -} - -# TODO: check these and consider to use them -# VTK_BUILD_SCALED_SOA_ARRAYS -# VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_LICENSEDIR="share/${PN}/licenses" - - -DVTK_ANDROID_BUILD=OFF - -DVTK_IOS_BUILD=OFF - - -DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF) - # we use the pre-built documentation and install these with USE=doc - -DVTK_BUILD_DOCUMENTATION=OFF - -DVTK_BUILD_EXAMPLES=$(usex examples ON OFF) - - # no package in the tree: https://github.com/LLNL/conduit - -DVTK_ENABLE_CATALYST=OFF - -DVTK_ENABLE_KITS=OFF - -DVTK_ENABLE_LOGGING=$(usex logging ON OFF) - # defaults to ON: USE flag for this? - -DVTK_ENABLE_REMOTE_MODULES=OFF - - # disable fetching files during build - -DVTK_FORBID_DOWNLOADS=ON - - -DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_StandAlone="YES" - -DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT") - - -DVTK_INSTALL_SDK=ON - - -DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT" - -DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT" - -DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite - -DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IOXML="WANT" - -DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_cgns="WANT" - -DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT" - -DVTK_MODULE_ENABLE_VTK_eigen="WANT" - -DVTK_MODULE_ENABLE_VTK_expat="WANT" - -DVTK_MODULE_ENABLE_VTK_fmt="WANT" - -DVTK_MODULE_ENABLE_VTK_freetype="WANT" - -DVTK_MODULE_ENABLE_VTK_hdf5="WANT" - -DVTK_MODULE_ENABLE_VTK_jpeg="WANT" - -DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT" - -DVTK_MODULE_ENABLE_VTK_libharu="WANT" - -DVTK_MODULE_ENABLE_VTK_libproj="WANT" - -DVTK_MODULE_ENABLE_VTK_libxml2="WANT" - -DVTK_MODULE_ENABLE_VTK_lz4="WANT" - -DVTK_MODULE_ENABLE_VTK_lzma="WANT" - -DVTK_MODULE_ENABLE_VTK_netcdf="WANT" - -DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT" - -DVTK_MODULE_ENABLE_VTK_ogg="WANT" - -DVTK_MODULE_ENABLE_VTK_pegtl="WANT" - -DVTK_MODULE_ENABLE_VTK_png="WANT" - -DVTK_MODULE_ENABLE_VTK_pugixml="WANT" - -DVTK_MODULE_ENABLE_VTK_sqlite="WANT" - -DVTK_MODULE_ENABLE_VTK_theora="WANT" - -DVTK_MODULE_ENABLE_VTK_tiff="WANT" - -DVTK_MODULE_ENABLE_VTK_utf8="WANT" - -DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_zlib="WANT" - - # not packaged in Gentoo - -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF - -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF - - -DVTK_RELOCATABLE_INSTALL=ON - - -DVTK_SMP_ENABLE_OPENMP=$(usex openmp ON OFF) - -DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF) - -DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF) - - -DVTK_UNIFIED_INSTALL_TREE=ON - - -DVTK_USE_CUDA=$(usex cuda ON OFF) - # use system libraries where possible - -DVTK_USE_EXTERNAL=ON - # avoid finding package from either ::guru or ::sci - -DVTK_USE_MEMKIND=OFF - -DVTK_USE_MPI=$(usex mpi ON OFF) - -DVTK_USE_TK=$(usex tk ON OFF) - -DVTK_USE_X=ON - - -DVTK_WHEEL_BUILD=OFF - - -DVTK_WRAP_JAVA=$(usex java ON OFF) - -DVTK_WRAP_PYTHON=$(usex python ON OFF) - ) - - if use all-modules; then - mycmakeargs+=( - # no package in ::gentoo - -DVTK_ENABLE_OSPRAY=OFF - # TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES - # option. Check whether we can download them clean and enable - # them. - -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO" - -DVTK_MODULE_ENABLE_VTK_fides="NO" - -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO" - -DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO" - -DVTK_MODULE_ENABLE_VTK_IOFides="NO" - - -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO" - -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO" - - # available in ::guru, so avoid detection if installed - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF - ) - fi - - if use boost; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT" - -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT" - ) - fi - - # TODO: checks this on updates of nvidia-cuda-toolkit and update - # the list of available arches if necessary, i.e. add new arches - # once they are released at the end of the list before all. - # See https://en.wikipedia.org/wiki/CUDA#GPUs_supported - # CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake, - # as of 3.25.1 doesn't recognize these keywords. - # FIXME: better use numbers than names? - if use cuda; then - local cuda_arch= - case ${VTK_CUDA_ARCH:-native} in - # we ignore fermi arch, because current nvidia-cuda-toolkit-11* - # no longer supports it - kepler|maxwell|pascal|volta|turing|ampere|all) - cuda_arch=${VTK_CUDA_ARCH} - ;; -# native) -# ewarn "If auto detection fails for you, please try and export the" -# ewarn "VTK_CUDA_ARCH environment variable to one of the common arch" -# ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all." -# cuda_arch=native -# ;; - *) - eerror "Please properly set the VTK_CUDA_ARCH environment variable to" - eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all" - die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!" - ;; - esac - ewarn "Using CUDA architecture '${cuda_arch}'" - - mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} ) - fi - - if use debug; then - mycmakeargs+=( - -DVTK_DEBUG_LEAKS=ON - -DVTK_DEBUG_MODULE=ON - -DVTK_DEBUG_MODULE_ALL=ON - -DVTK_ENABLE_SANITIZER=ON - -DVTK_EXTRA_COMPILER_WARNINGS=ON - -DVTK_WARN_ON_DISPATCH_FAILURE=ON - ) - if use rendering; then - mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON ) - fi - fi - - if use examples || use test; then - mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON ) - fi - - if use ffmpeg; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="WANT" ) - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" ) - fi - fi - - if use gdal; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT" - -DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT" - -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT" - ) - fi - - if use imaging; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" ) - fi - - if ! use java && ! use python; then - # defaults to ON - mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF ) - fi - - if use java; then - mycmakeargs+=( - -DCMAKE_INSTALL_JARDIR="share/${PN}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Java="WANT" - ) - fi - - if use mpi; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_MPI="YES" - -DVTK_MODULE_ENABLE_VTK_IOH5part="WANT" - -DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT" - -DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT" - -DVTK_MODULE_ENABLE_VTK_h5part="WANT" - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF - ) - use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" ) - if use rendering; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT" - ) - fi - use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" ) - fi - - use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" ) - use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" ) - use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" ) - use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" ) - - if use python; then - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Python="WANT" - -DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT" - -DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT" - -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" ) - fi - - if use qt5 && use qt6; then - # prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" - -DVTK_QT_VERSION="5" - ) - else - if use qt5; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" - -DVTK_QT_VERSION="5" - ) - elif use qt6; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" - -DVTK_QT_VERSION="6" - ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) - fi - fi - - if use qt5 || use qt6; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_Qt:STRING="YES" - -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" - -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT" - ) - if use mysql || use postgres; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" ) - fi - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" ) - fi - if use views; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" ) - fi - fi - - if use rendering; then - mycmakeargs+=( - -DVTK_ENABLE_OSPRAY=OFF - - -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_gl2ps="WANT" - -DVTK_MODULE_ENABLE_VTK_glew="WANT" - -DVTK_MODULE_ENABLE_VTK_opengl="WANT" - - -DVTK_USE_SDL2=$(usex sdl "YES" "NO") - ) - use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" ) - use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" ) - use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" ) - fi - - # Testing has been changed in 9.2.5: it is now allowed without - # requiring to download, if the data files are available locally! - if use test; then - mycmakeargs+=( - -DVTK_BUILD_TESTING=ON - # disable fetching data files for the default 'all' target - -DVTK_DATA_EXCLUDE_FROM_ALL=ON - - # requested even if all use flags are off - -DVTK_MODULE_ENABLE_VTK_octree="WANT" - -DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT" - - # available in ::guru, so avoid detection if installed - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF - ) - else - mycmakeargs+=( -DVTK_BUILD_TESTING=OFF ) - fi - - # FIXME: upstream provides 4 threading models, as of 9.1.0. These are - # sequential, stdthread, openmp and tbb. AFAICS all of them can be - # enabled at the same time. Sequential and Stdthread are enabled by - # default. The default selected type for the build is sequential. - # Assuming sequential < stdpthread < openmp < tbb wrt speed, although - # this is dependent on the actual scenario where threading is used. - if use tbb; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) - elif use openmp; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" ) - elif use threads; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" ) - else - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) - fi - - use tk && mycmakeargs+=( -DVTK_GROUP_ENABLE_Tk="YES" ) - - if use views; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT" - -DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT" - ) - fi - - if use vtkm; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT" - - -DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221 - -DVTKm_Vectorization=native - ) - fi - - if use web; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_WebCore="WANT" - -DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT" - ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" ) - fi - - use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" - - cmake_src_configure -} - -src_compile() { - use test && cmake_build VTKData - cmake_src_compile -} - -# FIXME: avoid nonfatal? -# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043 -src_test() { -# nonfatal virtx cmake_src_test - virtx cmake_src_test -} - -src_install() { - use web && webapp_src_preinst - - # Stop web page images from being compressed - if use doc; then - HTML_DOCS=( "${WORKDIR}/html/." ) - fi - - cmake_src_install - - use java && java-pkg_regjar "${ED}"/usr/share/${PN}/${PN}.jar - - # install examples - if use examples; then - einfo "Installing examples" - mv -v {E,e}xamples || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - - einfo "Installing datafiles" - insinto /usr/share/${PN}/data - doins -r "${S}/.ExternalData" - fi - - use python && python_optimize - - use web && webapp_src_install -} - -# webapp.eclass exports these but we want it optional #534036 -pkg_postinst() { - use web && webapp_pkg_postinst - - if use examples; then - einfo "You can get more and updated examples at" - einfo "https://kitware.github.io/vtk-examples/site/" - fi -} - -pkg_prerm() { - use web && webapp_pkg_prerm -} diff --git a/sci-libs/vtk/vtk-9.3.1.ebuild b/sci-libs/vtk/vtk-9.3.1.ebuild new file mode 100644 index 000000000000..62f33476fe4f --- /dev/null +++ b/sci-libs/vtk/vtk-9.3.1.ebuild @@ -0,0 +1,1020 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: +# - add USE flag for remote modules? Those modules can be downloaded +# properly before building. +# - replace usex by usev where applicable + +PYTHON_COMPAT=( python3_{10..12} ) +WEBAPP_OPTIONAL=yes +WEBAPP_MANUAL_SLOT=yes + +inherit check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp + +# Short package version +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="The Visualization Toolkit" +HOMEPAGE="https://www.vtk.org/" +SRC_URI=" + https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz + doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz ) + examples? ( + https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz + ) + test? ( + https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz + ) +" +S="${WORKDIR}/VTK-${PV}" + +LICENSE="BSD LGPL-2" +SLOT="0/${MY_PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +# TODO: Like to simplify these. Mostly the flags related to Groups. +IUSE="all-modules boost +cgns cuda debug doc examples ffmpeg gdal gles2-only imaging + java las +logging minimal mpi mysql +netcdf odbc opencascade openmp openvdb pdal postgres + python qt6 +rendering sdl tbb test +threads tk +truetype video_cards_nvidia +views vtkm web" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + all-modules? ( + boost cgns ffmpeg gdal imaging las mysql netcdf odbc opencascade openvdb pdal + postgres rendering truetype views + ) + cuda? ( video_cards_nvidia vtkm ) + java? ( rendering ) + minimal? ( !rendering ) + !minimal? ( cgns netcdf rendering ) + python? ( ${PYTHON_REQUIRED_USE} ) + qt6? ( rendering ) + sdl? ( rendering ) + tk? ( python rendering ) + web? ( python ) + rendering? ( truetype views ) +" + +# eigen, nlohmann_json, pegtl and utfcpp are referenced in the cmake files +# and need to be available when VTK consumers configure the dependencies. +RDEPEND=" + app-arch/lz4:= + app-arch/xz-utils + dev-db/sqlite:3 + dev-libs/double-conversion:= + dev-libs/expat + dev-libs/icu:= + dev-libs/jsoncpp:= + >=dev-libs/libfmt-8.1.1:= + dev-libs/libxml2:2 + dev-libs/libzip:= + dev-libs/pugixml + media-libs/freetype + media-libs/libjpeg-turbo + media-libs/libogg + media-libs/libpng:= + media-libs/tiff:= + sci-libs/hdf5:=[mpi=] + sci-libs/proj:= + sys-libs/zlib + boost? ( dev-libs/boost:=[mpi?] ) + cgns? ( >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + ffmpeg? ( media-video/ffmpeg:= ) + gdal? ( sci-libs/gdal:= ) + java? ( >=virtual/jdk-11:= ) + las? ( sci-geosciences/liblas ) + !minimal? ( + >=media-libs/libharu-2.4.0:= + media-libs/libtheora + ) + mpi? ( virtual/mpi[cxx,romio] ) + mysql? ( dev-db/mariadb-connector-c ) + netcdf? ( sci-libs/netcdf:=[mpi=] ) + odbc? ( dev-db/unixODBC ) + openvdb? ( media-gfx/openvdb:= ) + opencascade? ( sci-libs/opencascade:= ) + pdal? ( sci-libs/pdal:= ) + postgres? ( dev-db/postgresql:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )') + $(python_gen_cond_dep 'rendering? ( dev-python/matplotlib[${PYTHON_USEDEP}] )') + ) + qt6? ( + dev-qt/qtbase:6[gui,opengl,sql,widgets] + dev-qt/qtdeclarative:6[opengl] + dev-qt/qtshadertools:6 + x11-libs/libxkbcommon + ) + sdl? ( media-libs/libsdl2 ) + rendering? ( + media-libs/glew:= + media-libs/libglvnd[X] + x11-libs/gl2ps + x11-libs/libICE + x11-libs/libXcursor + x11-libs/libXext + ) + tbb? ( dev-cpp/tbb:= ) + tk? ( dev-lang/tk:= ) + truetype? ( media-libs/fontconfig ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) + views? ( + x11-libs/libICE + x11-libs/libXext + ) + web? ( ${WEBAPP_DEPEND} ) +" + +DEPEND=" + ${RDEPEND} + dev-cpp/cli11 + dev-cpp/eigen + dev-cpp/nlohmann_json + >=dev-libs/pegtl-3 + dev-libs/utfcpp + test? ( + media-libs/glew + x11-libs/libXcursor + rendering? ( media-libs/freeglut ) + ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-9.2.5-pegtl-3.x.patch" + "${FILESDIR}/${PN}-9.3.0-java.patch" + "${FILESDIR}/${PN}-9.3.0-opencascade.patch" + "${FILESDIR}/${PN}-9.3.0-ThrustPatches.patch" + "${FILESDIR}/${PN}-9.3.0-core-octree_node.txx.patch" + "${FILESDIR}/${PN}-9.3.0-ThirdParty-gcc15.patch" + "${FILESDIR}/${PN}-9.3.0-update-for-cuda-12.6.patch" + "${FILESDIR}/${PN}-9.3.1-fix-fmt-11.patch" +) + +DOCS=( CONTRIBUTING.md README.md ) + +vtk_check_reqs() { + local dsk=4096 + + dsk=$(( $(usex doc 3072 0) + dsk )) + dsk=$(( $(usex examples 3072 0) + dsk )) + dsk=$(( $(usex cuda 8192 0) + dsk )) + export CHECKREQS_DISK_BUILD=${dsk}M + + # In case users are not aware of the extra NINJAOPTS, check + # for the more common MAKEOPTS, in case NINJAOPTS is empty + local jobs=1 + if [[ -n "${NINJAOPTS}" ]]; then + jobs=$(makeopts_jobs "${NINJAOPTS}" "$(get_nproc)") + elif [[ -n "${MAKEOPTS}" ]]; then + jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + fi + + if use cuda; then + local mem=$(( $(usex cuda 7168 0) )) + mem=$(( mem * $(( jobs > 4 ? 4 : jobs )) )) + export CHECKREQS_MEMORY=${mem}M + fi + + "check-reqs_pkg_${EBUILD_PHASE}" +} + +cuda_get_host_compiler() { + if [[ -n "${NVCC_CCBIN}" ]]; then + echo "${NVCC_CCBIN}" + return + fi + + if [[ -n "${CUDAHOSTCXX}" ]]; then + echo "${CUDAHOSTCXX}" + return + fi + + einfo "Trying to find working CUDA host compiler" + + if ! tc-is-gcc && ! tc-is-clang; then + die "$(tc-get-compiler-type) compiler is not supported" + fi + + local compiler compiler_type compiler_version + local package package_version + local NVCC_CCBIN_default + + compiler_type="$(tc-get-compiler-type)" + compiler_version="$("${compiler_type}-major-version")" + + # try the default compiler first + NVCC_CCBIN="$(tc-getCXX)" + NVCC_CCBIN_default="${NVCC_CCBIN}-${compiler_version}" + + compiler="${NVCC_CCBIN/%-${compiler_version}}" + + # store the package so we can re-use it later + package="sys-devel/${compiler_type}" + package_version="${package}" + + ebegin "testing ${NVCC_CCBIN_default} (default)" + + while ! nvcc -v -ccbin "${NVCC_CCBIN}" - -x cu <<<"int main(){}" &>> "${T}/cuda_get_host_compiler.log" ; do + eend 1 + + while true; do + # prepare next version + if ! package_version="<$(best_version "${package_version}")"; then + die "could not find a supported version of ${compiler}" + fi + + NVCC_CCBIN="${compiler}-$(ver_cut 1 "${package_version/#<${package}-/}")" + + [[ "${NVCC_CCBIN}" != "${NVCC_CCBIN_default}" ]] && break + done + ebegin "testing ${NVCC_CCBIN}" + done + eend $? + + # clean temp file + rm -f a.out + + echo "${NVCC_CCBIN}" + export NVCC_CCBIN +} + +cuda_get_host_native_arch() { + [[ -n ${CUDAARCHS} ]] && echo "${CUDAARCHS}" + + __nvcc_device_query || die "failed to query the native device" +} + +vtk_add_sandbox() { + local WRITE=() + + # mesa via virtx will make use of udmabuf if it exists + [[ -c "/dev/udmabuf" ]] && WRITE+=( "/dev/udmabuf" ) + + readarray -t dris <<<"$( + for dri in /sys/class/drm/*/dev; do + realpath "/dev/char/$(cat "${dri}")" + eqawarn "dri ${dri} $(cat "${dri}") $(realpath "/dev/char/$(cat "${dri}")")" + done + )" + + [[ -n "${dris[*]}" ]] && WRITE+=( "${dris[@]}" ) + + if [[ -d /sys/module/nvidia ]]; then + # /dev/nvidia{0-9} + readarray -t nvidia_devs <<<"$( + find /dev -regextype posix-extended -regex '/dev/nvidia(|-(nvswitch|vgpu))[0-9]*' + )" + [[ -n "${nvidia_devs[*]}" ]] && WRITE+=( "${nvidia_devs[@]}" ) + + WRITE+=( + "/dev/nvidiactl" + "/dev/nvidia-modeset" + + "/dev/nvidia-vgpuctl" + + "/dev/nvidia-nvlink" + "/dev/nvidia-nvswitchctl" + + "/dev/nvidia-uvm" + "/dev/nvidia-uvm-tools" + + # "/dev/nvidia-caps/nvidia-cap%d" + "/dev/nvidia-caps/" + # "/dev/nvidia-caps-imex-channels/channel%d" + "/dev/nvidia-caps-imex-channels/" + ) + fi + + # for portage + WRITE+=( "/proc/self/task/" ) + + local dev + for dev in "${WRITE[@]}"; do + [[ ! -e "${dev}" ]] && return + + [[ -w "${dev}" ]] && return + + eqawarn "addwrite ${dev}" + addwrite "${dev}" + if [[ ! -d "${dev}" ]] && [[ ! -w "${dev}" ]]; then + eerror "can not access ${dev} after addwrite" + fi + done +} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp + + vtk_check_reqs + + # When building binpkgs you probably want to include all targets + if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then + local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN" + einfo "$info_message so all available architectures are build." + fi +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp + + vtk_check_reqs + + if use cuda && [[ ! -e /dev/nvidia-uvm ]]; then + # NOTE We try to load nvidia-uvm and nvidia-modeset here, + # so __nvcc_device_query does not fail later. + + nvidia-modprobe -m -u -c 0 || true + fi + + use java && java-pkg-opt-2_pkg_setup + use python && python-single-r1_pkg_setup + use web && webapp_pkg_setup +} + +# Note: The following libraries are marked as internal by kitware +# and can currently not unbundled: +# diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic, +# vtkm, xdmf{2,3}, zfp +# TODO: exprtk, ioss +# Note: As of v9.2.2 we no longer drop bundled libraries, when using system +# libraries. This just saves a little space. CMake logic of VTK on ThirdParty +# libraries avoids automagic builds, so deletion is not needed to catch these. +src_prepare() { + if use doc; then + einfo "Removing .md5 files from documents." + rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes" + sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \ + -i Utilities/Doxygen/CMakeLists.txt || die + fi + + if use opencascade && has_version ">=sci-libs/opencascade-7.8.0"; then + eapply "${FILESDIR}/vtk-9.3.0-opencascade-7.8.0.patch" + fi + + cmake_src_prepare + + if use test; then + ebegin "Copying data files to ${BUILD_DIR}" + mkdir -p "${BUILD_DIR}/ExternalData" || die + pushd "${BUILD_DIR}/ExternalData" >/dev/null || die + ln -sf "../../${S}/.ExternalData/README.rst" . || die + ln -sf "../../${S}/.ExternalData/SHA512" . || die + popd >/dev/null || die + eend "$?" + fi +} + +# TODO: check these and consider to use them +# VTK_BUILD_SCALED_SOA_ARRAYS +# VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git="yes" + -DVTK_GIT_DESCRIBE="v${PV}" + -DVTK_VERSION_FULL="${PV}" + -DGIT_EXECUTABLE="${T}/notgit" + + -DCMAKE_POLICY_DEFAULT_CMP0167="OLD" + -DCMAKE_POLICY_DEFAULT_CMP0174="OLD" + -DCMAKE_POLICY_DEFAULT_CMP0177="OLD" + + -DCMAKE_INSTALL_LICENSEDIR="share/${PN}/licenses" + -DVTK_IGNORE_CMAKE_CXX11_CHECKS=yes + + -DVTK_ANDROID_BUILD=OFF + -DVTK_IOS_BUILD=OFF + + -DVTK_BUILD_ALL_MODULES="$(usex all-modules)" + # we use the pre-built documentation and install these with USE=doc + -DVTK_BUILD_DOCUMENTATION=OFF + -DVTK_BUILD_EXAMPLES="$(usex examples)" + + # no package in the tree: https://github.com/LLNL/conduit + -DVTK_ENABLE_CATALYST=OFF + -DVTK_ENABLE_KITS=OFF + -DVTK_ENABLE_LOGGING="$(usex logging)" + # defaults to ON: USE flag for this? + -DVTK_ENABLE_REMOTE_MODULES=OFF + + # disable fetching files during build + -DVTK_FORBID_DOWNLOADS="yes" + + -DVTK_GROUP_ENABLE_Imaging="$(usex imaging "YES" "NO")" + -DVTK_GROUP_ENABLE_Rendering="$(usex rendering "YES" "NO")" + -DVTK_GROUP_ENABLE_StandAlone="$(usex minimal "NO" "YES")" + -DVTK_GROUP_ENABLE_Views="$(usex views "YES" "NO")" + -DVTK_GROUP_ENABLE_Web="$(usex web "YES" "NO")" + + -DVTK_INSTALL_SDK=ON + + -DVTK_MODULE_ENABLE_VTK_IOCGNSReader="$(usex cgns "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOExportPDF="$(usex minimal "NO" "YES")" + -DVTK_MODULE_ENABLE_VTK_IOLAS="$(usex las "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IONetCDF="$(usex netcdf "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOOCCT="$(usex opencascade "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOOggTheora="$(usex minimal "NO" "YES")" + -DVTK_MODULE_ENABLE_VTK_IOOpenVDB="$(usex openvdb "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOSQL="YES" # sqlite + -DVTK_MODULE_ENABLE_VTK_IOPDAL="$(usex pdal "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOXML="YES" + -DVTK_MODULE_ENABLE_VTK_IOXMLParser="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingFreeType="$(usex truetype "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig="$(usex truetype "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_cgns="$(usex cgns "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_doubleconversion="YES" + -DVTK_MODULE_ENABLE_VTK_eigen="YES" + -DVTK_MODULE_ENABLE_VTK_expat="YES" + -DVTK_MODULE_ENABLE_VTK_fmt="YES" + -DVTK_MODULE_ENABLE_VTK_freetype="$(usex truetype "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_hdf5="YES" + -DVTK_MODULE_ENABLE_VTK_jpeg="YES" + -DVTK_MODULE_ENABLE_VTK_jsoncpp="YES" + -DVTK_MODULE_ENABLE_VTK_libharu="$(usex minimal "NO" "YES")" + -DVTK_MODULE_ENABLE_VTK_libproj="YES" + -DVTK_MODULE_ENABLE_VTK_libxml2="YES" + -DVTK_MODULE_ENABLE_VTK_lz4="YES" + -DVTK_MODULE_ENABLE_VTK_lzma="YES" + -DVTK_MODULE_ENABLE_VTK_netcdf="$(usex netcdf "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_nlohmannjson="YES" + -DVTK_MODULE_ENABLE_VTK_ogg="YES" + -DVTK_MODULE_ENABLE_VTK_pegtl="YES" + -DVTK_MODULE_ENABLE_VTK_png="YES" + -DVTK_MODULE_ENABLE_VTK_pugixml="YES" + -DVTK_MODULE_ENABLE_VTK_sqlite="YES" + -DVTK_MODULE_ENABLE_VTK_theora="$(usex minimal "NO" "YES")" + -DVTK_MODULE_ENABLE_VTK_tiff="YES" + -DVTK_MODULE_ENABLE_VTK_utf8="YES" + -DVTK_MODULE_ENABLE_VTK_vtkvtkm="$(usex vtkm "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_zlib="YES" + + # not packaged in Gentoo + -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF + -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF + -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF + -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF + + -DVTK_RELOCATABLE_INSTALL=ON + -DVTK_UNIFIED_INSTALL_TREE=ON + + -DVTK_SMP_ENABLE_OPENMP="$(usex openmp)" + -DVTK_SMP_ENABLE_STDTHREAD="$(usex threads)" + -DVTK_SMP_ENABLE_TBB="$(usex tbb)" + + -DVTK_USE_CUDA="$(usex cuda)" + # use system libraries where possible + -DVTK_USE_EXTERNAL=ON + # avoid finding package from either ::guru or ::sci + -DVTK_USE_MEMKIND=OFF + -DVTK_USE_MPI="$(usex mpi)" + -DVTK_USE_TK="$(usex tk)" + -DVTK_USE_X=ON + + -DVTK_WHEEL_BUILD=OFF + + -DVTK_WRAP_JAVA="$(usex java)" + -DVTK_WRAP_PYTHON="$(usex python)" + ) + + if use all-modules; then + mycmakeargs+=( + # no package in ::gentoo + -DVTK_ENABLE_OSPRAY=OFF + # TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES + # option. Check whether we can download them clean and enable + # them. + -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO" + -DVTK_MODULE_ENABLE_VTK_fides="NO" + -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO" + -DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO" + -DVTK_MODULE_ENABLE_VTK_IOFides="NO" + + -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO" + -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO" + + -DVTK_MODULE_USE_EXTERNAL_VTK_cli11="YES" + ) + fi + + if use boost; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_InfovisBoost="YES" + -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="YES" + ) + fi + + if use cuda; then + cuda_add_sandbox -w + addwrite "/proc/self/task" + + if ! test -w /dev/nvidiactl; then + # eqawarn "Can't access the GPU at /dev/nvidiactl." + # eqawarn "User $(id -nu) is not in the group \"video\"." + if [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then + # build all targets + mycmakeargs+=( + -DCUDA_GENERATION="" + ) + fi + else + local -x CUDAARCHS + : "${CUDAARCHS:="$(cuda_get_host_native_arch)"}" + fi + + # set NVCC_CCBIN + local -x CUDAHOSTCXX CUDAHOSTLD + CUDAHOSTCXX="$(cuda_get_host_compiler)" + CUDAHOSTLD="$(tc-getCXX)" + export NVCC_CCBIN="${CUDAHOSTCXX}" + + if tc-is-gcc; then + # Filter out IMPLICIT_LINK_DIRECTORIES picked up by CMAKE_DETERMINE_COMPILER_ABI(CUDA) + # See /usr/share/cmake/Help/variable/CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES.rst + CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES_EXCLUDE=$( + "${CUDAHOSTLD}" -E -v - <<<"int main(){}" |& \ + grep LIBRARY_PATH | cut -d '=' -f 2 | cut -d ':' -f 1 + ) + fi + fi + + if use debug; then + mycmakeargs+=( + -DVTK_DEBUG_LEAKS=ON + -DVTK_DEBUG_MODULE=ON + -DVTK_DEBUG_MODULE_ALL=ON + -DVTK_ENABLE_SANITIZER=ON + -DVTK_EXTRA_COMPILER_WARNINGS=ON + -DVTK_WARN_ON_DISPATCH_FAILURE=ON + ) + if use rendering; then + mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON ) + fi + else + : "${CMAKE_BUILD_TYPE:="Release"}" + export CMAKE_BUILD_TYPE + fi + + if use examples || use test; then + mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON ) + fi + + if use ffmpeg; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="YES" ) + if use rendering; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="YES" ) + fi + fi + + if use gdal; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="YES" + -DVTK_MODULE_ENABLE_VTK_IOGDAL="YES" + -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="YES" + ) + fi + + if use imaging; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_ImagingColor="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingCore="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingFourier="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingGeneral="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingHybrid="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingMath="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingMorphological="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingSources="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingStatistics="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingStencil="YES" + ) + use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="YES" ) + fi + + if ! use java && ! use python; then + # defaults to ON + mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF ) + fi + + if use java; then + mycmakeargs+=( + -DCMAKE_INSTALL_JARDIR="share/${PN}" + -DVTK_ENABLE_WRAPPING=ON + -DVTK_MODULE_ENABLE_VTK_Java="YES" + -DVTK_JAVA_SOURCE_VERSION="$(java-config -g PROVIDES_VERSION)" + -DVTK_JAVA_TARGET_VERSION="$(java-config -g PROVIDES_VERSION)" + ) + fi + + if use minimal; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_CommonComputationalGeometry="YES" + -DVTK_MODULE_ENABLE_VTK_CommonExecutionModel="YES" + -DVTK_MODULE_ENABLE_VTK_CommonMath="YES" + -DVTK_MODULE_ENABLE_VTK_CommonMisc="YES" + -DVTK_MODULE_ENABLE_VTK_CommonSystem="YES" + -DVTK_MODULE_ENABLE_VTK_CommonTransforms="YES" + + -DVTK_MODULE_ENABLE_VTK_FiltersCore="YES" + -DVTK_MODULE_ENABLE_VTK_FiltersExtraction="YES" + -DVTK_MODULE_ENABLE_VTK_FiltersGeneral="YES" + -DVTK_MODULE_ENABLE_VTK_FiltersGeneric="YES" + -DVTK_MODULE_ENABLE_VTK_FiltersGeometry="YES" + -DVTK_MODULE_ENABLE_VTK_FiltersHybrid="NO" + -DVTK_MODULE_ENABLE_VTK_FiltersHyperTree="YES" + -DVTK_MODULE_ENABLE_VTK_FiltersSources="YES" + -DVTK_MODULE_ENABLE_VTK_FiltersStatistics="YES" + -DVTK_MODULE_ENABLE_VTK_FiltersVerdict="YES" + + -DVTK_MODULE_ENABLE_VTK_IOCore="YES" + -DVTK_MODULE_ENABLE_VTK_IOGeometry="NO" + -DVTK_MODULE_ENABLE_VTK_IOLegacy="YES" + + -DVTK_MODULE_ENABLE_VTK_ParallelCore="YES" + -DVTK_MODULE_ENABLE_VTK_ParallelDIY="YES" + ) + fi + + if use mpi; then + mycmakeargs+=( + -DVTK_GROUP_ENABLE_MPI="YES" + -DVTK_MODULE_ENABLE_VTK_IOH5part="YES" + -DVTK_MODULE_ENABLE_VTK_IOMPIParallel="YES" + -DVTK_MODULE_ENABLE_VTK_IOParallel="YES" + -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="$(usex netcdf "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOParallelXML="YES" + -DVTK_MODULE_ENABLE_VTK_ParallelMPI="YES" + -DVTK_MODULE_ENABLE_VTK_h5part="YES" + -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF + ) + use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="YES" ) + use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="YES" ) + if use rendering; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_RenderingParallel="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="YES" + ) + fi + use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) + else + mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" ) + fi + + use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="YES" ) + use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="YES" ) + use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" ) + use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="YES" ) + + if use python; then + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DVTK_ENABLE_WRAPPING=ON + -DVTK_MODULE_ENABLE_VTK_Python="YES" + -DVTK_MODULE_ENABLE_VTK_PythonInterpreter="YES" + -DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="YES" + -DVTK_PYTHON_OPTIONAL_LINK="OFF" + -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages" + ) + use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="YES" ) + fi + + if use qt6; then + mycmakeargs+=( + -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" + -DVTK_QT_VERSION="6" + ) + if has_version "dev-qt/qtbase:6[gles2-only]" || use gles2-only; then + mycmakeargs+=( + # Force using EGL & GLES + -DVTK_OPENGL_HAS_EGL=ON + -DVTK_OPENGL_USE_GLES=ON + ) + fi + else + mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) + fi + + if use qt6; then + mycmakeargs+=( + -DVTK_GROUP_ENABLE_Qt:STRING="YES" + -DVTK_MODULE_ENABLE_VTK_GUISupportQt="YES" + -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="YES" + ) + if use mysql || use postgres; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="YES" ) + fi + if use rendering; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="YES" ) + fi + if use views; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="YES" ) + fi + fi + + if use rendering; then + mycmakeargs+=( + -DVTK_ENABLE_OSPRAY=OFF + + -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingContext2D="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingCore="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingExternal="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingLOD="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingLabel="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingUI="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingVolume="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingZSpace="NO" + -DVTK_MODULE_ENABLE_VTK_gl2ps="YES" + -DVTK_MODULE_ENABLE_VTK_glew="YES" + -DVTK_MODULE_ENABLE_VTK_opengl="YES" + + -DVTK_USE_SDL2="$(usex sdl "YES" "NO")" + ) + use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="YES" ) + use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="YES" ) + use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="YES" ) + use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="YES" ) + fi + + # Testing has been changed in 9.2.5: it is now allowed without + # requiring to download, if the data files are available locally! + if use test; then + mycmakeargs+=( + -DVTK_BUILD_TESTING=ON + # disable fetching data files for the default 'all' target + -DVTK_DATA_EXCLUDE_FROM_ALL=OFF + + # requested even if all use flags are off + -DVTK_MODULE_ENABLE_VTK_octree="YES" + -DVTK_MODULE_ENABLE_VTK_ViewsCore="YES" + + -DVTK_MODULE_USE_EXTERNAL_VTK_cli11="YES" + ) + else + mycmakeargs+=( -DVTK_BUILD_TESTING=OFF ) + fi + + # FIXME: upstream provides 4 threading models, as of 9.1.0. These are + # sequential, stdthread, openmp and tbb. AFAICS all of them can be + # enabled at the same time. Sequential and STDThread are enabled by + # default. The default selected type for the build is sequential. + # Assuming sequential < STDThread < openmp < tbb wrt speed, although + # this is dependent on the actual scenario where threading is used. + if use tbb; then + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) + elif use openmp; then # FIXME doesn't work with clang + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" ) + elif use threads; then + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" ) + else + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) + fi + + use tk && mycmakeargs+=( -DVTK_GROUP_ENABLE_Tk="YES" ) + + if use views; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_ViewsCore="YES" + -DVTK_MODULE_ENABLE_VTK_ViewsInfovis="YES" + ) + fi + + if use vtkm; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="YES" + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="YES" + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="YES" + -DVTKm_ENABLE_CPACK="no" # "Enable CPack packaging of VTKm" ON + -DVTKm_ENABLE_CUDA="$(usex cuda)" # "Enable Cuda support" OFF + -DVTKm_ENABLE_DOCUMENTATION="$(usex doc)" # "Build Doxygen documentation" OFF + -DVTKm_ENABLE_EXAMPLES="$(usex examples)" # "Build examples" OFF + -DVTKm_ENABLE_HDF5_IO="yes" # "Enable HDF5 support" OFF + -DVTKm_ENABLE_LOGGING="$(usex logging)" # "Enable VTKm Logging" ON + -DVTKm_ENABLE_MPI="$(usex mpi)" # "Enable MPI support" OFF + -DVTKm_ENABLE_OPENMP="$(usex openmp)" # "Enable OpenMP support" OFF + -DVTKm_ENABLE_RENDERING="$(usex rendering)" # "Enable rendering library" ON + -DVTKm_ENABLE_TBB="$(usex tbb)" # "Enable TBB support" OFF + -DVTKm_ENABLE_TESTING="$(usex test)" # "Enable VTKm Testing" ON + -DVTKm_ENABLE_TUTORIALS="no" # "Build tutorials" OFF + -DVTKm_NO_ASSERT_CUDA="yes" # "Disable assertions for CUDA devices." ON + -DVTKm_NO_ASSERT_HIP="yes" # "Disable assertions for HIP devices." ON + -DVTKm_NO_ASSERT="no" # "Disable assertions in debugging builds." OFF + -DVTKm_NO_INSTALL_README_LICENSE="ON" # bug #793221 # "disable the installation of README and LICENSE files" OFF + -DVTKm_SKIP_LIBRARY_VERSIONS="no" # "Skip versioning VTK-m libraries" OFF + -DVTKm_Vectorization="none" # only sets compiler flags + ) + fi + + if use web; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_WebCore="YES" + -DVTK_MODULE_ENABLE_VTK_WebGLExporter="YES" + ) + use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="YES" ) + fi + + cmake_src_configure +} + +src_compile() { + use test && cmake_build VTKData + cmake_src_compile +} + +src_test() { + vtk_add_sandbox + + addwrite /dev/fuse + + # The build system prepends /usr/$(get_libdir) to the RUNPATH instead of appending. + # Set LD_LIBRARY_PATH to use the just build libraries. + local -x LD_LIBRARY_PATH="${BUILD_DIR}/$(get_libdir)${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + + # export VTK_SMP_BACKEND_IN_USE="STDThread" + + local -x -a CMAKE_SKIP_TESTS + + if [[ "${CMAKE_RUN_OPTIONAL_TESTS:=yes}" != "yes" ]]; then + local -a REALLY_BAD_TESTS BAD_TESTS RANDOM_FAIL_TESTS + # don't work at all + REALLY_BAD_TESTS=( + # File missing? ExternalData/Testing/Data/MotionFX/position_file/Sprocket_New.prn + "VTK::IOMotionFXCxx-TestMotionFXCFGReaderPositionFile$" # (Subprocess aborted) + + "VTK::InteractionWidgetsCxx-TestBrokenLineWidget$" + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClipWithImplicitFunction$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMHistogram$" # (Failed) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes$" # (Failed) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes2$" # (Failed) + "VTK::ChartsCoreCxx-TestChartDoubleColors$" # (Failed) + "VTK::ChartsCoreCxx-TestChartDoubleColorsOpaque$" # (Failed) + "VTK::ChartsCoreCxx-TestParallelCoordinatesDouble$" # (Failed) + "VTK::CommonDataModelCxx-TestHyperTreeGridGeometricLocator$" # (Failed) + "VTK::CommonDataModelCxx-TestTriangle$" # (Failed) + "VTK::CommonDataModelCxx-UnitTestCells$" # (Failed) + "VTK::FiltersCoreCxx-TestDecimatePolylineFilter$" # (Failed) + "VTK::FiltersCoreCxx-TestImplicitPolyDataDistanceCube$" # (Failed) + "VTK::FiltersCorePython-TestSphereTreeFilter$" # (Failed) + "VTK::FiltersFlowPathsCxx-TestEvenlySpacedStreamlines2D$" # (Failed) + "VTK::FiltersGeneralCxx-TestContourTriangulatorHoles$" # (Failed) + "VTK::FiltersParallelCxx-TestAngularPeriodicFilter$" # (Failed) + "VTK::FiltersParallelDIY2Cxx-MPI-TestProbeLineFilter$" # (Failed) + "VTK::FiltersSelectionCxx-TestLinearSelector3D$" # (Failed) + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItem$" # (Failed) + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItemWidget$" # (Failed) + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderWindow$" # (Failed) + "VTK::RenderingExternalCxx-TestGLUTRenderWindow$" # (Failed) + "VTK::RenderingFreeTypeFontConfigCxx-TestSystemFontRendering$" # (Failed) + "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster" # (Failed) + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run) + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed) + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed) + "VTK::IOExportPDFCxx-TestPDFTransformedText-VerifyRasterizedPDFPNG$" # (Failed) + "VTK::IOOCCTCxx-TestOCCTReader$" # (Failed) + "VTK::RenderingCorePython-pickImageData$" # (Failed) + "VTK::RenderingRayTracing-HeaderTest$" # (Failed) + ) + + # don't work in src_test but when on their own + BAD_TESTS=( + "VTK::AcceleratorsVTKmCoreCxx-TestVTKMImplicitDataArray$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMCleanGrid$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClip$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExternalFaces$" # (Failed) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExtractVOI$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMLevelOfDetail$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointElevation$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointTransform$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPolyDataNormals$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold2$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMTriangleMeshPointNormals$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpScalar$" # (NUMERICAL) + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpVector$" # (NUMERICAL) + "VTK::ImagingOpenGL2Cxx-TestOpenGLImageGradient$" # (NUMERICAL) + "VTK::InteractionWidgetsCxx-TestResliceCursorWidget2$" # (Failed) + "VTK::InteractionWidgetsCxx-TestResliceCursorWidget3$" # (Failed) + "VTK::InteractionWidgetsPython-TestTensorWidget2$" # (Failed) + "VTK::RenderingCoreCxx-TestTextureRGBADepthPeeling$" # (Failed) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlended$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMapped$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaults$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaultsColor$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICMultiBlockContrastEnhancedPerlin$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarContrastEnhanced$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarDefaults$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOff$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-TestImageDataLIC2D$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DXSlice$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DYSlice$" # (NUMERICAL) + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DZSlice$" # (NUMERICAL) + "VTK::RenderingMatplotlibCxx-TestContextMathTextImage$" # (NUMERICAL) + "VTK::RenderingMatplotlibCxx-TestIndexedLookupScalarBar$" # (NUMERICAL) + "VTK::RenderingMatplotlibCxx-TestMathTextActor$" # (NUMERICAL) + "VTK::RenderingMatplotlibCxx-TestMathTextActor3D$" # (NUMERICAL) + "VTK::RenderingMatplotlibCxx-TestRenderString$" # (NUMERICAL) + "VTK::RenderingMatplotlibCxx-TestScalarBarCombinatorics$" # (NUMERICAL) + "VTK::RenderingMatplotlibCxx-TestStringToPath$" # (NUMERICAL) + "VTK::RenderingOpenGL2Cxx-TestGlyph3DMapperPickability$" # (Failed) + ) + + RANDOM_FAIL_TESTS=( + "VTK::FiltersFlowPathsCxx-TestStreamSurface$" + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMAbort$" + "VTK::AcceleratorsVTKmFiltersPython-TestVTKMSlice$" + ) + + CMAKE_SKIP_TESTS+=( + "${REALLY_BAD_TESTS[@]}" + "${BAD_TESTS[@]}" + "${RANDOM_FAIL_TESTS[@]}" + ) + fi + + CMAKE_SKIP_TESTS+=( + # requires VTK_USE_MICROSOFT_MEDIA_FOUNDATION + "VTK::IOMovieCxx-Test" # Skipped + ) + + if use openmp; then + # TODO Times out under openmp + CMAKE_SKIP_TESTS+=( + "^VTK::CommonCoreCxx-TestSMP$" + ) + fi + + virtx cmake_src_test -j1 +} + +src_install() { + use web && webapp_src_preinst + + # Stop web page images from being compressed + if use doc; then + HTML_DOCS=( "${WORKDIR}/html/." ) + fi + + cmake_src_install + + use java && java-pkg_regjar "${ED}/usr/share/${PN}/${PN}.jar" + + # install examples + if use examples; then + einfo "Installing examples" + mv -v {E,e}xamples || die + dodoc -r examples + docompress -x "/usr/share/doc/${PF}/examples" + + einfo "Installing datafiles" + insinto "/usr/share/${PN}/data" + doins -r "${S}/.ExternalData" + fi + + use python && python_optimize + + use web && webapp_src_install +} + +# webapp.eclass exports these but we want it optional #534036 +pkg_postinst() { + use web && webapp_pkg_postinst + + if use examples; then + einfo "You can get more and updated examples at" + einfo "https://kitware.github.io/vtk-examples/site/" + fi +} + +pkg_prerm() { + use web && webapp_pkg_prerm +} |