diff options
Diffstat (limited to 'sci-libs')
714 files changed, 18083 insertions, 11864 deletions
diff --git a/sci-libs/HighFive/HighFive-2.8.0.ebuild b/sci-libs/HighFive/HighFive-2.8.0.ebuild new file mode 100644 index 000000000000..066cfc924888 --- /dev/null +++ b/sci-libs/HighFive/HighFive-2.8.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="app-text/doxygen[dot]" +DOCS_DIR="doc" + +inherit cmake docs + +DESCRIPTION="Header-only C++ interface for libhdf5" +HOMEPAGE="https://github.com/BlueBrain/HighFive" +SRC_URI="https://github.com/BlueBrain/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="amd64 ~x86" +LICENSE="Boost-1.0" +SLOT="0" +IUSE="mpi test" +RESTRICT="!test? ( test )" + +RDEPEND=" + sci-libs/hdf5[mpi?] +" +DEPEND=" + ${RDEPEND} + test? ( + >=dev-cpp/catch-3.4.0:0 + dev-libs/boost + dev-cpp/eigen + media-libs/opencv + ) +" + +DOCS=( {README,CHANGELOG}.md ) + +src_configure() { + default + local mycmakeargs=( + -DHIGHFIVE_PARALLEL_HDF5=$(usex mpi) + + -DHIGHFIVE_USE_BOOST=$(usex test) + -DHIGHFIVE_USE_EIGEN=$(usex test) + -DHIGHFIVE_USE_OPENCV=$(usex test) + -DHIGHFIVE_USE_XTENSOR=OFF + + -DHIGHFIVE_EXAMPLES=$(usex test) + -DHIGHFIVE_UNIT_TESTS=$(usex test) + ) + cmake_src_configure +} + +src_compile() { + default + use test && cmake_src_compile + use doc && doxygen_compile +} + +src_test() { + # Set -j1 to prevent race + cmake_src_test -j1 +} diff --git a/sci-libs/HighFive/Manifest b/sci-libs/HighFive/Manifest new file mode 100644 index 000000000000..9221bdc0fef9 --- /dev/null +++ b/sci-libs/HighFive/Manifest @@ -0,0 +1 @@ +DIST HighFive-2.8.0.tar.gz 538050 BLAKE2B ad856be95365c6d94add457d76366e0a3143fd09bbb6354048f896e16f5445d1037367eaaeaa233a3b5f9c45d2a2611173e051d2bd9e7aff4a3472665d96ec7f SHA512 cabcf8f1507b4466b7438249a813ea36de5e5d220c5caf7656312e24dbe09042bf9573388ca7c3caa22f71bd3b8106923710f9459127f87c341e2b0ab953eede diff --git a/sci-libs/HighFive/metadata.xml b/sci-libs/HighFive/metadata.xml new file mode 100644 index 000000000000..988d62f71f0e --- /dev/null +++ b/sci-libs/HighFive/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"> + <email>torokhov-s-a@yandex.ru</email> + <name>Sergey Torokhov</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">BlueBrain/HighFive</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/NNPACK/NNPACK-2020.12.22-r1.ebuild b/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild index f5318ec8a18d..0a02ea5ce21e 100644 --- a/sci-libs/NNPACK/NNPACK-2020.12.22-r1.ebuild +++ b/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-any-r1 CommitId=c07e3a0400713d546e0dea2d5466dd22ea389c73 diff --git a/sci-libs/QNNPACK/QNNPACK-2019.08.28.ebuild b/sci-libs/QNNPACK/QNNPACK-2019.08.28-r1.ebuild index 11fde064e65b..aa539b84c440 100644 --- a/sci-libs/QNNPACK/QNNPACK-2019.08.28.ebuild +++ b/sci-libs/QNNPACK/QNNPACK-2019.08.28-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/pytorch/QNNPACK/" SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" @@ -23,14 +25,13 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/FP16 dev-libs/FXdiv + dev-libs/clog " 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/ViSP/ViSP-3.5.0.ebuild b/sci-libs/ViSP/ViSP-3.5.0.ebuild index 4c38e5027c19..5a7052834f6b 100644 --- a/sci-libs/ViSP/ViSP-3.5.0.ebuild +++ b/sci-libs/ViSP/ViSP-3.5.0.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=7 @@ -51,7 +51,7 @@ BDEPEND=" virtual/pkgconfig test? ( sci-misc/ViSP-images ) doc? ( - app-doc/doxygen + app-text/doxygen media-gfx/graphviz virtual/latex-base )" diff --git a/sci-libs/XNNPACK/Manifest b/sci-libs/XNNPACK/Manifest index f095db09ce21..2d60bf4881cf 100644 --- a/sci-libs/XNNPACK/Manifest +++ b/sci-libs/XNNPACK/Manifest @@ -1,2 +1,3 @@ DIST XNNPACK-2022.02.17.tar.gz 6761154 BLAKE2B 59be5d9efe6f46d22bc41d3152e6cd3103f6dfafd94cdf3229b86ecf44a46175c613760f3de35c98a24ccdec1783f205c1eceaf21133706fedd5f384529748eb SHA512 aacbe907bb2b7429143f4ec612881fb709fe37e7b3a7f4fd68193dee6bbe82e17d20b2c6f5a8025845a09f8269c1dfeaebfc5bd64ef196fa376d82ac9a44cb8f DIST XNNPACK-2022.12.22.tar.gz 8342018 BLAKE2B 50426a47121418ef00a29b390ab4bb28211c17faaa7f4eacbf3a363fc3511b8655687e7f7f93f13b06a72ff9bcbde033305372687b6f2df1e1d5abaa910fe8be SHA512 1742ad4de3aa1a67cd5a3cbf15d82afc2cc8569a2abac92542f748a440ef37fef4e9d9c302b7b2813e3176934b637c761c1c0956d20ab1ba28b280d9b121d91b +DIST XNNPACK-2024.02.29.tar.gz 11561561 BLAKE2B bb3666edbf2ad87f4b6ba9dcaf28b3ed056b655bfa02e6f9bc350ce84db247ef3e0a6f9f908a0e05244e4b145b6993d465cd19ca763067ae619a7f94b97dc7bd SHA512 8063e27686f7b71cfba05b0c004c46db4506638689ffb112f013b3886de58653b60ca5487978c3f96275c17bb1136883ca4c93ddb2241a2c31925a950cb51759 diff --git a/sci-libs/XNNPACK/XNNPACK-2024.02.29.ebuild b/sci-libs/XNNPACK/XNNPACK-2024.02.29.ebuild new file mode 100644 index 000000000000..28d2c0606622 --- /dev/null +++ b/sci-libs/XNNPACK/XNNPACK-2024.02.29.ebuild @@ -0,0 +1,73 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +CommitId=fcbf55af6cf28a4627bcd1f703ab7ad843f0f3a2 + +DESCRIPTION="library of floating-point neural network inference operators" +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" +IUSE="+assembly jit +memopt +sparse static-libs test" + +RDEPEND=" + >=dev-libs/cpuinfo-2023.11.04 + dev-libs/pthreadpool +" +DEPEND="${RDEPEND} + dev-libs/FP16 + dev-libs/FXdiv +" + +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( static-libs )" + +src_prepare() { + dropTest=( + fully-connected-test + fully-connected-nc-test + subgraph-fp16-test + static-reshape-test + qd8-f16-qc8w-gemm-minmax-test + qd8-f32-qc8w-gemm-minmax-test + qd8-f16-qc4w-gemm-minmax-test + qd8-f32-qc4w-gemm-minmax-test + ) + for id in ${dropTest[@]} + do + sed -i \ + -e "/ADD_TEST(NAME ${id}/d" \ + CMakeLists.txt \ + || die + done + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DXNNPACK_BUILD_BENCHMARKS=OFF + -DXNNPACK_USE_SYSTEM_LIBS=ON + -DXNNPACK_BUILD_TESTS=$(usex test ON OFF) + -DXNNPACK_LIBRARY_TYPE=$(usex static-libs static shared) + -DXNNPACK_ENABLE_ASSEMBLY=$(usex assembly ON OFF) + -DXNNPACK_ENABLE_JIT=$(usex jit ON OFF) + -DXNNPACK_ENABLE_MEMOPT=$(usex memopt ON OFF) + -DXNNPACK_ENABLE_SPARSE=$(usex sparse ON OFF) + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DPTHREADPOOL_SOURCE_DIR=/usr + -DCPUINFO_SOURCE_DIR=/usr + ) + + cmake_src_configure + cd "${BUILD_DIR}" +} diff --git a/sci-libs/alglib/alglib-3.17.0.ebuild b/sci-libs/alglib/alglib-3.17.0.ebuild index 1b837edafa87..cc63c323ff47 100644 --- a/sci-libs/alglib/alglib-3.17.0.ebuild +++ b/sci-libs/alglib/alglib-3.17.0.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=7 @@ -22,7 +22,12 @@ src_prepare() { } src_configure() { + # bug #862666 + append-flags -fno-strict-aliasing + filter-lto + use x86 && append-cflags -ffloat-store + local mycmakeargs=( -DBUILD_TEST=$(usex test) ) diff --git a/sci-libs/arborx/Manifest b/sci-libs/arborx/Manifest index 4cf219e6a8a7..f74f2db22184 100644 --- a/sci-libs/arborx/Manifest +++ b/sci-libs/arborx/Manifest @@ -1 +1,2 @@ DIST arborx-1.4.1.tar.gz 408999 BLAKE2B 83e172f89ac8ff82d4add40fd036457d9c563b44c11b15d86aa884dc03742f3e22a13cc4b6f068ef377fcd8e63d239f704dd1821772079d2f9f8c169b1f31fae SHA512 3799deed5eae1e6092c19a62894207ac0ccd81ba84c8d42734fa3d0e5a3fc9d6a8f7b1442d2203b06f4e251970569f67506d419fb6695039c11e78dfd740e565 +DIST arborx-1.6.tar.gz 437155 BLAKE2B a49d91eb629c51550440f88f679a10b83b6421294beb467011a3f3f8c88b1b9691b8d09dfca1703334dc43813bb03d93f48967dcc50e265d5be893712a771e86 SHA512 f493a4e545fcd92dc47301dd77fdfa1a779a8b211480371055dc22e051ccc78dc54486c0477bed110d3b1fecc3edbcb211eeea88dbe335b010970c150eca3a19 diff --git a/sci-libs/arborx/arborx-1.6.ebuild b/sci-libs/arborx/arborx-1.6.ebuild new file mode 100644 index 000000000000..cfdb3fee77f5 --- /dev/null +++ b/sci-libs/arborx/arborx-1.6.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Library for performance portable algorithms for geometric search" +HOMEPAGE="https://github.com/arborx/ArborX" + +SRC_URI="https://github.com/${PN}/ArborX/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="mpi" + +RDEPEND="dev-libs/boost:= + mpi? ( virtual/mpi[cxx] ) + sci-libs/trilinos" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}"/ArborX-${PV} + +src_prepare() { + cmake_src_prepare + + # replace hardcoded "lib/" directory: + sed -i -e "s#lib/#$(get_libdir)/#g" CMakeLists.txt || die "sed failed" +} + +src_configure() { + local mycmakeargs=( + -DARBORX_ENABLE_MPI="$(usex mpi)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install +} diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index c7308e237c4e..7a3a912b4672 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1 +1,2 @@ DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f855039cc81c3300c83e5e932ee4cda233731b53623303c1c739feae9b007f8f6309c09debe79923e3876e8145015152 SHA512 a9f8cd19384eed787787b9e189901a1800e6e1dd06917f4f13e8a215c83f317de3e5b0ae8625783f88d9a7b0ab25f5c7784ccf0493c08a9ee3ea7fdfbbe36195 +DIST armadillo-12.8.2.tar.xz 6996368 BLAKE2B 63876486dcd72359b243a2ae217de751a9033c7f3e6c8599ba195b52fb493dbc4b6ec7f804916d40cef0c726d3ad42752a5cfb6fd3919935cbdf20e59488e474 SHA512 33bfe6f1fae2ef18ec3286742264dedd67730e47b5187568cb2fbe951286a5a8534a4b577894cc44415887241a46afb25b3fcf2b249ef15f9b71045e98fd0132 diff --git a/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild b/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild index 8139c09c283a..4bec84f895e8 100644 --- a/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild +++ b/sci-libs/armadillo/armadillo-12.4.0-r1.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 @@ -7,7 +7,7 @@ inherit cmake toolchain-funcs multilib DESCRIPTION="Streamlined C++ linear algebra library" HOMEPAGE="https://arma.sourceforge.net" -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/arma/${P}.tar.xz" LICENSE="Apache-2.0" SLOT="0/12" diff --git a/sci-libs/armadillo/armadillo-12.8.2.ebuild b/sci-libs/armadillo/armadillo-12.8.2.ebuild new file mode 100644 index 000000000000..fb5c180c2462 --- /dev/null +++ b/sci-libs/armadillo/armadillo-12.8.2.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs multilib + +DESCRIPTION="Streamlined C++ linear algebra library" +HOMEPAGE="https://arma.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/arma/${P}.tar.xz" + +LICENSE="Apache-2.0" +SLOT="0/12" +KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="arpack blas doc examples lapack mkl superlu test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( arpack lapack superlu )" + +# atlas? ( sci-libs/atlas[lapack] ) +RDEPEND=" + dev-libs/boost + arpack? ( sci-libs/arpack ) + blas? ( virtual/blas ) + lapack? ( virtual/lapack ) + mkl? ( sci-libs/mkl ) + superlu? ( >=sci-libs/superlu-5.2 ) +" +DEPEND="${RDEPEND} + arpack? ( virtual/pkgconfig ) + blas? ( virtual/pkgconfig ) + lapack? ( virtual/pkgconfig ) +" + +PATCHES=( + "${FILESDIR}/${PN}-12.0.1-extratests.patch" +) + +src_prepare() { + # avoid the automagic cmake macros... + sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die + + # ... except for mkl, since without a license it's hard to figure out what to do there + if use mkl; then + sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + ) + if use arpack; then + mycmakeargs+=( + -DARPACK_FOUND=ON + -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" + ) + else + mycmakeargs+=( + -DARPACK_FOUND=OFF + ) + fi +# if use atlas; then +# local c=atlas-cblas l=atlas-clapack +# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads +# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads +# mycmakeargs+=( +# -DCBLAS_FOUND=ON +# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" +# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" +# -DCLAPACK_FOUND=ON +# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" +# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" +# ) +# fi + if use blas; then + mycmakeargs+=( + -DBLAS_FOUND=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + ) + else + mycmakeargs+=( + -DBLAS_FOUND=OFF + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + else + mycmakeargs+=( + -DLAPACK_FOUND=OFF + ) + fi + if use superlu; then + mycmakeargs+=( + -DSuperLU_FOUND=ON + -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" + -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" + ) + else + mycmakeargs+=( + -DSuperLU_FOUND=OFF + ) + fi + + cmake_src_configure +} + +src_test() { + cmake_src_test || die + + pushd tests2 > /dev/null + emake \ + CXX="$(tc-getCXX)" \ + CXX_FLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ + LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" + LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./main || die + emake clean + popd > /dev/null +} + +src_install() { + cmake_src_install + + dodoc README.md + use doc && dodoc *pdf *html + + if use examples; then + docinto examples + dodoc -r examples/* + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml index 08c60223686b..206c77590ec9 100644 --- a/sci-libs/armadillo/metadata.xml +++ b/sci-libs/armadillo/metadata.xml @@ -34,5 +34,6 @@ </use> <upstream> <remote-id type="sourceforge">arma</remote-id> + <remote-id type="gitlab">conradsnicta/armadillo-code</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest index ce9b7f1fd764..539d6ce2a204 100644 --- a/sci-libs/arpack/Manifest +++ b/sci-libs/arpack/Manifest @@ -1,4 +1 @@ -DIST arpack-3.8.0.tar.gz 1014494 BLAKE2B 6daf8a237fdfce527935d777292df150b2f78892d9975f8696a37024fcb78174b29afd300e7abca2684c1907eeda658eb4478f09f580835896c0e10d106cdbbd SHA512 8969c74c4c0459ea2d29ea49d5260f668fd33f73886df0da78a42a94aea93c9f5fb70f5df035266db68807ab09a92c13487a7a4e6ca64922145aade8a148a2de -DIST arpack-3.9.0.tar.gz 1015328 BLAKE2B fc9960025140a9d6a570ee0359c16055c826482fe1ee58c2dc7727cd0ead04fbb940da0e08a6f11e05205d239b1059c93af0e08bf2b6e0cfee61d73f1d0d9816 SHA512 fbcaa2179dd1aa5a39fc3e7d80f377ec90ddf16ef93184a88e6ecfc464ed97e5659f2cf578294ac3e0b0c0da6408c86acf5bbdce533e1e9d2a3121848340d282 -DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4 -DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328 +DIST arpack-3.9.1.tar.gz 1020208 BLAKE2B dd1b5b16cc5304bb16ab68055939c8f3c11f761eff69bcfc22b3cb9605b477929f54513649a7becb152e91275bfccdc868d3ccf464fb876732c7ec23a83fe71e SHA512 1ca590a8c4f75aa74402f9bd62e63851039687f4cb11afa8acb05fce1f22a512bff5fd1709ea85fdbea90b344fbbc01e3944c770b5ddc4d1aabc98ac334f78d2 diff --git a/sci-libs/arpack/arpack-3.8.0-r1.ebuild b/sci-libs/arpack/arpack-3.8.0-r1.ebuild deleted file mode 100644 index 33421451eea4..000000000000 --- a/sci-libs/arpack/arpack-3.8.0-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools fortran-2 toolchain-funcs - -DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems" -HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng" -SRC_URI=" - https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz - doc? ( - http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz - http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" -IUSE="doc examples mpi" - -RDEPEND=" - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[fortran] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${PN}-ng-${PV}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - --enable-icb \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ - $(use_enable mpi) -} - -src_install() { - default - - dodoc DOCUMENTS/*.doc - newdoc DOCUMENTS/README README.doc - use doc && dodoc "${WORKDIR}"/*.ps - if use examples; then - dodoc -r EXAMPLES - if use mpi; then - docinto EXAMPLES/PARPACK - dodoc -r PARPACK/EXAMPLES/MPI - fi - fi - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/arpack/arpack-3.9.0-r1.ebuild b/sci-libs/arpack/arpack-3.9.1.ebuild index 543b592a542d..fe8ac4dd7b91 100644 --- a/sci-libs/arpack/arpack-3.9.0-r1.ebuild +++ b/sci-libs/arpack/arpack-3.9.1.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools fortran-2 toolchain-funcs +inherit autotools flag-o-matic fortran-2 toolchain-funcs + +DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems" +HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng" if [[ ${PV} == *9999 ]]; then - inherit git-r3 EGIT_REPO_URI="https://github.com/opencollab/arpack-ng" + inherit git-r3 else SRC_URI="https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}/${PN}-ng-${PV}" fi -DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems" -HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng" LICENSE="BSD" SLOT="0" IUSE="examples mpi" @@ -23,16 +24,28 @@ IUSE="examples mpi" RDEPEND=" virtual/blas virtual/lapack - mpi? ( virtual/mpi[fortran] )" + mpi? ( virtual/mpi[fortran] ) +" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-3.9.1-bashism-configure.patch +) + src_prepare() { default eautoreconf } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/878139 + # https://github.com/opencollab/arpack-ng/issues/451 + # + # Only when building tests. Still this means we cannot test it. + filter-lto + econf \ --disable-static \ --enable-icb \ diff --git a/sci-libs/arpack/arpack-9999.ebuild b/sci-libs/arpack/arpack-9999.ebuild index 543b592a542d..97ecc817d3fc 100644 --- a/sci-libs/arpack/arpack-9999.ebuild +++ b/sci-libs/arpack/arpack-9999.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools fortran-2 toolchain-funcs +inherit autotools flag-o-matic fortran-2 toolchain-funcs + +DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems" +HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng" if [[ ${PV} == *9999 ]]; then - inherit git-r3 EGIT_REPO_URI="https://github.com/opencollab/arpack-ng" + inherit git-r3 else SRC_URI="https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}/${PN}-ng-${PV}" fi -DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems" -HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng" LICENSE="BSD" SLOT="0" IUSE="examples mpi" @@ -23,7 +24,8 @@ IUSE="examples mpi" RDEPEND=" virtual/blas virtual/lapack - mpi? ( virtual/mpi[fortran] )" + mpi? ( virtual/mpi[fortran] ) +" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" @@ -33,6 +35,13 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/878139 + # https://github.com/opencollab/arpack-ng/issues/451 + # + # Only when building tests. Still this means we cannot test it. + filter-lto + econf \ --disable-static \ --enable-icb \ diff --git a/sci-libs/arpack/files/arpack-3.9.1-bashism-configure.patch b/sci-libs/arpack/files/arpack-3.9.1-bashism-configure.patch new file mode 100644 index 000000000000..074a43b3ee1d --- /dev/null +++ b/sci-libs/arpack/files/arpack-3.9.1-bashism-configure.patch @@ -0,0 +1,42 @@ +https://github.com/opencollab/arpack-ng/pull/441 + +From a3beacc11e2acbe0baf8b301cb47938dcf01e71d Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 13 Nov 2023 02:38:46 +0000 +Subject: [PATCH] configure.ac: fix bashisms + +configure scripts need to be runnable with a POSIX-compliant /bin/sh. + +On many (but not all!) systems, /bin/sh is provided by Bash, so errors +like this aren't spotted. Notably Debian defaults to /bin/sh provided +by dash which doesn't tolerate such bashisms as '=='. + +This retains compatibility with bash. + +Fixes configure warnings/errors like: +``` +checking for cheev_ in -llapack... yes +./configure: 8590: test: x: unexpected operator +checking how to print strings... printf +``` +--- a/configure.ac ++++ b/configure.ac +@@ -20,7 +20,7 @@ dnl Check for LAPACK libraries + AX_LAPACK([], [AC_MSG_ERROR([cannot find LAPACK libraries])]) + + AC_ARG_VAR(INTERFACE64, [set to 1 to use the 64-bit integer interface (ILP64) for ARPACK, BLAS and LAPACK]) +-if test x"$INTERFACE64" == x"1"; then ++if test x"$INTERFACE64" = x"1"; then + AC_LANG_PUSH([Fortran 77]) + AX_CHECK_COMPILE_FLAG(-fdefault-integer-8, FFLAGS="$FFLAGS -fdefault-integer-8", + AX_CHECK_COMPILE_FLAG(-i8, FFLAGS="$FFLAGS -i8", +@@ -191,7 +191,7 @@ AS_IF([test x"$enable_mpi" != x"no"], [ + ]) + + dnl TODO: this needs full re-write of parpack to support ILP64... +-if test x"$INTERFACE64" == x"1"; then ++if test x"$INTERFACE64" = x"1"; then + if test x"$enable_mpi" != x"no"; then + AC_MSG_ERROR([Parallel arpack does not support ILP64.]) + fi + diff --git a/sci-libs/arprec/arprec-2.2.19.ebuild b/sci-libs/arprec/arprec-2.2.19-r1.ebuild index b31b5b5c86c7..dc6ff68e1078 100644 --- a/sci-libs/arprec/arprec-2.2.19.ebuild +++ b/sci-libs/arprec/arprec-2.2.19-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 FORTRAN_NEEDED=fortran FORTRAN_STANDARD=90 @@ -11,9 +11,10 @@ inherit autotools fortran-2 DESCRIPTION="Arbitrary precision float arithmetics and functions" HOMEPAGE="https://crd-legacy.lbl.gov/~dhbailey/mpdist/" SRC_URI="https://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz" +S="${WORKDIR}/${PN}" -SLOT="0" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran qd static-libs" @@ -24,20 +25,22 @@ PATCHES=( "${FILESDIR}"/${P}-gold.patch ) -S="${WORKDIR}/${PN}" - src_prepare() { default + sed -e '/TESTS =/s/ io//' -i tests/Makefile.am || die # bug 526960 + eautoreconf } src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - $(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \ - $(use_enable fortran) \ + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + $(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) + $(use_enable fortran) $(use_enable qd) + ) + econf "${myeconfargs[@]}" } src_compile() { @@ -75,10 +78,10 @@ src_install() { fi if ! use doc; then - rm "${ED%/}"/usr/share/doc/${PF}/*.pdf || die + rm "${ED}"/usr/share/doc/${PF}/*.pdf || die fi if ! use static-libs; then - find "${D}" -name '*.la' -delete || die + find "${D}" -type f -name '*.la' -delete || die fi } diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest index 60a685649a9e..acbfae0299f8 100644 --- a/sci-libs/atlas/Manifest +++ b/sci-libs/atlas/Manifest @@ -1,2 +1,5 @@ DIST atlas3.10.2.tar.bz2 4904923 BLAKE2B e2fb0d307907549644cb678c32c4befce7ce6809c348a11fa6084e17d696da8681b3388dd63d8bdee6040999d9ab38a75f1788b42640121a536eb5f13e6f8939 SHA512 9fe04cfa1f89449db047d1a4659a656964d13117c783cbbe43344eb32555736f037d9cd30c5ae1514c08ad5b8949a3982d7fe102d707ddb62288e76b2607fbb1 +DIST atlas3.10.3.tar.bz2 5156852 BLAKE2B cd3880a6d0c43b5840d4da26ac996cc9fe7615fc996229193ef1f936daa2c54c5465643def19f59dd5c481c447176e2ba3cf85d38c0b5008c2dc1bc18be0e65b SHA512 bf17306f09f2aa973cb776e2c9eacfb2409ad4d95d19802e1c4e0597d0a099fccdb5eaafe273c2682a41e41a3c6fabc8bbba4ce03180cffea40ede5df1d1f56e +DIST atlas3.11.41.tar.bz2 6644195 BLAKE2B c046725f1a8978e345cb59026b93029483ecdfa0151256cca5dcdd337ced2a63819c19319795b663cd12180e8be0db475a3d1c1a5d76296ef333f99887d9e44a SHA512 06306c588505dcf22a1afa0f57d85b0008728deb5876e66b2710fee29712b979aa63eafc9142be2372b9895ba594cc5aba230aa3d1ddc95932af1e585478204d +DIST lapack-3.12.0.tar.gz 7933607 BLAKE2B dafb1f9a717f2cbc00a26f8cff2c7a1ebb720714fe6d7bd5fabb511a2f4af317165814340864c9d601e4e16c7762f643fbbafc058170ebcdc6529a9b4f2d70b6 SHA512 f8f3c733a0221be0b3f5618235408ac59cbd4e5f1c4eab5f509b831a6ec6a9ef14b8849aa6ea10810df1aff90186ca454d15e9438d1dd271c2449d42d3da9dda DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8 diff --git a/sci-libs/atlas/atlas-3.10.2.ebuild b/sci-libs/atlas/atlas-3.10.2-r1.ebuild index 6bddbb7be902..88ac1701512c 100644 --- a/sci-libs/atlas/atlas-3.10.2.ebuild +++ b/sci-libs/atlas/atlas-3.10.2-r1.ebuild @@ -1,29 +1,25 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 FORTRAN_NEEDED=fortran -inherit fortran-2 toolchain-funcs versionator +inherit fortran-2 toolchain-funcs LAPACKP=lapack-3.6.0.tgz DESCRIPTION="Automatically Tuned Linear Algebra Software" HOMEPAGE="https://math-atlas.sourceforge.net" -SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2 +SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2 fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP} ) )" +S="${WORKDIR}/ATLAS" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc fortran generic lapack static-libs threads" -RDEPEND="" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/ATLAS" - PATCHES=( "${FILESDIR}/${P}-x32-support.patch" "${FILESDIR}/${P}-format-security.patch" @@ -48,9 +44,9 @@ src_configure() { [[ ${mycc} == *gcc* ]] && mycc=gcc atlas_configure() { local myconf=( - --prefix="${ED}/usr" - --libdir="${ED}/usr/$(get_libdir)" - --incdir="${ED}/usr/include" + --prefix="/usr" + --libdir="/usr/$(get_libdir)" + --incdir="/usr/include" --cc="$(tc-getCC)" "-D c -DWALL" "-C acg '${mycc}'" @@ -143,7 +139,7 @@ src_test() { atlas_install_libs() { local libname=$(basename ${1%.*}) einfo "Installing ${libname}" - local soname=${libname}.so.$(get_major_version) + local soname=${libname}.so.$(ver_cut 1) shift pushd "${S}_shared"/lib > /dev/null ${LINK:-$(tc-getCC)} ${LDFLAGS} -shared -Wl,-soname=${soname} \ diff --git a/sci-libs/atlas/atlas-3.10.3.ebuild b/sci-libs/atlas/atlas-3.10.3.ebuild new file mode 100644 index 000000000000..aa0e6a6826fb --- /dev/null +++ b/sci-libs/atlas/atlas-3.10.3.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +inherit fortran-2 toolchain-funcs + +LAPACKPV=3.12.0 + +DESCRIPTION="Automatically Tuned Linear Algebra Software" +HOMEPAGE="https://math-atlas.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2 + fortran? ( lapack? ( + https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v${LAPACKPV}.tar.gz + -> lapack-${LAPACKPV}.tar.gz + ) ) +" +S="${WORKDIR}/ATLAS" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fortran generic lapack static-libs threads" + +PATCHES=( + "${FILESDIR}/${PN}-3.10.2-x32-support.patch" + "${FILESDIR}/${PN}-3.10.2-format-security.patch" + "${FILESDIR}/${PN}-3.10.3-fix-ancient-c.patch" +) + +pkg_setup() { + local _cpufreq + for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do + if [[ -f ${_cpufreq} ]]; then + if ! grep -q performance "${_cpufreq}"; then + echo 2> /dev/null performance > "${_cpufreq}" || \ + die "${PN} needs all cpu set to performance" + fi + fi + done + use fortran && fortran-2_pkg_setup +} + +src_configure() { + # hack needed to trick the flaky gcc detection + local mycc + mycc="$(type -P "$(tc-getCC)")" + [[ ${mycc} == *gcc* ]] && mycc=gcc + atlas_configure() { + local myconf=( + --cripple-atlas-performance + --prefix="/usr" + --libdir="/usr/$(get_libdir)" + --incdir="/usr/include" + --cc="$(tc-getCC)" + "-D c -DWALL" + "-C acg '${mycc}'" + "-F acg '${CFLAGS}'" + "-Ss pmake '\$(MAKE) ${MAKEOPTS}'" + ) + + # OpenMP shown to decreased performance over POSIX threads + # (at least in 3.9.x, see atlas-dev mailing list) + if use threads; then + if use generic; then # 2 threads is most generic + myconf+=( "-t 2" "-Si omp 0" ) + else + myconf+=( "-t -1" "-Si omp 0" ) + fi + else + myconf+=( "-t 0" "-Si omp 0" ) + fi + + if use amd64 || use ppc64 || use sparc; then + if [[ ${ABI} = amd64 ]] || [[ ${ABI} = ppc64 ]] || [[ ${ABI} = sparc64 ]] ; then + myconf+=( "-b 64" ) + elif [[ ${ABI} = x86 ]] || [[ ${ABI} = ppc ]] || [[ ${ABI} = sparc32 ]] ; then + myconf+=( "-b 32" ) + elif [[ ${ABI} = x32 ]] ; then + myconf+=( "-b 48" ) + else + myconf+=( "-b 64" ) + fi + elif use ppc || use x86; then + myconf+=( "-b 32" ) + elif use ia64; then + myconf+=( "-b 64" ) + fi + if use fortran; then + myconf+=( + "-C if '$(type -P "$(tc-getFC)")'" + "-F if '${FFLAGS}'" + ) + if use lapack; then + myconf+=( + "-Si latune 1" + "--with-netlib-lapack-tarfile=${DISTDIR}/lapack-${LAPACKPV}.tar.gz" + ) + else + myconf+=( "-Si latune 0" ) + fi + else + myconf+=( "-Si latune 0" "--nof77" ) + fi + # generic stuff found by make make xprint_enums in atlas build dir + # basically assuming sse2+sse1 and 2 threads max + use generic && use x86 && myconf+=( "-V 384 -A 13") + use generic && use amd64 && myconf+=( "-V 384 -A 24") + + local confdir="${S}_${1}"; shift + myconf+=( $@ ) + mkdir "${confdir}" || die + cd "${confdir}" || die + # for debugging + echo "${myconf[@]}" > myconf.out + "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed" + } + + atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF} + use static-libs && atlas_configure static ${EXTRA_ECONF} +} + +src_compile() { + atlas_compile() { + pushd "${S}_${1}" > /dev/null || die + # atlas does its own parallel builds + emake -j1 build + cd lib || die + emake libclapack.a + [[ -e libptcblas.a ]] && emake libptclapack.a + popd > /dev/null || die + } + + atlas_compile shared + use static-libs && atlas_compile static +} + +src_test() { + cd "${S}_shared" || die + emake -j1 check time +} + +# transform a static archive into a shared library and install them +# atlas_install_libs <mylib.a> [extra link flags] +atlas_install_libs() { + local libname soname + libname=$(basename "${1%.*}") + einfo "Installing ${libname}" + soname=${libname}.so.$(ver_cut 1) + shift + pushd "${S}_shared"/lib > /dev/null || die + ${LINK:-$(tc-getCC)} ${LDFLAGS} -shared "-Wl,-soname=${soname}" \ + -Wl,--whole-archive "${libname}.a" -Wl,--no-whole-archive \ + $@ -o "${soname}" || die "Creating ${soname} failed" + dolib.so "${soname}" + ln -s "${soname}" "${soname%.*}" + dosym "${soname}" "/usr/$(get_libdir)/${soname%.*}" + popd > /dev/null || die + use static-libs && dolib.a "${S}_static/lib/${libname}.a" +} + +src_install() { + cd "${S}_shared/lib" || die + # rename to avoid collision with other packages + local l + for l in {,c}{blas,lapack}; do + if [[ -e lib${l}.a ]]; then + mv lib{,atl}"${l}.a" + use static-libs && mv "${S}"_static/lib/lib{,atl}"${l}.a" + fi + done + + [[ -e libptcblas.a ]] && PTLIBS="-lpthread" + + # atlas + atlas_install_libs libatlas.a -lm "${PTLIBS}" + + # cblas + atlas_install_libs libatlcblas.a -lm -L. -latlas + + # cblas threaded + [[ -e libptcblas.a ]] && \ + atlas_install_libs libptcblas.a -lm -L. -latlas "${PTLIBS}" + + if use lapack; then + # clapack + atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas + + # clapack threaded + [[ -e libptclapack.a ]] && \ + atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas "${PTLIBS}" + fi + + if use fortran; then + LINK=$(tc-getF77) + + # blas + atlas_install_libs libf77blas.a -lm -L. -latlas + + # blas threaded + [[ -e libptf77blas.a ]] && \ + atlas_install_libs libptf77blas.a -lm -L. -latlas "${PTLIBS}" + + if use lapack; then + # lapack + atlas_install_libs libatllapack.a \ + -lm -L. -latlas -latlcblas -lf77blas + # lapack threaded + [[ -e libptlapack.a ]] && \ + atlas_install_libs libptlapack.a -lm -L. -latlas -lptcblas -lptf77blas "${PTLIBS}" + fi + fi + + cd "${S}" || die + insinto "/usr/include/${PN}" + doins include/*.h + + cd "${S}/doc" || die + dodoc INDEX.txt AtlasCredits.txt ChangeLog + use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf + use doc && use fortran && dodoc f77blas*pdf + use doc && use fortran && use lapack && dodoc -- *lapack*pdf +} diff --git a/sci-libs/atlas/atlas-3.11.41.ebuild b/sci-libs/atlas/atlas-3.11.41.ebuild new file mode 100644 index 000000000000..f4a8920320ab --- /dev/null +++ b/sci-libs/atlas/atlas-3.11.41.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +inherit fortran-2 toolchain-funcs + +LAPACKPV=3.12.0 + +DESCRIPTION="Automatically Tuned Linear Algebra Software" +HOMEPAGE="https://math-atlas.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2 + fortran? ( lapack? ( + https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v${LAPACKPV}.tar.gz + -> lapack-${LAPACKPV}.tar.gz + ) ) +" +S="${WORKDIR}/ATLAS" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fortran generic lapack static-libs threads" + +PATCHES=( + # TODO These don't apply, find out why + # "${FILESDIR}/${PN}-3.10.2-x32-support.patch" + # "${FILESDIR}/${PN}-3.10.2-format-security.patch" +) + +pkg_setup() { + local _cpufreq + for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do + if [[ -f ${_cpufreq} ]]; then + if ! grep -q performance "${_cpufreq}"; then + echo 2> /dev/null performance > "${_cpufreq}" || \ + die "${PN} needs all cpu set to performance" + fi + fi + done + use fortran && fortran-2_pkg_setup +} + +src_configure() { + # hack needed to trick the flaky gcc detection + local mycc + mycc="$(type -P "$(tc-getCC)")" + [[ ${mycc} == *gcc* ]] && mycc=gcc + atlas_configure() { + local myconf=( + --cripple-atlas-performance + --prefix="/usr" + --libdir="/usr/$(get_libdir)" + --incdir="/usr/include" + --cc="$(tc-getCC)" + "-D c -DWALL" + "-C acg '${mycc}'" + "-F acg '${CFLAGS}'" + "-Ss pmake '\$(MAKE) ${MAKEOPTS}'" + ) + + # OpenMP shown to decreased performance over POSIX threads + # (at least in 3.9.x, see atlas-dev mailing list) + if use threads; then + if use generic; then # 2 threads is most generic + myconf+=( "-t 2" "-Si omp 0" ) + else + myconf+=( "-t -1" "-Si omp 0" ) + fi + else + myconf+=( "-t 0" "-Si omp 0" ) + fi + + if use amd64 || use ppc64 || use sparc; then + if [[ ${ABI} = amd64 ]] || [[ ${ABI} = ppc64 ]] || [[ ${ABI} = sparc64 ]] ; then + myconf+=( "-b 64" ) + elif [[ ${ABI} = x86 ]] || [[ ${ABI} = ppc ]] || [[ ${ABI} = sparc32 ]] ; then + myconf+=( "-b 32" ) + elif [[ ${ABI} = x32 ]] ; then + myconf+=( "-b 48" ) + else + myconf+=( "-b 64" ) + fi + elif use ppc || use x86; then + myconf+=( "-b 32" ) + elif use ia64; then + myconf+=( "-b 64" ) + fi + if use fortran; then + myconf+=( + "-C if '$(type -P "$(tc-getFC)")'" + "-F if '${FFLAGS}'" + ) + if use lapack; then + myconf+=( + "-Si latune 1" + "--with-netlib-lapack-tarfile=${DISTDIR}/lapack-${LAPACKPV}.tar.gz" + ) + else + myconf+=( "-Si latune 0" ) + fi + else + myconf+=( "-Si latune 0" "--nof77" ) + fi + # generic stuff found by make make xprint_enums in atlas build dir + # basically assuming sse2+sse1 and 2 threads max + use generic && use x86 && myconf+=( "-V 384 -A 13") + use generic && use amd64 && myconf+=( "-V 384 -A 24") + + local confdir="${S}_${1}"; shift + myconf+=( $@ ) + mkdir "${confdir}" || die + cd "${confdir}" || die + # for debugging + echo "${myconf[@]}" > myconf.out + "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed" + } + + atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF} + use static-libs && atlas_configure static ${EXTRA_ECONF} +} + +src_compile() { + atlas_compile() { + pushd "${S}_${1}" > /dev/null || die + # atlas does its own parallel builds + emake -j1 build + cd lib || die + emake libclapack.a + [[ -e libptcblas.a ]] && emake libptclapack.a + popd > /dev/null || die + } + + atlas_compile shared + use static-libs && atlas_compile static +} + +src_test() { + cd "${S}_shared" || die + emake -j1 check time +} + +# transform a static archive into a shared library and install them +# atlas_install_libs <mylib.a> [extra link flags] +atlas_install_libs() { + local libname soname + libname=$(basename "${1%.*}") + einfo "Installing ${libname}" + soname=${libname}.so.$(ver_cut 1) + shift + pushd "${S}_shared"/lib > /dev/null || die + ${LINK:-$(tc-getCC)} ${LDFLAGS} -shared "-Wl,-soname=${soname}" \ + -Wl,--whole-archive "${libname}.a" -Wl,--no-whole-archive \ + $@ -o "${soname}" || die "Creating ${soname} failed" + dolib.so "${soname}" + ln -s "${soname}" "${soname%.*}" + dosym "${soname}" "/usr/$(get_libdir)/${soname%.*}" + popd > /dev/null || die + use static-libs && dolib.a "${S}_static/lib/${libname}.a" +} + +src_install() { + cd "${S}_shared/lib" || die + # rename to avoid collision with other packages + local l + for l in {,c}{blas,lapack}; do + if [[ -e lib${l}.a ]]; then + mv lib{,atl}"${l}.a" + use static-libs && mv "${S}"_static/lib/lib{,atl}"${l}.a" + fi + done + + [[ -e libptcblas.a ]] && PTLIBS="-lpthread" + + # atlas + atlas_install_libs libatlas.a -lm "${PTLIBS}" + + # cblas + atlas_install_libs libatlcblas.a -lm -L. -latlas + + # cblas threaded + [[ -e libptcblas.a ]] && \ + atlas_install_libs libptcblas.a -lm -L. -latlas "${PTLIBS}" + + if use lapack; then + # clapack + atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas + + # clapack threaded + [[ -e libptclapack.a ]] && \ + atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas "${PTLIBS}" + fi + + if use fortran; then + LINK=$(tc-getF77) + + # blas + atlas_install_libs libf77blas.a -lm -L. -latlas + + # blas threaded + [[ -e libptf77blas.a ]] && \ + atlas_install_libs libptf77blas.a -lm -L. -latlas "${PTLIBS}" + + if use lapack; then + # lapack + atlas_install_libs libatllapack.a \ + -lm -L. -latlas -latlcblas -lf77blas + # lapack threaded + [[ -e libptlapack.a ]] && \ + atlas_install_libs libptlapack.a -lm -L. -latlas -lptcblas -lptf77blas "${PTLIBS}" + fi + fi + + cd "${S}" || die + insinto "/usr/include/${PN}" + doins include/*.h + + cd "${S}/doc" || die + dodoc INDEX.txt AtlasCredits.txt ChangeLog + use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf + use doc && use fortran && dodoc f77blas*pdf + use doc && use fortran && use lapack && dodoc -- *lapack*pdf +} diff --git a/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch b/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch new file mode 100644 index 000000000000..5a8a257a1a9b --- /dev/null +++ b/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch @@ -0,0 +1,297 @@ +From 3d330dc50a608581c81d269b661af0c938155428 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:10:33 +0200 +Subject: [PATCH 1/5] main must return int + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/CONFIG/src/backend/archinfo_aix.c ++++ b/CONFIG/src/backend/archinfo_aix.c +@@ -180,7 +180,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_freebsd.c ++++ b/CONFIG/src/backend/archinfo_freebsd.c +@@ -243,7 +243,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_irix.c ++++ b/CONFIG/src/backend/archinfo_irix.c +@@ -198,7 +198,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_linux.c ++++ b/CONFIG/src/backend/archinfo_linux.c +@@ -571,7 +571,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_sfu.c ++++ b/CONFIG/src/backend/archinfo_sfu.c +@@ -151,7 +151,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_sunos.c ++++ b/CONFIG/src/backend/archinfo_sunos.c +@@ -212,7 +212,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_win.c ++++ b/CONFIG/src/backend/archinfo_win.c +@@ -221,7 +221,7 @@ int ProbeThrottle() + return(iret); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int flags, CacheLevel, ncpu, mhz, bits, sure; + enum MACHTYPE arch=MACHOther; +--- a/CONFIG/src/backend/archinfo_x86.c ++++ b/CONFIG/src/backend/archinfo_x86.c +@@ -460,7 +460,7 @@ int GetFlags(int nargs, char **args, int *CacheLevel) + return(flag); + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int ierr, x86_64, flags, CacheLevel; + unsigned family, model; +--- a/bin/extract.c ++++ b/bin/extract.c +@@ -3904,7 +3904,7 @@ void HandleLine(EXTENV *EE, char *line) + } + + +-main(int nargs, char *args[]) ++int main(int nargs, char *args[]) + { + char line[LNLEN], *path; + int i; +--- a/bin/gpmmtst.c ++++ b/bin/gpmmtst.c +@@ -783,11 +783,11 @@ void GetFlags(int nargs, char *args[], int *TEST, + #endif + } + } +-___main(){} +-__main(){} +-MAIN__(){} +-_MAIN_(){} +-main(int nargs, char *args[]) ++int ___main(){} ++int __main(){} ++int MAIN__(){} ++int _MAIN_(){} ++int main(int nargs, char *args[]) + /* + * tst <tst> <# TA> <TA's> <# TB's> <TB's> <M0> <MN> <incM> <N0> <NN> <incN> + * <K0> <KN> <incK> <# alphas> <alphas> <# betas> <betas> +--- a/bin/invtst.c ++++ b/bin/invtst.c +@@ -743,7 +743,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh, + } + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int MFLOP, CacheSize, ldagap, nord, nuplo, N0, NN, incN; + enum TEST_UPLO *Uplo; +--- a/bin/llttst.c ++++ b/bin/llttst.c +@@ -538,7 +538,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh, + } + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int MFLOP, CacheSize, ldagap, nuplo, N0, NN, incN; + TYPE thresh; +--- a/bin/lutst.c ++++ b/bin/lutst.c +@@ -476,7 +476,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh, + if (*M0 == -1) *M0 = *MN = *incM = *MisN = 1; + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int MFLOP, CacheSize, LdaIsM, MisN, NisM, M0, MN, incM, N0, NN, incN; + int norders; +--- a/bin/slvtst.c ++++ b/bin/slvtst.c +@@ -743,7 +743,7 @@ static int DoAllTests(int nrep, int N0, int NN, int incN, int R0, int RN, + else fprintf(stdout, "\n%d TESTS RUN, %d FAILED!!\n\n", i, ierr); + return(ierr); + } +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int ierr, N0, NN, incN, R0, RN, incR, ldagap, ldbgap, nord, nuplo; + int CS, MFLOP, QR, nrep; +--- a/bin/uumtst.c ++++ b/bin/uumtst.c +@@ -566,7 +566,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh, + } + } + +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + int MFLOP, CacheSize, ldagap, nuplo, N0, NN, incN; + TYPE thresh; +--- a/lib/qr.c ++++ b/lib/qr.c +@@ -5,7 +5,7 @@ + #elif defined(UpCase) + #define dgeqrf_ DGEQRF + #endif +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + extern void dgeqrf_(F77_INTEGER*,F77_INTEGER*,double*,F77_INTEGER*, + double*,double*,F77_INTEGER*,F77_INTEGER*); +--- a/lib/test_dynlink.c ++++ b/lib/test_dynlink.c +@@ -1,6 +1,6 @@ + #include <cblas.h> + #include <clapack.h> +-main(int nargs, char **args) ++int main(int nargs, char **args) + { + double A[1]={1.0}, b[1]={1.0}; + int ipiv[1]; +--- a/tune/sysinfo/masrch.c ++++ b/tune/sysinfo/masrch.c +@@ -169,7 +169,7 @@ int FindMflop + return(mf); + } + +-FindNreg ++int FindNreg + ( + char pre, /* precision: s,d,q */ + int fmf, /* number of mflops to force timer on */ +-- +2.45.2 + + +From 537f1afe821d5bad24fe401c8cb1294f2235f5b7 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:11:42 +0200 +Subject: [PATCH 2/5] add missing function declarations + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/CONFIG/include/atlconf_misc.h ++++ b/CONFIG/include/atlconf_misc.h +@@ -41,6 +41,8 @@ char *NameWithoutPath(char *file); + char *GetPathWithoutName(char *file); + void GetGccVers(char *gcc, int *comp, int *major, int *minor, int *patch); + int CompIsGcc(char *comp); ++int CompIsClang(char *comp); ++int CompIsMinGW(char *comp); + int CompIsAppleGcc(char *comp); + int CompIsMIPSpro(char *comp); + int CompIsPathScale(char *comp); +-- +2.45.2 + + +From 975b10d484ec2c18fcc3eccbdf30fd166f2072c3 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:11:49 +0200 +Subject: [PATCH 3/5] fix typo osnam -> osname + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/CONFIG/src/probe_arch.c ++++ b/CONFIG/src/probe_arch.c +@@ -198,7 +198,7 @@ int ConfirmPtrbits(enum OSTYPE OS0, enum ASMDIA asmd0, char *targ0, + /* + * Try OS-specific probe, compiling with -m64 (assumes gcc workalike) + */ +- i = 1 + strlen(frm) + strlen(osnam) + strlen(osnam[OS]) + ++ i = 1 + strlen(frm) + strlen(osname) + strlen(osnam[OS]) + + strlen(ASMNAM[asmd]) + strlen(flag) + strlen(targ) + strlen(find); + cmnd = malloc(i*sizeof(char)); + assert(cmnd); +-- +2.45.2 + + +From 550c8ff309c6896635bc86001af6dbecbf043d51 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:15:08 +0200 +Subject: [PATCH 4/5] use long long in format string + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/bin/atlas_install.c ++++ b/bin/atlas_install.c +@@ -278,7 +278,7 @@ long long GetFirstLongHex(char *ln) + { + if (isxdigit(ln[i])) + { +- sscanf(ln+i, "%lx", &iret); ++ sscanf(ln+i, "%llx", &iret); + break; + } + } +-- +2.45.2 + + +From 9a9d7f5f83ea6235ee8e40d49b93545bb3c5b7c2 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 26 Jul 2024 00:16:03 +0200 +Subject: [PATCH 5/5] add missing string.h include + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- a/bin/qrtst.c ++++ b/bin/qrtst.c +@@ -41,6 +41,7 @@ + #ifndef TimeF77 + #include "clapack.h" + #endif ++#include <string.h> + + #ifdef ATL_FULL_LAPACK + #include "atlas_C2Flapack.h" +-- +2.45.2 + diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild index ea0659f222d9..330bb74633f7 100644 --- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild +++ b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-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 @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} dev-cpp/eigen:3 test? ( dev-cpp/gtest )" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) qt5? ( dev-qt/linguist-tools:5 )" PATCHES=( diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.97.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.97.0.ebuild index e702d214d629..6d9cb22617aa 100644 --- a/sci-libs/avogadrolibs/avogadrolibs-1.97.0.ebuild +++ b/sci-libs/avogadrolibs/avogadrolibs-1.97.0.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 @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} dev-cpp/eigen:3 test? ( dev-cpp/gtest )" BDEPEND=" - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) qt5? ( dev-qt/linguist-tools:5 )" PATCHES=( diff --git a/sci-libs/beagle/Manifest b/sci-libs/beagle/Manifest deleted file mode 100644 index 2f7030591c33..000000000000 --- a/sci-libs/beagle/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST beagle-3.0.3.tar.gz 5002994 BLAKE2B f23c3178a52333aef0d1ba71d3a9ae240a805f016c9f619f59d76f818d9a647505af608aab2e0eb19efba6c6a3ed9d14455e03cfaa38df2b324689ba8139b849 SHA512 2f8f027f3f24d0fd287e27a80fe5b24e18550144add06fb8157dd03f734f5ce212f62889720c81fd33246fa7086e9b913802ec0c5155df5bd801c36888b346cb diff --git a/sci-libs/beagle/beagle-3.0.3-r1.ebuild b/sci-libs/beagle/beagle-3.0.3-r1.ebuild deleted file mode 100644 index 27431973b872..000000000000 --- a/sci-libs/beagle/beagle-3.0.3-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Open BEAGLE, a versatile EC/GA/GP framework" -SRC_URI="mirror://sourceforge/beagle/${P}.tar.gz" -HOMEPAGE="https://chgagne.github.io/beagle/" - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples static-libs" - -RDEPEND=" - sys-libs/zlib - !app-misc/beagle - !dev-libs/libbeagle" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/${PN}-3.0.3-gcc43.patch" - "${FILESDIR}/${PN}-3.0.3-gcc47.patch" - "${FILESDIR}/${PN}-3.0.3-fix-c++14.patch" -) - -src_prepare() { - default - sed -e "s:@LIBS@:@LIBS@ -lpthread:" \ - -i PACC/Threading/Makefile.in || die -} - -src_configure() { - econf \ - --enable-optimization \ - $(use_enable static-libs static) -} - -src_compile() { - default - use doc && emake doc -} - -src_install() { - use doc && local HTML_DOCS=( refman/. ) - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - default - - if ! use static-libs; then - find "${D}" -name '*.la' -delete || die - fi -} diff --git a/sci-libs/beagle/files/beagle-3.0.3-fix-c++14.patch b/sci-libs/beagle/files/beagle-3.0.3-fix-c++14.patch deleted file mode 100644 index 896b58225890..000000000000 --- a/sci-libs/beagle/files/beagle-3.0.3-fix-c++14.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix building with C++14, where destructors are noexcept(true) by default. -See also: https://bugs.gentoo.org/show_bug.cgi?id=597342 - ---- a/PACC/Threading/Thread.cpp -+++ b/PACC/Threading/Thread.cpp -@@ -79,6 +79,9 @@ - \attention If the destructor in the derived thread class (e.g. MyThread above) does not wait for thread termination, the potential hazardous situation is that the runtime system will have deleted all of its members before calling this destructor (in C++, class destructors are called in reversed sequence). Thus, the still running thread could access deleted data members with unpredictable and unexpected results. So beware! - */ - Threading::Thread::~Thread(void) -+#if __cplusplus >= 201103L -+ noexcept(false) -+#endif - { - lock(); - if(mThread) { ---- a/PACC/Threading/Thread.hpp -+++ b/PACC/Threading/Thread.hpp -@@ -53,7 +53,11 @@ - class Thread : public Condition { - public: - Thread(void); -- virtual ~Thread(void); -+ virtual ~Thread(void) -+#if __cplusplus >= 201103L -+ noexcept(false) -+#endif -+ ; - - void cancel(void); - bool isRunning(void) const; diff --git a/sci-libs/beagle/files/beagle-3.0.3-gcc43.patch b/sci-libs/beagle/files/beagle-3.0.3-gcc43.patch deleted file mode 100644 index 608ce388e793..000000000000 --- a/sci-libs/beagle/files/beagle-3.0.3-gcc43.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -rupN beagle-3.0.3b/PACC/Math/Matrix.cpp beagle-3.0.3/PACC/Math/Matrix.cpp ---- beagle-3.0.3b/PACC/Math/Matrix.cpp 2009-01-20 23:38:39.000000000 -0400 -+++ beagle-3.0.3/PACC/Math/Matrix.cpp 2009-01-21 00:26:46.000000000 -0400 -@@ -40,6 +40,7 @@ - #include <stdexcept> - #include <iomanip> - #include <cmath> -+#include <climits> - - using namespace std; - using namespace PACC; -diff -rupN beagle-3.0.3b/PACC/Math/Vector.hpp beagle-3.0.3/PACC/Math/Vector.hpp ---- beagle-3.0.3b/PACC/Math/Vector.hpp 2009-01-20 23:38:39.000000000 -0400 -+++ beagle-3.0.3/PACC/Math/Vector.hpp 2009-01-21 00:26:29.000000000 -0400 -@@ -42,6 +42,7 @@ - #include "XML/Document.hpp" - #include "XML/Streamer.hpp" - #include <cmath> -+#include <algorithm> - - namespace PACC { - -diff -rupN beagle-3.0.3b/PACC/Socket/Cafe.cpp beagle-3.0.3/PACC/Socket/Cafe.cpp ---- beagle-3.0.3b/PACC/Socket/Cafe.cpp 2009-01-20 23:38:39.000000000 -0400 -+++ beagle-3.0.3/PACC/Socket/Cafe.cpp 2009-01-21 00:31:09.000000000 -0400 -@@ -35,6 +35,7 @@ - - #include "Socket/Cafe.hpp" - #include <iostream> -+#include <cstring> - - #ifdef WIN32 - ///////////// specifics for windows ///////////// -diff -rupN beagle-3.0.3b/PACC/Socket/Port.cpp beagle-3.0.3/PACC/Socket/Port.cpp ---- beagle-3.0.3b/PACC/Socket/Port.cpp 2009-01-20 23:38:39.000000000 -0400 -+++ beagle-3.0.3/PACC/Socket/Port.cpp 2009-01-21 00:30:54.000000000 -0400 -@@ -34,6 +34,7 @@ - */ - - #include "Socket/Port.hpp" -+#include <cstring> - - #ifdef WIN32 - ///////////// specifics for windows ///////////// -diff -rupN beagle-3.0.3b/PACC/Threading/Thread.cpp beagle-3.0.3/PACC/Threading/Thread.cpp ---- beagle-3.0.3b/PACC/Threading/Thread.cpp 2009-01-20 23:38:39.000000000 -0400 -+++ beagle-3.0.3/PACC/Threading/Thread.cpp 2009-01-21 00:28:02.000000000 -0400 -@@ -35,6 +35,7 @@ - - #include "Threading/Thread.hpp" - #include "Util/Assert.hpp" -+#include <cstdlib> - - #ifdef WIN32 - #include <windows.h> -diff -rupN beagle-3.0.3b/PACC/Util/SignalHandler.cpp beagle-3.0.3/PACC/Util/SignalHandler.cpp ---- beagle-3.0.3b/PACC/Util/SignalHandler.cpp 2009-01-20 23:38:39.000000000 -0400 -+++ beagle-3.0.3/PACC/Util/SignalHandler.cpp 2009-01-20 23:44:20.000000000 -0400 -@@ -37,6 +37,7 @@ - #include "Util/Assert.hpp" - #include <signal.h> - #include <stdexcept> -+#include <cstdlib> - - using namespace std; - using namespace PACC; -diff -rupN beagle-3.0.3b/PACC/Util/Tokenizer.cpp beagle-3.0.3/PACC/Util/Tokenizer.cpp ---- beagle-3.0.3b/PACC/Util/Tokenizer.cpp 2009-01-20 23:38:39.000000000 -0400 -+++ beagle-3.0.3/PACC/Util/Tokenizer.cpp 2009-01-20 23:44:10.000000000 -0400 -@@ -36,6 +36,8 @@ - #include "Util/Tokenizer.hpp" - #include "Util/Assert.hpp" - #include <stdexcept> -+#include <cstring> -+#include <cstdlib> - - using namespace std; - using namespace PACC; -diff -rupN beagle-3.0.3b/PACC/XML/Node.cpp beagle-3.0.3/PACC/XML/Node.cpp ---- beagle-3.0.3b/PACC/XML/Node.cpp 2009-01-20 23:38:39.000000000 -0400 -+++ beagle-3.0.3/PACC/XML/Node.cpp 2009-01-20 23:45:09.000000000 -0400 -@@ -39,6 +39,7 @@ - #include "Util/Assert.hpp" - #include <sstream> - #include <stdexcept> -+#include <cstring> - - using namespace std; - using namespace PACC; diff --git a/sci-libs/beagle/files/beagle-3.0.3-gcc47.patch b/sci-libs/beagle/files/beagle-3.0.3-gcc47.patch deleted file mode 100644 index b74fb32b9989..000000000000 --- a/sci-libs/beagle/files/beagle-3.0.3-gcc47.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/beagle/include/beagle/RouletteT.hpp -+++ b/beagle/include/beagle/RouletteT.hpp -@@ -87,7 +87,7 @@ - Beagle_StackTraceBeginM(); - Beagle_AssertM(inWeight>=0.0); - if(VectorType::empty()==false) inWeight += VectorType::back().first; -- push_back(std::make_pair(inWeight,inValue)); -+ this->push_back(std::make_pair(inWeight,inValue)); - Beagle_StackTraceEndM("void RouletteT<T>::insert(const T& inValue, double inWeight)"); - } diff --git a/sci-libs/beagle/metadata.xml b/sci-libs/beagle/metadata.xml deleted file mode 100644 index 61308c44d1d4..000000000000 --- a/sci-libs/beagle/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription> - Open BEAGLE is a C++ Evolutionary Computation (EC) framework. It provides an high-level software environment to do any kind of EC, with support for tree-based genetic programming, bit string and real-valued genetic algorithms, and evolution strategy. - </longdescription> - <upstream> - <remote-id type="sourceforge">beagle</remote-id> - <remote-id type="github">chgagne/beagle</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest index feff64952906..6671de7c7fc6 100644 --- a/sci-libs/blis/Manifest +++ b/sci-libs/blis/Manifest @@ -1 +1,2 @@ DIST blis-0.9.0.tar.gz 15078619 BLAKE2B f7c9632024e0adbba370a4077a7a47f05c54779ad6195b2ccda0950df8e784b8988b4338758ec2fabd424a69009010f8f02cbaef0eda1d74f6794127b43b4f70 SHA512 01e1990eefa4387839ac404089e4ffa32922ceaa30a1747c08a931c67706bcf29fed9d25e30c0faa36bba4f460821290e7973ed6b657d2cd95e126caaf853f81 +DIST blis-1.0.tar.gz 15714356 BLAKE2B 7e9b6132ab556adf7ccb2d1bff6c5195eb2f48a9193a6df57d409e25b42f1aaa64f053f97996a6467ad42cbe5848c3689f3e6c501579d5d1083523ca9ed52ce1 SHA512 91cd2a2944762e584f11cb931ba11c4b296e93040b553f105ba8579d748a49cfcb6db8ae2ce1b5a537c0ae88182c9d212a4a5daa757ca4d0a7beee552d2eb55c diff --git a/sci-libs/blis/blis-0.9.0.ebuild b/sci-libs/blis/blis-0.9.0-r1.ebuild index 171a0e9dacbe..1bf6e1ea736e 100644 --- a/sci-libs/blis/blis-0.9.0.ebuild +++ b/sci-libs/blis/blis-0.9.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 +PYTHON_COMPAT=( python3_{10..13} ) +inherit python-any-r1 toolchain-funcs DESCRIPTION="BLAS-like Library Instantiation Software Framework" HOMEPAGE="https://github.com/flame/blis" @@ -13,7 +13,12 @@ SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index" +CPU_USE=( + cpu_flags_ppc_{vsx,vsx3} + cpu_flags_arm_{neon,v7,v8,sve} + cpu_flags_x86_{ssse3,avx,fma3,fma4,avx2,avx512vl} +) +IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index ${CPU_USE[@]}" REQUIRED_USE=" ?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )" @@ -25,7 +30,10 @@ DEPEND=" )" RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl +" PATCHES=( "${FILESDIR}"/${PN}-0.6.0-blas-provider.patch @@ -34,9 +42,31 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9.0-rpath.patch ) +get_confname() { + local confname=generic + if use x86 || use amd64; then + use cpu_flags_x86_ssse3 && confname=penryn + use cpu_flags_x86_avx && use cpu_flags_x86_fma3 && confname=sandybridge + use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && confname=bulldozer + use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && use cpu_flags_x86_fma3 && confname=piledriver + use cpu_flags_x86_avx2 && confname=haswell + use cpu_flags_x86_avx512vl && confname=skx + elif use arm || use arm64; then + use arm && confname=arm32 + use arm64 && confname=arm64 + use cpu_flags_arm_neon && use cpu_flags_arm_v7 && confname=cortexa9 + use cpu_flags_arm_v8 && confname=cortexa53 + use cpu_flags_arm_sve && confname=armsve + elif use ppc || use ppc64; then + confname=power + use cpu_flags_ppc_vsx && confname=power7 + use cpu_flags_ppc_vsx3 && confname=power9 + fi + echo ${confname} +} + src_configure() { local BLIS_FLAGS=() - local confname # determine flags if use openmp; then BLIS_FLAGS+=( -t openmp ) @@ -46,17 +76,9 @@ src_configure() { BLIS_FLAGS+=( -t no ) fi use 64bit-index && BLIS_FLAGS+=( -b 64 -i 64 ) - # determine config name - case "${ARCH}" in - "x86" | "amd64") - confname=auto ;; - "ppc64") - confname=generic ;; - *) - confname=generic ;; - esac + # This is not an autotools configure file. We don't use econf here. - ./configure \ + CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ./configure \ --enable-verbose-make \ --prefix="${BROOT}"/usr \ --libdir="${BROOT}"/usr/$(get_libdir) \ @@ -65,7 +87,7 @@ src_configure() { --enable-cblas \ "${BLIS_FLAGS[@]}" \ --enable-shared \ - $confname || die + $(get_confname) || die } src_compile() { @@ -75,7 +97,8 @@ src_compile() { } src_test() { - LD_LIBRARY_PATH="${S}/lib/haswell" emake check + LD_LIBRARY_PATH=lib/$(get_confname) emake testblis-fast + ./testsuite/check-blistest.sh ./output.testsuite || die } src_install() { diff --git a/sci-libs/blis/blis-1.0.ebuild b/sci-libs/blis/blis-1.0.ebuild new file mode 100644 index 000000000000..348b809181a4 --- /dev/null +++ b/sci-libs/blis/blis-1.0.ebuild @@ -0,0 +1,137 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="BLAS-like Library Instantiation Software Framework" +HOMEPAGE="https://github.com/flame/blis" +SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +CPU_USE=( + cpu_flags_ppc_{vsx,vsx3} + cpu_flags_arm_{neon,v7,v8,sve} + cpu_flags_x86_{ssse3,avx,fma3,fma4,avx2,avx512vl} +) +IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index ${CPU_USE[@]}" +REQUIRED_USE=" + ?? ( openmp pthread serial ) + ?? ( eselect-ldso 64bit-index )" + +DEPEND=" + eselect-ldso? ( + !app-eselect/eselect-cblas + >=app-eselect/eselect-blas-0.2 + )" + +RDEPEND="${DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.0-blas-provider.patch + # to prevent QA Notice: pkg-config files with wrong LDFLAGS detected + "${FILESDIR}"/${PN}-0.8.1-pkg-config.patch + "${FILESDIR}"/${PN}-0.9.0-rpath.patch + "${FILESDIR}"/${PN}-1.0-no-helper-headers.patch +) + +get_confname() { + local confname=generic + if use x86 || use amd64; then + use cpu_flags_x86_ssse3 && confname=penryn + use cpu_flags_x86_avx && use cpu_flags_x86_fma3 && confname=sandybridge + use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && confname=bulldozer + use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && use cpu_flags_x86_fma3 && confname=piledriver + use cpu_flags_x86_avx2 && confname=haswell + use cpu_flags_x86_avx512vl && confname=skx + elif use arm || use arm64; then + use arm && confname=arm32 + use arm64 && confname=arm64 + use cpu_flags_arm_neon && use cpu_flags_arm_v7 && confname=cortexa9 + use cpu_flags_arm_v8 && confname=cortexa53 + use cpu_flags_arm_sve && confname=armsve + elif use ppc || use ppc64; then + confname=power + use cpu_flags_ppc_vsx && confname=power7 + use cpu_flags_ppc_vsx3 && confname=power9 + fi + echo ${confname} +} + +src_configure() { + local BLIS_FLAGS=() + # determine flags + if use openmp; then + BLIS_FLAGS+=( -t openmp ) + elif use pthread; then + BLIS_FLAGS+=( -t pthreads ) + else + BLIS_FLAGS+=( -t no ) + fi + use 64bit-index && BLIS_FLAGS+=( -b 64 -i 64 ) + + # This is not an autotools configure file. We don't use econf here. + CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ./configure \ + --enable-verbose-make \ + --prefix="${BROOT}"/usr \ + --libdir="${BROOT}"/usr/$(get_libdir) \ + $(use_enable static-libs static) \ + --enable-blas \ + --enable-cblas \ + "${BLIS_FLAGS[@]}" \ + --enable-shared \ + $(get_confname) || die +} + +src_compile() { + DEB_LIBBLAS=libblas.so.3 DEB_LIBCBLAS=libcblas.so.3 \ + LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \ + default +} + +src_test() { + LD_LIBRARY_PATH=lib/$(get_confname) emake testblis-fast + ./testsuite/check-blistest.sh ./output.testsuite || die +} + +src_install() { + default + use doc && dodoc README.md docs/*.md + + if use eselect-ldso; then + insinto /usr/$(get_libdir)/blas/blis + doins lib/*/lib{c,}blas.so.3 + dosym libblas.so.3 usr/$(get_libdir)/blas/blis/libblas.so + dosym libcblas.so.3 usr/$(get_libdir)/blas/blis/libcblas.so + fi +} + +pkg_postinst() { + use eselect-ldso || return + + local libdir=$(get_libdir) me="blis" + + # check blas + eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me} + local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) + if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then + eselect blas set ${libdir} ${me} + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + else + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + elog "To use blas [${me}] implementation, you have to issue (as root):" + elog "\t eselect blas set ${libdir} ${me}" + fi +} + +pkg_postrm() { + use eselect-ldso && eselect blas validate +} diff --git a/sci-libs/blis/files/blis-1.0-no-helper-headers.patch b/sci-libs/blis/files/blis-1.0-no-helper-headers.patch new file mode 100644 index 000000000000..ec747824e7dc --- /dev/null +++ b/sci-libs/blis/files/blis-1.0-no-helper-headers.patch @@ -0,0 +1,13 @@ +Don't install one-line "helper header" cblas.h into /usr/include, +as it conflicts with sci-libs/lapack. +--- a/Makefile ++++ b/Makefile +@@ -1052,7 +1052,7 @@ endif + + # --- Install header rules --- + +-install-headers: check-env $(MK_INCL_DIR_INST) install-helper-headers ++install-headers: check-env $(MK_INCL_DIR_INST) + + # Rule for installing main headers. + $(MK_INCL_DIR_INST): $(HEADERS_TO_INSTALL) $(CONFIG_MK_FILE) diff --git a/sci-libs/bliss/bliss-0.77-r1.ebuild b/sci-libs/bliss/bliss-0.77-r1.ebuild new file mode 100644 index 000000000000..af5467295b07 --- /dev/null +++ b/sci-libs/bliss/bliss-0.77-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +SRC_URI="https://users.aalto.fi/~tjunttil/${PN}/downloads/${P}.zip" +DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs" +HOMEPAGE="https://users.aalto.fi/~tjunttil/bliss/index.html" + +LICENSE="LGPL-3" +SLOT="0/1" +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="gmp" + +RDEPEND="gmp? ( dev-libs/gmp:0= )" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" +PATCHES=( + "${FILESDIR}/${PN}-0.77-install.patch" + "${FILESDIR}/${PN}-0.77-libbliss-underlinking.patch" +) + +src_configure() { + local mycmakeargs=( + -DUSE_GMP="$(usex gmp)" + ) + + cmake_src_configure +} diff --git a/sci-libs/bliss/files/bliss-0.77-libbliss-underlinking.patch b/sci-libs/bliss/files/bliss-0.77-libbliss-underlinking.patch new file mode 100644 index 000000000000..faf04d7ae6e3 --- /dev/null +++ b/sci-libs/bliss/files/bliss-0.77-libbliss-underlinking.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/922651 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cfdb0a6..e0fd51a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,6 +51,9 @@ endif(MSVC) + # Add the shared library + add_library(bliss SHARED ${BLISS_SOURCE_FILES}) + set_property(TARGET bliss PROPERTY POSITION_INDEPENDENT_CODE 1) ++if(USE_GMP) ++ target_link_libraries(bliss ${GMP_LIBRARIES}) ++endif(USE_GMP) + + # Add the static library + add_library(bliss_static STATIC ${BLISS_SOURCE_FILES}) diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest index c9d6abf7e8cb..44ea8a6b6b7c 100644 --- a/sci-libs/branca/Manifest +++ b/sci-libs/branca/Manifest @@ -1 +1,4 @@ -DIST branca-0.6.0.tar.gz 40167 BLAKE2B 23cbe442862e9575d84dfb5bb1760acf2a1301be0f68bedc9965d9d3a8be090755f78640ed919b5ba8521ab30e8c52c69ea87ff2772d9fd6b3e338680b5219bb SHA512 e80b3d173bc487857ab42d10365540e91cb6fc5def61bb76f418e2da8e74c9bf69e0ca46f86a47f96f5db48d0e98d6ad3091107dd1a5ca479c52adbfa3a79a9c +DIST branca-0.7.0.tar.gz 42990 BLAKE2B b8de083b0b94d35dbb6df5d230e388832fe027d756767d24ae8091f25d9846ac1f2ae72799aa83583c99ec02d955c7f8cb80183f1543e503d0a802ce051acac5 SHA512 bfe6afd93752dda57e55ba7bdd433e079b51798056b2be8d9c19d4ccc4ed94cc95b733cabf0981c908887c1f8a96e16bd11cb1b495243ac91df4c1c1c1253282 +DIST branca-0.7.1.tar.gz 43005 BLAKE2B 2f2834d87e32ef5507273b14b1b8fcebc33d7eae49e0ffb8e834c540b1a329d177805ccbc1441cd522092d396ba98f69f3c8ab95254068d7b352e6f7df52c60d SHA512 70b6e361e93a01c319928890a40e3aa1e887e718b0736afe0a65bc45fe56fe6ca24a4c50db099066d84876cc8efd540a5cc14aa48607671ac068df3ae5124d29 +DIST branca-0.7.2.tar.gz 42586 BLAKE2B 3bb6a1f93babb80788fbc1cbd37d8b0c2d5c975c9a98c5816298e37a447bcffb7742a768a0ad2fbb58af5ce0650ef28fdef42e8e4d505bbf29ab10c87ed388d6 SHA512 ad62e4496b43405dbc54b2cca35ee9d0265b8deeeb3df3b0868e63e6890fe491bfc4987318d74c1e78d83f05bdf56bfd570609699860ab1af9d189357bf00107 +DIST branca-0.8.0.tar.gz 43075 BLAKE2B 46779d59ca981c1f6e76193b1776c77a7c455b67d93115027b17f96b8c4df737502dc32feb6ce242e0f2fec9ed4541ed79c6856e85d740dec40d092000873b32 SHA512 b5e8ac51a5d1b70ee72066ee16c9fc8d37623ca807c67cf0f5a2daba37f901ecd9eb81b03857c222ace1f36fb71a9a348aae7079deccf657eaabcc1dc6b64158 diff --git a/sci-libs/branca/branca-0.6.0-r1.ebuild b/sci-libs/branca/branca-0.7.0-r2.ebuild index 91ea6850fcc5..530dc31506f2 100644 --- a/sci-libs/branca/branca-0.6.0-r1.ebuild +++ b/sci-libs/branca/branca-0.7.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_USE_PEP517=setuptools export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} inherit distutils-r1 @@ -16,15 +16,21 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -PATCHES=( "${FILESDIR}"/${P}-test.patch ) +PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/selenium[${PYTHON_USEDEP}] )" -BDEPEND="" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm + test? ( + dev-python/selenium[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + )" distutils_enable_tests pytest +distutils_enable_sphinx docs/source \ + dev-python/nbsphinx + python_test() { epytest -m 'not headless' } diff --git a/sci-libs/branca/branca-0.7.1.ebuild b/sci-libs/branca/branca-0.7.1.ebuild new file mode 100644 index 000000000000..530dc31506f2 --- /dev/null +++ b/sci-libs/branca/branca-0.7.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +inherit distutils-r1 + +DESCRIPTION="spinoff from folium, host the non-map-specific features" +HOMEPAGE="https://github.com/python-visualization/branca" +SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) + +RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm + test? ( + dev-python/selenium[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +distutils_enable_sphinx docs/source \ + dev-python/nbsphinx + +python_test() { + epytest -m 'not headless' +} diff --git a/sci-libs/branca/branca-0.7.2.ebuild b/sci-libs/branca/branca-0.7.2.ebuild new file mode 100644 index 000000000000..6fbc4495a341 --- /dev/null +++ b/sci-libs/branca/branca-0.7.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +inherit distutils-r1 + +DESCRIPTION="spinoff from folium, host the non-map-specific features" +HOMEPAGE="https://github.com/python-visualization/branca" +SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) + +RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm + test? ( + dev-python/selenium[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +distutils_enable_sphinx docs/source \ + dev-python/nbsphinx + +python_test() { + epytest -m 'not headless' +} diff --git a/sci-libs/branca/branca-0.8.0.ebuild b/sci-libs/branca/branca-0.8.0.ebuild new file mode 100644 index 000000000000..6fbc4495a341 --- /dev/null +++ b/sci-libs/branca/branca-0.8.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +inherit distutils-r1 + +DESCRIPTION="spinoff from folium, host the non-map-specific features" +HOMEPAGE="https://github.com/python-visualization/branca" +SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) + +RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm + test? ( + dev-python/selenium[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +distutils_enable_sphinx docs/source \ + dev-python/nbsphinx + +python_test() { + epytest -m 'not headless' +} diff --git a/sci-libs/buddy/buddy-2.4-r1.ebuild b/sci-libs/buddy/buddy-2.4-r1.ebuild index 004107ea6cf6..8200f38f8f4f 100644 --- a/sci-libs/buddy/buddy-2.4-r1.ebuild +++ b/sci-libs/buddy/buddy-2.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit fortran-2 DESCRIPTION="Binary Decision Diagram Package" HOMEPAGE="https://sourceforge.net/projects/buddy/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="buddy" SLOT="0" diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 0ee75499ccbe..246ab4d21a1a 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,3 +1,3 @@ -DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 -DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14 -DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43 +DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0 +DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c +DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587 diff --git a/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild index 67ab76e8ed76..6649975ddf2d 100644 --- a/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild +++ b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-single-r1 cmake cuda flag-o-matic prefix +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=5.7 +inherit python-single-r1 cmake cuda flag-o-matic prefix rocm MYPN=pytorch MYP=${MYPN}-${PV} @@ -14,19 +15,21 @@ HOMEPAGE="https://pytorch.org/" SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${MYP}.tar.gz" +S="${WORKDIR}"/${MYP} + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" +IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" RESTRICT="test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} ffmpeg? ( opencv ) mpi? ( distributed ) - tensorpipe? ( distributed ) - distributed? ( tensorpipe ) gloo? ( distributed ) -" # ?? ( cuda rocm ) + ?? ( cuda rocm ) + rocm? ( || ( ${ROCM_REQUIRED_USE} ) ) +" # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 RDEPEND=" @@ -38,15 +41,15 @@ RDEPEND=" dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef - sci-libs/lapack - >=sci-libs/onnx-1.12.0 + virtual/lapack + sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* - dev-libs/cudnn-frontend:0/8 - <dev-util/nvidia-cuda-toolkit-12:=[profiler] + >=dev-libs/cudnn-frontend-0.9.2:0/8 + <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) - fbgemm? ( dev-libs/FBGEMM ) + fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) @@ -54,37 +57,56 @@ RDEPEND=" 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 ) - tensorpipe? ( sci-libs/tensorpipe[cuda?] ) + rocm? ( + =dev-util/hip-5.7* + =dev-libs/rccl-5.7*[${ROCM_USEDEP}] + =sci-libs/rocThrust-5.7*[${ROCM_USEDEP}] + =sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}] + =sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}] + =sci-libs/hipFFT-5.7*[${ROCM_USEDEP}] + =sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}] + =sci-libs/hipRAND-5.7*[${ROCM_USEDEP}] + =sci-libs/hipCUB-5.7*[${ROCM_USEDEP}] + =sci-libs/hipSOLVER-5.7*[${ROCM_USEDEP}] + =sci-libs/miopen-5.7*[${ROCM_USEDEP}] + =dev-util/roctracer-5.7*[${ROCM_USEDEP}] + ) + distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) + mkl? ( sci-libs/mkl ) + openblas? ( sci-libs/openblas ) " DEPEND=" ${RDEPEND} - dev-cpp/eigen - cuda? ( dev-libs/cutlass ) + cuda? ( >=dev-libs/cutlass-3.1.0 ) + onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers - sci-libs/kineto + >=sci-libs/kineto-0.4.0_p20231031 $(python_gen_cond_dep ' dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] ') " -S="${WORKDIR}"/${MYP} - PATCHES=( - "${FILESDIR}"/${PN}-2.0.0-gentoo.patch + "${FILESDIR}"/${PN}-2.2.1-gentoo.patch "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch "${FILESDIR}"/${PN}-2.0.0-gcc13.patch "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch + "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch + "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch + "${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch + "${FILESDIR}"/${P}-musl.patch ) src_prepare() { @@ -111,6 +133,17 @@ src_prepare() { 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() { @@ -133,10 +166,6 @@ src_configure() { -DUSE_CCACHE=OFF -DUSE_CUDA=$(usex cuda) - -DUSE_CUDNN=$(usex cuda) - -DUSE_FAST_NVCC=$(usex cuda) - -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" - -DBUILD_NVFUSER=$(usex cuda) -DUSE_DISTRIBUTED=$(usex distributed) -DUSE_MPI=$(usex mpi) -DUSE_FAKELOWP=OFF @@ -148,19 +177,18 @@ src_configure() { -DUSE_KINETO=OFF # TODO -DUSE_LEVELDB=OFF -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma - -DUSE_MKLDNN=OFF - -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DUSE_MKLDNN=$(usex onednn) -DUSE_NNPACK=$(usex nnpack) -DUSE_QNNPACK=$(usex qnnpack) -DUSE_XNNPACK=$(usex xnnpack) -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex tensorpipe) + -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=OFF # TODO + -DUSE_ROCM=$(usex rocm) -DUSE_SYSTEM_CPUINFO=ON -DUSE_SYSTEM_PYBIND11=ON -DUSE_UCC=OFF @@ -168,45 +196,74 @@ src_configure() { -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" -DPYTHON_EXECUTABLE="${PYTHON}" -DUSE_ITT=OFF - -DBLAS=Eigen # avoid the use of MKL, if found on the system - -DUSE_SYSTEM_EIGEN_INSTALL=ON -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)" + + mycmakeargs+=( + -DUSE_NCCL=ON + -DUSE_SYSTEM_NCCL=ON + ) + 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 - use cuda && dolib.so "${BUILD_DIR}"/lib/libnvfuser_codegen.so - 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 - mv "${ED}"/usr/include/torch python/torch/include || die cp torch/version.py python/torch/ || die - rm -rf "${ED}"/var/tmp || 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.0.0-r5.ebuild b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild index eaf3e07d46ac..c01e904d8eb0 100644 --- a/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild +++ b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild @@ -1,10 +1,11 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-single-r1 cmake cuda flag-o-matic +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=5.7 +inherit python-single-r1 cmake cuda flag-o-matic prefix rocm MYPN=pytorch MYP=${MYPN}-${PV} @@ -14,18 +15,24 @@ HOMEPAGE="https://pytorch.org/" SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${MYP}.tar.gz" +S="${WORKDIR}"/${MYP} + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" +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 ) - tensorpipe? ( distributed ) gloo? ( distributed ) -" # ?? ( cuda rocm ) + ?? ( cuda rocm ) + rocm? ( + || ( ${ROCM_REQUIRED_USE} ) + !flash + ) +" # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 RDEPEND=" @@ -37,53 +44,73 @@ RDEPEND=" dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef - sci-libs/lapack - >=sci-libs/onnx-1.12.0 + virtual/lapack + sci-libs/onnx sci-libs/foxi cuda? ( - =dev-libs/cudnn-8* - dev-libs/cudnn-frontend:0/8 - <dev-util/nvidia-cuda-toolkit-12:=[profiler] + 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 ) + fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) - mpi? ( sys-cluster/openmpi ) + 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 ) - tensorpipe? ( sci-libs/tensorpipe ) + rocm? ( + >=dev-util/hip-5.7 + >=dev-libs/rccl-5.7[${ROCM_USEDEP}] + >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}] + >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}] + >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}] + >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}] + >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}] + >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}] + >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}] + >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}] + >=sci-libs/miopen-5.7[${ROCM_USEDEP}] + >=dev-util/roctracer-5.7[${ROCM_USEDEP}] + ) + distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) + mkl? ( sci-libs/mkl ) + openblas? ( sci-libs/openblas ) " DEPEND=" ${RDEPEND} - dev-cpp/eigen - cuda? ( dev-libs/cutlass ) + 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 + >=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}] ') " -S="${WORKDIR}"/${MYP} - PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-2.2.1-gentoo.patch "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch - "${FILESDIR}"/${P}-gcc13.patch "${FILESDIR}"/${P}-cudnn_include_fix.patch + "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch + "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch + "${FILESDIR}"/${P}-rocm-fix-std-cpp17.patch + "${FILESDIR}"/${PN}-2.2.2-musl.patch + "${FILESDIR}"/${P}-CMakeFix.patch ) src_prepare() { @@ -96,6 +123,31 @@ 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() { @@ -105,7 +157,7 @@ src_configure() { 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 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" @@ -118,34 +170,30 @@ src_configure() { -DUSE_CCACHE=OFF -DUSE_CUDA=$(usex cuda) - -DUSE_CUDNN=$(usex cuda) - -DUSE_FAST_NVCC=$(usex cuda) - -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" - -DBUILD_NVFUSER=$(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=OFF - -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DUSE_MKLDNN=$(usex onednn) -DUSE_NNPACK=$(usex nnpack) -DUSE_QNNPACK=$(usex qnnpack) -DUSE_XNNPACK=$(usex xnnpack) -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex tensorpipe) + -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=OFF # TODO + -DUSE_ROCM=$(usex rocm) -DUSE_SYSTEM_CPUINFO=ON -DUSE_SYSTEM_PYBIND11=ON -DUSE_UCC=OFF @@ -153,45 +201,74 @@ src_configure() { -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" -DPYTHON_EXECUTABLE="${PYTHON}" -DUSE_ITT=OFF - -DBLAS=Eigen # avoid the use of MKL, if found on the system - -DUSE_SYSTEM_EIGEN_INSTALL=ON -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)" + + mycmakeargs+=( + -DUSE_NCCL=ON + -DUSE_SYSTEM_NCCL=ON + ) 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 - use cuda && dolib.so "${BUILD_DIR}"/lib/libnvfuser_codegen.so - 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 - mv "${ED}"/usr/include/torch python/torch/include || die cp torch/version.py python/torch/ || die - rm -rf "${ED}"/var/tmp || 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-1.13.1-r6.ebuild b/sci-libs/caffe2/caffe2-2.3.1.ebuild index e0d99129a9ac..6355d0083336 100644 --- a/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild +++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild @@ -1,10 +1,11 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-single-r1 cmake cuda flag-o-matic +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=5.7 +inherit python-single-r1 cmake cuda flag-o-matic prefix rocm MYPN=pytorch MYP=${MYPN}-${PV} @@ -14,18 +15,24 @@ HOMEPAGE="https://pytorch.org/" SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${MYP}.tar.gz" +S="${WORKDIR}"/${MYP} + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" +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 ) - tensorpipe? ( distributed ) gloo? ( distributed ) -" # ?? ( cuda rocm ) + ?? ( cuda rocm ) + rocm? ( + || ( ${ROCM_REQUIRED_USE} ) + !flash + ) +" # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 RDEPEND=" @@ -37,52 +44,74 @@ RDEPEND=" dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef - sci-libs/lapack - >=sci-libs/onnx-1.12.0 + virtual/lapack + sci-libs/onnx sci-libs/foxi cuda? ( - =dev-libs/cudnn-8* - dev-libs/cudnn-frontend:0/8 - <dev-util/nvidia-cuda-toolkit-12:=[profiler] + 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 ) + fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) - mpi? ( sys-cluster/openmpi ) + 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 ) - tensorpipe? ( sci-libs/tensorpipe ) - xnnpack? ( sci-libs/XNNPACK ) + rocm? ( + =dev-util/hip-5.7* + =dev-libs/rccl-5.7*[${ROCM_USEDEP}] + =sci-libs/rocThrust-5.7*[${ROCM_USEDEP}] + =sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}] + =sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}] + sci-libs/hipBLASLt + =sci-libs/hipFFT-5.7*[${ROCM_USEDEP}] + =sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}] + =sci-libs/hipRAND-5.7*[${ROCM_USEDEP}] + =sci-libs/hipCUB-5.7*[${ROCM_USEDEP}] + =sci-libs/hipSOLVER-5.7*[${ROCM_USEDEP}] + =sci-libs/miopen-5.7*[${ROCM_USEDEP}] + =dev-util/roctracer-5.7*[${ROCM_USEDEP}] + ) + distributed? ( sci-libs/tensorpipe[cuda?] ) + xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) + mkl? ( sci-libs/mkl ) + openblas? ( sci-libs/openblas ) " DEPEND=" ${RDEPEND} - dev-cpp/eigen - cuda? ( dev-libs/cutlass ) + 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 + >=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}] ') " -S="${WORKDIR}"/${MYP} - PATCHES=( - "${FILESDIR}"/${PN}-1.13.0-gentoo.patch + "${FILESDIR}"/${PN}-2.2.1-gentoo.patch "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch - "${FILESDIR}"/${PN}-1.12.0-clang.patch - "${FILESDIR}"/${P}-tensorpipe.patch + "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch + "${FILESDIR}"/${PN}-2.3.0-cudnn_include_fix.patch + "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch + "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch + "${FILESDIR}"/${PN}-2.3.0-rocm-fix-std-cpp17.patch + "${FILESDIR}"/${PN}-2.2.2-musl.patch + "${FILESDIR}"/${PN}-2.3.0-CMakeFix.patch ) src_prepare() { @@ -95,6 +124,31 @@ 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() { @@ -104,7 +158,7 @@ src_configure() { 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 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" @@ -117,33 +171,30 @@ src_configure() { -DUSE_CCACHE=OFF -DUSE_CUDA=$(usex cuda) - -DUSE_CUDNN=$(usex cuda) - -DUSE_FAST_NVCC=$(usex cuda) - -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" -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=OFF - -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DUSE_MKLDNN=$(usex onednn) -DUSE_NNPACK=$(usex nnpack) -DUSE_QNNPACK=$(usex qnnpack) -DUSE_XNNPACK=$(usex xnnpack) -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex tensorpipe) + -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=OFF # TODO + -DUSE_ROCM=$(usex rocm) -DUSE_SYSTEM_CPUINFO=ON -DUSE_SYSTEM_PYBIND11=ON -DUSE_UCC=OFF @@ -151,29 +202,60 @@ src_configure() { -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" -DPYTHON_EXECUTABLE="${PYTHON}" -DUSE_ITT=OFF - -DBLAS=Eigen # avoid the use of MKL, if found on the system - -DUSE_SYSTEM_EIGEN_INSTALL=ON -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)" + + mycmakeargs+=( + -DUSE_NCCL=ON + -DUSE_SYSTEM_NCCL=ON + ) 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() { @@ -185,9 +267,9 @@ src_install() { rm -rf python mkdir -p python/torch/include || die mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die - mv "${ED}"/usr/include/torch python/torch/include || die cp torch/version.py python/torch/ || die - rm -rf "${ED}"/var/tmp || 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/files/caffe2-1.12.0-clang.patch b/sci-libs/caffe2/files/caffe2-1.12.0-clang.patch deleted file mode 100644 index dd43b06a97a1..000000000000 --- a/sci-libs/caffe2/files/caffe2-1.12.0-clang.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bfdc0358dc37c55af6118fe5d8b6ccd898e003fd Mon Sep 17 00:00:00 2001 -From: Kazuki Sakamoto <kaz@meta.com> -Date: Wed, 21 Dec 2022 11:19:58 +0000 -Subject: [PATCH] Compile fix for Clang + libc++ (#91212) - -Summary: -LLVM 15 has a compile issue with the deprecated __has_trivial_copy. Update the GCC ifdef logic to exclude Clang + libc++. - -``` -caffe2/c10/util/Optional.h:536:13: error: builtin __has_trivial_copy is deprecated; use __is_trivially_copyable instead [-Werror,-Wdeprecated-builtins] - C10_IS_TRIVIALLY_COPYABLE(T) && - ^ -caffe2/c10/macros/Macros.h:438:38: note: expanded from macro 'C10_IS_TRIVIALLY_COPYABLE' -#define C10_IS_TRIVIALLY_COPYABLE(T) __has_trivial_copy(T) -``` - -Test Plan: CI - -Reviewed By: kit1980 - -Differential Revision: D42180203 - -Pull Request resolved: https://github.com/pytorch/pytorch/pull/91212 -Approved by: https://github.com/kit1980, https://github.com/soumith ---- - c10/macros/Macros.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/c10/macros/Macros.h b/c10/macros/Macros.h -index 9098a294228f4..09e57ca0a4d6a 100644 ---- a/c10/macros/Macros.h -+++ b/c10/macros/Macros.h -@@ -434,7 +434,8 @@ __device__ __attribute__((noinline)) __attribute__((weak)) void __assert_fail( - // Warning: __has_trivial_copy for GCC may not always detect the non-POD - // correctly. For example, T = std::unique_ptr may evaluate to true and be - // treated as POD. This can cause unexpected behavior. --#if defined(__GNUG__) && __GNUC__ < 5 -+#if defined(__GNUG__) && __GNUC__ < 5 && \ -+ !(defined(__clang__) && defined(_LIBCPP_VERSION)) - #define C10_IS_TRIVIALLY_COPYABLE(T) __has_trivial_copy(T) - #else - #define C10_IS_TRIVIALLY_COPYABLE(T) std::is_trivially_copyable<T>::value diff --git a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch deleted file mode 100644 index f72d44f475fa..000000000000 --- a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch +++ /dev/null @@ -1,239 +0,0 @@ ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -481,7 +481,7 @@ endif() - list(APPEND Caffe2_DEPENDENCY_LIBS cpuinfo) - - # ---[ QNNPACK --if(USE_QNNPACK) -+if(FALSE) - set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") - - if(NOT DEFINED QNNPACK_SOURCE_DIR) -@@ -537,7 +537,7 @@ if(USE_QNNPACK) - endif() - - # ---[ Caffe2 Int8 operators (enabled by USE_QNNPACK) depend on gemmlowp and neon2sse headers --if(USE_QNNPACK) -+if(FALSE) - set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") - include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") - include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/neon2sse") -@@ -789,7 +789,7 @@ - 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") -@@ -834,6 +834,7 @@ - endif() - - if(USE_FBGEMM) -+ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) - caffe2_update_option(USE_FBGEMM ON) - else() - caffe2_update_option(USE_FBGEMM OFF) -@@ -1557,7 +1558,6 @@ - if(NOT USE_SYSTEM_ONNX) - add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx EXCLUDE_FROM_ALL) - endif() -- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL) - - add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) - if(NOT USE_SYSTEM_ONNX) -@@ -1850,7 +1850,6 @@ - # - set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) - set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) --add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) - - # Disable compiler feature checks for `fmt`. - # -@@ -1859,9 +1858,7 @@ - # 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::fmt-header-only) - set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) - - # ---[ Kineto ---- a/c10/CMakeLists.txt -+++ b/c10/CMakeLists.txt -@@ -64,7 +64,7 @@ - if(${USE_GLOG}) - target_link_libraries(c10 PUBLIC glog::glog) - endif() --target_link_libraries(c10 PRIVATE fmt::fmt-header-only) -+target_link_libraries(c10 PRIVATE fmt) - - find_package(Backtrace) - if(Backtrace_FOUND) ---- a/torch/CMakeLists.txt -+++ b/torch/CMakeLists.txt -@@ -66,15 +66,9 @@ - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/aten/src - ${CMAKE_BINARY_DIR}/caffe2/aten/src -- ${CMAKE_BINARY_DIR}/third_party -- ${CMAKE_BINARY_DIR}/third_party/onnx - -- ${TORCH_ROOT}/third_party/valgrind-headers - -- ${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_SRC_DIR}/csrc - ${TORCH_SRC_DIR}/csrc/api/include -@@ -87,7 +81,6 @@ - python::python - pybind::pybind11 - shm -- fmt::fmt-header-only - ATEN_CPU_FILES_GEN_LIB) - - set(TORCH_PYTHON_COMPILE_DEFINITIONS) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -817,13 +817,12 @@ - - # ---[ Build flags - if(NOT MSVC) -- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") -+ string(APPEND CMAKE_CXX_FLAGS " -fPIC") - string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing") - # 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("-Wno-missing-field-initializers" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Wno-type-limits" CMAKE_CXX_FLAGS) -@@ -925,8 +924,6 @@ - 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) -- append_cxx_flag_if_supported("-Werror=cast-function-type" CMAKE_CXX_FLAGS) - check_cxx_compiler_flag("-Werror=sign-compare" HAS_WERROR_SIGN_COMPARE) - # This doesn't work globally so we use the test on specific - # target_compile_options ---- a/cmake/public/utils.cmake -+++ b/cmake/public/utils.cmake -@@ -507,8 +507,6 @@ - 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() - ---- a/cmake/Codegen.cmake -+++ b/cmake/Codegen.cmake -@@ -57,7 +57,7 @@ - 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/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -111,7 +111,7 @@ - # 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 "") -@@ -537,7 +537,6 @@ - if(NOT MSVC) - set_source_files_properties(${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_jit.cpp PROPERTIES COMPILE_FLAGS -Wno-noexcept-type) - # Force -Werror on several files -- set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/../aten/src/ATen/native/mkldnn/Pooling.cpp PROPERTIES COMPILE_FLAGS "-Werror") - endif() - # Disable certain warnings for GCC-9.X - if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0.0)) -@@ -825,7 +824,6 @@ - torch_compile_options(torch_cpu) # see cmake/public/utils.cmake - if(HAS_WERROR_SIGN_COMPARE AND WERROR) - # target_compile_options(torch_cpu PRIVATE "-Werror=sign-compare") -- set_property(SOURCE ${ATen_CORE_SRCS} ${ATen_CPU_SRCS} APPEND PROPERTY COMPILE_OPTIONS "-Werror=sign-compare") - endif() - - set_property(SOURCE ${ATen_CORE_SRCS} APPEND -@@ -1017,7 +1015,6 @@ - endif() - - if(NOT MSVC AND USE_XNNPACK) -- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) - endif() - - # ========================================================== -@@ -1136,8 +1133,7 @@ - target_include_directories(torch_cpu PRIVATE - ${TORCH_ROOT}/third_party/miniz-2.1.0) - --target_include_directories(torch_cpu PRIVATE -- ${TORCH_ROOT}/third_party/kineto/libkineto/include) -+target_include_directories(torch_cpu PRIVATE /usr/include/kineto) - - if(USE_KINETO) - target_include_directories(torch_cpu PRIVATE ---- a/cmake/External/nnpack.cmake -+++ b/cmake/External/nnpack.cmake -@@ -58,7 +58,7 @@ - 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/torch/csrc/Exceptions.cpp 2023-02-13 12:46:54.447013004 +0100 -+++ b/torch/csrc/Exceptions.cpp 2023-02-13 12:50:18.433791791 +0100 -@@ -1,11 +1,10 @@ - #include <torch/csrc/Exceptions.h> - #include <torch/csrc/python_headers.h> - -+#include <array> - #include <cstdarg> - #include <exception> --#include <sstream> - #include <utility> --#include <vector> - - #include <fmt/format.h> - #include <torch/csrc/THP.h> -@@ -259,15 +258,12 @@ - } else { - // Lets Python set the source location and puts the C++ warning - // location into the message. -- fmt::memory_buffer buf; -- fmt::format_to( -- buf, -- FMT_STRING("{} (Triggered internally at {}:{}.)"), -+ auto buf = fmt::format( -+ "{} (Triggered internally at {}:{}.)", - msg, - source_location.file, - source_location.line); -- buf.push_back('\0'); -- result = PyErr_WarnEx(PyExc_UserWarning, buf.data(), 1); -+ result = PyErr_WarnEx(PyExc_UserWarning, buf.c_str(), 1); - } - if (result < 0) { - if (in_exception_) { diff --git a/sci-libs/caffe2/files/caffe2-2.1.2-fix-openmp-link.patch b/sci-libs/caffe2/files/caffe2-2.1.2-fix-openmp-link.patch new file mode 100644 index 000000000000..3f2d0ae3c30a --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.1.2-fix-openmp-link.patch @@ -0,0 +1,15 @@ +Fix "undefined symbol: omp_get_max_active_levels" in mkl + <nothing else> builds +https://github.com/pytorch/pytorch/issues/116576 +--- a/caffe2/CMakeLists.txt ++++ b/caffe2/CMakeLists.txt +@@ -1575,6 +1575,10 @@ if(BUILD_SHARED_LIBS) + target_link_libraries(torch_global_deps TBB::tbb) + endif() + ++ if(USE_OPENMP) ++ target_link_libraries(torch_global_deps OpenMP::OpenMP_CXX) ++ endif() ++ + install(TARGETS torch_global_deps DESTINATION "${TORCH_INSTALL_LIB_DIR}") + endif() + diff --git a/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch b/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch new file mode 100644 index 000000000000..731227fa25ee --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.1.2-fix-rpath.patch @@ -0,0 +1,12 @@ +Unset rpath to support blas-lapack-switch +Bug: https://bugs.gentoo.org/921129 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -10,7 +10,6 @@ endif(APPLE) + set(CMAKE_SKIP_BUILD_RPATH FALSE) + # Don't use the install-rpath during the build phase + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +-set(CMAKE_INSTALL_RPATH "${_rpath_portable_origin}") + # Automatically add all linked folders that are NOT in the build directory to + # the rpath (per library?) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) diff --git a/sci-libs/caffe2/files/caffe2-2.1.2-rocm-fix-std-cpp17.patch b/sci-libs/caffe2/files/caffe2-2.1.2-rocm-fix-std-cpp17.patch new file mode 100644 index 000000000000..cb0fa0c48e80 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.1.2-rocm-fix-std-cpp17.patch @@ -0,0 +1,68 @@ +Fix for error: invalid argument '-std=c++17' not allowed with 'C' +https://github.com/pytorch/pytorch/issues/103222 +--- a/c10/hip/CMakeLists.txt ++++ b/c10/hip/CMakeLists.txt +@@ -30,6 +30,7 @@ hip_add_library(c10_hip ${C10_HIP_SRCS} ${C10_HIP_HEADERS}) + + # Propagate HIP_CXX_FLAGS that were set from Dependencies.cmake + target_compile_options(c10_hip PRIVATE ${HIP_CXX_FLAGS}) ++set_target_properties(c10_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + + # caffe2_hip adds a bunch of dependencies like rocsparse, but c10/hip is supposed to be + # minimal. I'm not sure if we need hip_hcc or not; for now leave it out +--- a/caffe2/CMakeLists.txt ++++ b/caffe2/CMakeLists.txt +@@ -1598,6 +1598,7 @@ if(USE_ROCM) + + # Since PyTorch files contain HIP headers, these flags are required for the necessary definitions to be added. + target_compile_options(torch_hip PUBLIC ${HIP_CXX_FLAGS}) # experiment ++ set_target_properties(torch_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + target_link_libraries(torch_hip PUBLIC c10_hip) + + if(NOT INTERN_BUILD_MOBILE) +@@ -1774,6 +1775,7 @@ if(BUILD_TEST) + target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>) + target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE}) + target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS}) ++ set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>) + if(INSTALL_TEST) + install(TARGETS ${test_name} DESTINATION test) +@@ -1955,6 +1957,7 @@ if(BUILD_PYTHON) + endif() + if(NOT MSVC) + target_compile_options(caffe2_pybind11_state_hip PRIVATE ${HIP_CXX_FLAGS} -fvisibility=hidden) ++ set_target_properties(caffe2_pybind11_state_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + endif() + set_target_properties(caffe2_pybind11_state_hip PROPERTIES PREFIX "") + set_target_properties(caffe2_pybind11_state_hip PROPERTIES SUFFIX ${PY_EXT_SUFFIX}) +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -1287,7 +1287,6 @@ if(USE_ROCM) + list(APPEND HIP_CXX_FLAGS -Wno-duplicate-decl-specifier) + list(APPEND HIP_CXX_FLAGS -DCAFFE2_USE_MIOPEN) + list(APPEND HIP_CXX_FLAGS -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_HIP) +- list(APPEND HIP_CXX_FLAGS -std=c++17) + add_definitions(-DROCM_VERSION=${ROCM_VERSION_DEV_INT}) + add_definitions(-DTORCH_HIP_VERSION=${TORCH_HIP_VERSION}) + message("TORCH_HIP_VERSION=${TORCH_HIP_VERSION} is added as a compiler defines") +--- a/cmake/public/utils.cmake ++++ b/cmake/public/utils.cmake +@@ -335,6 +335,7 @@ function(caffe2_hip_binary_target target_name_or_src) + caffe2_binary_target(${target_name_or_src}) + + target_compile_options(${__target} PRIVATE ${HIP_CXX_FLAGS}) ++ set_target_properties(${__target} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + target_include_directories(${__target} PRIVATE ${Caffe2_HIP_INCLUDE}) + endfunction() + +--- a/modules/detectron/CMakeLists.txt ++++ b/modules/detectron/CMakeLists.txt +@@ -31,6 +31,7 @@ if(BUILD_CAFFE2_OPS) + ${Detectron_CPU_SRCS} + ${Detectron_HIP_SRCS}) + target_compile_options(caffe2_detectron_ops_hip PRIVATE ${HIP_CXX_FLAGS}) ++ set_target_properties(caffe2_detectron_ops_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + if(USE_MKLDNN) + target_link_libraries(caffe2_detectron_ops_hip PRIVATE caffe2::mkldnn) + endif() diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.2.1-gentoo.patch index fce7a395023e..5472a2c41836 100644 --- a/sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch +++ b/sci-libs/caffe2/files/caffe2-2.2.1-gentoo.patch @@ -1,7 +1,7 @@ --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake -@@ -486,7 +486,7 @@ endif() - list(APPEND Caffe2_DEPENDENCY_LIBS cpuinfo) +@@ -474,7 +474,7 @@ + endif() # ---[ QNNPACK -if(USE_QNNPACK) @@ -9,7 +9,7 @@ set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") if(NOT DEFINED QNNPACK_SOURCE_DIR) -@@ -542,7 +542,7 @@ if(USE_QNNPACK) +@@ -530,7 +530,7 @@ endif() # ---[ Caffe2 Int8 operators (enabled by USE_QNNPACK) depend on gemmlowp and neon2sse headers @@ -18,7 +18,7 @@ set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/neon2sse") -@@ -802,7 +802,7 @@ +@@ -780,7 +780,7 @@ endif() # ---[ FBGEMM @@ -27,7 +27,7 @@ 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") -@@ -847,6 +847,7 @@ +@@ -828,6 +828,7 @@ endif() if(USE_FBGEMM) @@ -35,7 +35,7 @@ caffe2_update_option(USE_FBGEMM ON) else() caffe2_update_option(USE_FBGEMM OFF) -@@ -1554,7 +1555,6 @@ +@@ -1529,7 +1530,6 @@ set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) endif() endif() @@ -43,7 +43,7 @@ add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) if(NOT USE_SYSTEM_ONNX) -@@ -1819,7 +1819,6 @@ +@@ -1796,7 +1796,6 @@ # set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) @@ -51,7 +51,7 @@ # Disable compiler feature checks for `fmt`. # -@@ -1828,9 +1827,7 @@ +@@ -1805,9 +1804,7 @@ # 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. @@ -63,18 +63,18 @@ # ---[ Kineto --- a/c10/CMakeLists.txt +++ b/c10/CMakeLists.txt -@@ -65,7 +65,7 @@ - if(${USE_GLOG}) +@@ -89,7 +89,7 @@ + if(C10_USE_GLOG) target_link_libraries(c10 PUBLIC glog::glog) endif() -target_link_libraries(c10 PRIVATE fmt::fmt-header-only) +target_link_libraries(c10 PRIVATE fmt) - find_package(Backtrace) - if(Backtrace_FOUND) + if(C10_USE_NUMA) + target_include_directories(c10 PRIVATE ${Numa_INCLUDE_DIR}) --- a/torch/CMakeLists.txt +++ b/torch/CMakeLists.txt -@@ -66,15 +66,9 @@ +@@ -59,15 +59,9 @@ ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/aten/src ${CMAKE_BINARY_DIR}/caffe2/aten/src @@ -91,22 +91,22 @@ ${TORCH_SRC_DIR}/csrc ${TORCH_SRC_DIR}/csrc/api/include -@@ -87,7 +81,6 @@ +@@ -80,7 +74,6 @@ python::python pybind::pybind11 shm - fmt::fmt-header-only ATEN_CPU_FILES_GEN_LIB) - set(TORCH_PYTHON_COMPILE_DEFINITIONS) + if(USE_ASAN AND TARGET Sanitizer::address) --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -799,12 +799,11 @@ - - # ---[ Build flags +@@ -835,12 +835,11 @@ + # Re-include to override append_cxx_flag_if_supported from third_party/FBGEMM + include(cmake/public/utils.cmake) if(NOT MSVC) - string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") -+ string(APPEND CMAKE_CXX_FLAGS " -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") @@ -115,18 +115,17 @@ 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) -@@ -912,8 +911,6 @@ +@@ -930,7 +930,6 @@ 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) -- append_cxx_flag_if_supported("-Werror=cast-function-type" CMAKE_CXX_FLAGS) - endif() - - if(USE_ASAN) + else() + # skip unwanted includes from windows.h + add_compile_definitions(WIN32_LEAN_AND_MEAN) --- a/cmake/public/utils.cmake +++ b/cmake/public/utils.cmake -@@ -507,8 +507,6 @@ +@@ -486,8 +486,6 @@ endif() # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression) @@ -148,7 +147,7 @@ endif() --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt -@@ -106,7 +106,7 @@ +@@ -107,7 +107,7 @@ # Note: the folders that are being commented out have not been properly # addressed yet. @@ -157,23 +156,7 @@ if(NOT TARGET fxdiv) set(FXDIV_BUILD_TESTS OFF CACHE BOOL "") set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") -@@ -533,7 +533,6 @@ - if(NOT MSVC) - set_source_files_properties(${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_jit.cpp PROPERTIES COMPILE_FLAGS -Wno-noexcept-type) - # Force -Werror on several files -- set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/../aten/src/ATen/native/mkldnn/Pooling.cpp PROPERTIES COMPILE_FLAGS "-Werror") - endif() - # Disable certain warnings for GCC-9.X - if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0.0)) -@@ -811,7 +812,6 @@ - torch_compile_options(torch_cpu) # see cmake/public/utils.cmake - if(HAS_WERROR_SIGN_COMPARE AND WERROR) - # target_compile_options(torch_cpu PRIVATE "-Werror=sign-compare") -- set_property(SOURCE ${ATen_CORE_SRCS} ${ATen_CPU_SRCS} APPEND PROPERTY COMPILE_OPTIONS "-Werror=sign-compare") - endif() - - set_property(SOURCE ${ATen_CORE_SRCS} APPEND -@@ -975,7 +977,6 @@ +@@ -1055,7 +1055,6 @@ endif() if(NOT MSVC AND USE_XNNPACK) @@ -181,7 +164,7 @@ endif() # ========================================================== -@@ -1095,8 +1098,7 @@ +@@ -1175,8 +1174,7 @@ target_include_directories(torch_cpu PRIVATE ${TORCH_ROOT}/third_party/miniz-2.1.0) @@ -193,7 +176,7 @@ target_include_directories(torch_cpu PRIVATE --- a/cmake/External/nnpack.cmake +++ b/cmake/External/nnpack.cmake -@@ -58,7 +58,7 @@ +@@ -56,7 +56,7 @@ 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") @@ -202,3 +185,11 @@ if(NOT USE_SYSTEM_PTHREADPOOL AND USE_INTERNAL_PTHREADPOOL_IMPL) set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "") endif() +--- a/functorch/CMakeLists.txt 2023-11-30 20:30:45.805209036 +0100 ++++ b/functorch/CMakeLists.txt 2023-11-30 20:31:13.284766157 +0100 +@@ -35,4 +35,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.2.2-musl.patch b/sci-libs/caffe2/files/caffe2-2.2.2-musl.patch new file mode 100644 index 000000000000..f63e9f1df332 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.2.2-musl.patch @@ -0,0 +1,13 @@ +--- a/torch/csrc/profiler/unwind/unwind.cpp 2024-04-29 12:05:40.895667482 +0200 ++++ b/torch/csrc/profiler/unwind/unwind.cpp 2024-04-29 12:05:53.099524760 +0200 +@@ -112,8 +112,8 @@ + } + + struct Version { +- uint64_t adds_ = LONG_LONG_MAX; +- uint64_t subs_ = LONG_LONG_MAX; ++ uint64_t adds_ = LLONG_MAX; ++ uint64_t subs_ = LLONG_MAX; + }; + + struct UnwindCache { diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-CMakeFix.patch b/sci-libs/caffe2/files/caffe2-2.3.0-CMakeFix.patch new file mode 100644 index 000000000000..eba37d933cac --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.3.0-CMakeFix.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2024-04-29 20:32:26.259716769 +0200 ++++ b/CMakeLists.txt 2024-04-29 20:32:35.886384618 +0200 +@@ -50,7 +50,7 @@ + + # This define is needed to preserve behavior given anticpated changes to cccl/thrust + # https://nvidia.github.io/libcudacxx/standard_api/numerics_library/complex.html +-string(APPEND CMAKE_CUDA_FLAGS "-DLIBCUDACXX_ENABLE_SIMPLIFIED_COMPLEX_OPERATIONS") ++string(APPEND CMAKE_CUDA_FLAGS " -DLIBCUDACXX_ENABLE_SIMPLIFIED_COMPLEX_OPERATIONS") + + if(LINUX) + include(cmake/CheckAbi.cmake) diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-cudnn_include_fix.patch b/sci-libs/caffe2/files/caffe2-2.3.0-cudnn_include_fix.patch new file mode 100644 index 000000000000..77905dbd1ac8 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.3.0-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.3.0-rocm-fix-std-cpp17.patch b/sci-libs/caffe2/files/caffe2-2.3.0-rocm-fix-std-cpp17.patch new file mode 100644 index 000000000000..127a31e4b225 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.3.0-rocm-fix-std-cpp17.patch @@ -0,0 +1,68 @@ +Fix for error: invalid argument '-std=c++17' not allowed with 'C' +https://github.com/pytorch/pytorch/issues/103222 +--- a/c10/hip/CMakeLists.txt ++++ b/c10/hip/CMakeLists.txt +@@ -30,6 +30,7 @@ hip_add_library(c10_hip ${C10_HIP_SRCS} ${C10_HIP_HEADERS}) + + # Propagate HIP_CXX_FLAGS that were set from Dependencies.cmake + target_compile_options(c10_hip PRIVATE ${HIP_CXX_FLAGS}) ++set_target_properties(c10_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + + # caffe2_hip adds a bunch of dependencies like rocsparse, but c10/hip is supposed to be + # minimal. I'm not sure if we need hip_hcc or not; for now leave it out +--- a/caffe2/CMakeLists.txt ++++ b/caffe2/CMakeLists.txt +@@ -1712,6 +1712,7 @@ if(USE_ROCM) + + # Since PyTorch files contain HIP headers, these flags are required for the necessary definitions to be added. + target_compile_options(torch_hip PUBLIC ${HIP_CXX_FLAGS}) # experiment ++ set_target_properties(torch_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + target_link_libraries(torch_hip PUBLIC c10_hip) + + if(NOT INTERN_BUILD_MOBILE) +@@ -1908,6 +1909,7 @@ if(BUILD_TEST) + target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>) + target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE}) + target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS}) ++ set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>) + if(INSTALL_TEST) + install(TARGETS ${test_name} DESTINATION test) +@@ -2092,6 +2094,7 @@ if(BUILD_PYTHON) + endif() + if(NOT MSVC) + target_compile_options(caffe2_pybind11_state_hip PRIVATE ${HIP_CXX_FLAGS} -fvisibility=hidden) ++ set_target_properties(caffe2_pybind11_state_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + endif() + set_target_properties(caffe2_pybind11_state_hip PROPERTIES PREFIX "") + set_target_properties(caffe2_pybind11_state_hip PROPERTIES SUFFIX ${PY_EXT_SUFFIX}) +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -1278,7 +1278,6 @@ + list(APPEND HIP_CXX_FLAGS -Wno-duplicate-decl-specifier) + list(APPEND HIP_CXX_FLAGS -DCAFFE2_USE_MIOPEN) + list(APPEND HIP_CXX_FLAGS -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_HIP) +- list(APPEND HIP_CXX_FLAGS -std=c++17) + if(ROCM_VERSION_DEV VERSION_GREATER_EQUAL "6.0.0") + list(APPEND HIP_CXX_FLAGS -DHIPBLAS_V2) + endif() +--- a/cmake/public/utils.cmake ++++ b/cmake/public/utils.cmake +@@ -335,6 +335,7 @@ function(caffe2_hip_binary_target target_name_or_src) + caffe2_binary_target(${target_name_or_src}) + + target_compile_options(${__target} PRIVATE ${HIP_CXX_FLAGS}) ++ set_target_properties(${__target} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + target_include_directories(${__target} PRIVATE ${Caffe2_HIP_INCLUDE}) + endfunction() + +--- a/modules/detectron/CMakeLists.txt ++++ b/modules/detectron/CMakeLists.txt +@@ -31,6 +31,7 @@ if(BUILD_CAFFE2_OPS) + ${Detectron_CPU_SRCS} + ${Detectron_HIP_SRCS}) + target_compile_options(caffe2_detectron_ops_hip PRIVATE ${HIP_CXX_FLAGS}) ++ set_target_properties(caffe2_detectron_ops_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) + if(USE_MKLDNN) + target_link_libraries(caffe2_detectron_ops_hip PRIVATE caffe2::mkldnn) + endif() diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index 703eedf5322a..e99253402e7a 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -5,23 +5,21 @@ <email>tupone@gentoo.org</email> <name>Tupone Alfredo</name> </maintainer> - <maintainer type="person" proxied="yes"> - <email>telans@posteo.de</email> - <name>James Beddek</name> - </maintainer> <use> - <flag name="cuda">Add support for CUDA processing</flag> <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> <flag name="nnpack">Use NNPACK</flag> <flag name="numpy">Add support for math operations through numpy</flag> - <flag name="opencl">Use OpenCL</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="tensorpipe">Use tensorpipe</flag> + <flag name="rocm">Enable ROCm gpu computing support</flag> <flag name="xnnpack">Use XNNPACK</flag> </use> <upstream> diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 6b5da97bd886..fe074558539e 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1 +1 @@ -DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856 +DIST cantera-3.0.0.tar.gz 2451103 BLAKE2B 094d7a4f0b8fd0f1a45d9f8c13e1390cf7fc62110e424e1287030e97382c1cdc016a5119adc4d5c7bbc222420a3b447db93fee8350643cb3a0907a838fbc1ddf SHA512 dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca diff --git a/sci-libs/cantera/cantera-2.6.0-r2.ebuild b/sci-libs/cantera/cantera-3.0.0-r1.ebuild index b7276b05cc38..9f0de3263452 100644 --- a/sci-libs/cantera/cantera-2.6.0-r2.ebuild +++ b/sci-libs/cantera/cantera-3.0.0-r1.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..11} ) +PYTHON_COMPAT=( python3_{10..12} ) FORTRAN_NEEDED=fortran FORTRAN_STANDARD="77 90" @@ -17,33 +17,30 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="+cti fortran lapack +python test" +IUSE="fortran hdf5 lapack +python test" RESTRICT="!test? ( test )" REQUIRED_USE=" - python? ( cti ) ${PYTHON_REQUIRED_USE} " RDEPEND=" ${PYTHON_DEPS} - lapack? ( virtual/lapack ) - cti? ( - $(python_gen_cond_dep ' - dev-python/ruamel-yaml[${PYTHON_USEDEP}] - ') + dev-cpp/yaml-cpp + hdf5? ( sci-libs/HighFive ) + !lapack? ( sci-libs/sundials:0= ) + lapack? ( + >=sci-libs/sundials-6.5.0:0=[lapack?] + virtual/lapack ) python? ( $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] ') ) - dev-cpp/yaml-cpp - !lapack? ( sci-libs/sundials:0= ) - lapack? ( >=sci-libs/sundials-6.5.0:0=[lapack?] ) " -# <cython-3 for bug #913141 DEPEND=" ${RDEPEND} dev-cpp/eigen:3 @@ -51,7 +48,7 @@ DEPEND=" dev-libs/libfmt python? ( $(python_gen_cond_dep ' - <dev-python/cython-3[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] ') ) @@ -70,7 +67,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${P}_env.patch" - "${FILESDIR}/${P}_drop_deprecated_open_U_option.patch" + "${FILESDIR}/${P}_enable_python-3.12.patch" ) pkg_setup() { @@ -86,7 +83,7 @@ src_configure() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" cc_flags="${CXXFLAGS}" - cxx_flags="-std=c++14" + cxx_flags="-std=c++17" debug="no" FORTRAN="$(tc-getFC)" FORTRANFLAGS="${FCFLAGS}" @@ -98,9 +95,14 @@ src_configure() { system_sundials="y" system_eigen="y" system_yamlcpp="y" + hdf_support=$(usex hdf5 y n) + system_blas_lapack=$(usex lapack y n) env_vars="all" extra_inc_dirs="/usr/include/eigen3" + use_rpath_linkage="yes" + extra_lib_dirs="/usr/$(get_libdir)/${PN}" ) + use hdf5 && scons_vars+=( system_highfive="y" ) use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" ) use test || scons_vars+=( googletest="none" ) @@ -108,9 +110,8 @@ src_configure() { f90_interface=$(usex fortran y n) ) - if use cti ; then - local scons_python=$(usex python full minimal) - scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" ) + if use python ; then + scons_targets+=( python_package="full" python_cmd="${EPYTHON}" ) else scons_targets+=( python_package="none" ) fi @@ -126,7 +127,7 @@ src_test() { src_install() { escons install stage_dir="${D}" libdirname="$(get_libdir)" - if ! use cti ; then + if ! use python ; then rm -r "${D}/usr/share/man" || die "Can't remove man files." else # Run the byte-compile of modules @@ -138,15 +139,6 @@ src_install() { } pkg_postinst() { - if use cti && ! use python ; then - elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml" - elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism." - fi - local post_msg=$(usex fortran "and Fortran " "") elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory." - - if use python ; then - elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories." - fi } diff --git a/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch b/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch deleted file mode 100644 index 41243da82f68..000000000000 --- a/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0b407e11fe0bae4707286ab3cbf6a7a72a906817 Mon Sep 17 00:00:00 2001 -From: "Mark E. Fuller" <mark.e.fuller@gmx.de> -Date: Thu, 23 Jun 2022 00:04:22 +0300 -Subject: [PATCH] drop deprecated 'U' open option - ---- - site_scons/site_tools/subst.py | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/site_scons/site_tools/subst.py b/site_scons/site_tools/subst.py -index 3a1c4f6fb8..05d520491b 100644 ---- a/site_scons/site_tools/subst.py -+++ b/site_scons/site_tools/subst.py -@@ -12,7 +12,7 @@ - - from SCons.Script import * - import SCons.Errors -- -+from pathlib import Path - - # Helper/core functions - ############################################################################## -@@ -20,12 +20,7 @@ - # Do the substitution - def _subst_file(target, source, env, pattern, replace): - # Read file -- #print 'CALLING SUBST_FILE' -- f = open(source, "rU") -- try: -- contents = f.read() -- finally: -- f.close() -+ contents = Path(source).read_text() - - # Substitute, make sure result is a string - def subfn(mo): -@@ -46,11 +41,7 @@ def subfn(mo): - # Determine which keys are used - def _subst_keys(source, pattern): - # Read file -- f = open(source, "rU") -- try: -- contents = f.read() -- finally: -- f.close() -+ contents = Path(source).read_text() - - # Determine keys - keys = [] diff --git a/sci-libs/cantera/files/cantera-2.6.0_env.patch b/sci-libs/cantera/files/cantera-2.6.0_env.patch deleted file mode 100644 index 15a1e65857e4..000000000000 --- a/sci-libs/cantera/files/cantera-2.6.0_env.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -Naur old/SConstruct new/SConstruct ---- old/SConstruct -+++ new/SConstruct -@@ -178,6 +178,10 @@ - - config_options = [ - Option( -+ "AR", -+ "The archiver to use.", -+ "${AR}"), -+ Option( - "CXX", - "The C++ compiler to use.", - "${CXX}"), -@@ -740,7 +744,7 @@ - toolchain = ["default"] - - env = Environment(tools=toolchain+["textfile", "subst", "recursiveInstall", "wix", "gch"], -- ENV={"PATH": os.environ["PATH"]}, -+ ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}, - toolchain=toolchain, - **extraEnvArgs) - -@@ -775,7 +779,7 @@ - - add_RegressionTest(env) - --opts.AddVariables(*config.to_scons(["CC", "CXX"], env=env)) -+opts.AddVariables(*config.to_scons(["AR", "CC", "CXX"], env=env)) - opts.Update(env) - - # Check if this is actually Apple's clang on macOS -@@ -861,11 +865,7 @@ - env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0) - env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0) - --try: -- env["git_commit"] = get_command_output("git", "rev-parse", "--short", "HEAD") -- logger.info(f"Building Cantera from git commit '{env['git_commit']}'") --except (subprocess.CalledProcessError, FileNotFoundError): -- env["git_commit"] = "unknown" -+env["git_commit"] = "unknown" - - # Print values of all build options: - # the (updated) "cantera.conf" combines all options that were specified by the user -diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript ---- old/interfaces/cython/SConscript -+++ new/interfaces/cython/SConscript -@@ -107,7 +107,7 @@ - obj, LIBPREFIX="", SHLIBSUFFIX=module_ext, - SHLIBPREFIX="", LIBSUFFIXES=[module_ext]) - --build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --use-feature=in-tree-build --no-deps " -+build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --no-deps " - "--wheel-dir=build/python/dist build/python") - plat = info['plat'].replace('-', '_').replace('.', '_') - wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}" -@@ -172,7 +172,7 @@ - - install_cmd.append(f"--root={stage_dir.resolve()}") - --install_cmd.extend(("--no-build-isolation", "--use-feature=in-tree-build", "--no-deps", "-v", "--force-reinstall", -+install_cmd.extend(("--no-build-isolation", "--no-deps", "-v", "--force-reinstall", - "build/python")) - if localenv['PYTHON_INSTALLER'] == 'direct': - mod_inst = install(localenv.Command, 'dummy', mod, -diff -Naur old/test_problems/SConscript new/test_problems/SConscript ---- old/test_problems/SConscript -+++ new/test_problems/SConscript -@@ -233,7 +233,7 @@ - artifacts=['vcs_equilibrate_res.csv']) - - CompileAndTest('clib', 'clib_test', 'clib_test', -- extensions=['^clib_test.c'], libs=localenv['cantera_shared_libs']) -+ extensions=['^clib_test.c']) - - # C++ Samples - Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None, 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 new file mode 100644 index 000000000000..8efa7b0df9c5 --- /dev/null +++ b/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch @@ -0,0 +1,75 @@ +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.0_env.patch b/sci-libs/cantera/files/cantera-3.0.0_env.patch new file mode 100644 index 000000000000..cfc2874250e4 --- /dev/null +++ b/sci-libs/cantera/files/cantera-3.0.0_env.patch @@ -0,0 +1,37 @@ +diff -Naur a/SConstruct b/SConstruct +--- a/SConstruct ++++ b/SConstruct +@@ -819,7 +819,7 @@ + toolchain = ["default"] + + env = Environment(tools=toolchain+["textfile", "subst", "recursiveInstall", "UnitsInterfaceBuilder", "wix", "gch"], +- ENV={"PATH": os.environ["PATH"]}, ++ ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}, + toolchain=toolchain, + **extraEnvArgs) + +@@ -970,11 +974,7 @@ + env["CPU"] = get_processor_name() + logger.info(f"Compiling on {env['CPU']!r}") + +-try: +- env["git_commit"] = get_command_output("git", "rev-parse", "--short", "HEAD") +- logger.info(f"Building Cantera from git commit {env['git_commit']!r}") +-except (subprocess.CalledProcessError, FileNotFoundError): +- env["git_commit"] = "unknown" ++env["git_commit"] = "unknown" + + # Print values of all build options: + # the (updated) "cantera.conf" combines all options that were specified by the user +diff -Naur a/src/SConscript b/src/SConscript +--- a/src/SConscript ++++ b/src/SConscript +@@ -89,7 +89,7 @@ + shim = pyenv.SharedObject("extensions/pythonShim.cpp") + pylibname = f"../lib/cantera_python{pyenv['py_version_short'].replace('.', '_')}" + lib = build(pyenv.SharedLibrary(pylibname, shim, SPAWN=get_spawn(pyenv))) +- install("$inst_shlibdir", lib) ++ install("$inst_shlibdir/cantera", lib) + + + # build the Cantera static library diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml index 919e8bf0ad40..d3c6628839c0 100644 --- a/sci-libs/cantera/metadata.xml +++ b/sci-libs/cantera/metadata.xml @@ -14,7 +14,8 @@ for problems involving chemical kinetics, thermodynamics, and/or transport processes. </longdescription> <use> - <flag name="cti">Install CTI tools (ck2cti, ck2yaml, ctml_writer) for conversion of Chemkin files to Cantera format</flag> + <flag name="python">Install Python bindings and conversion tools from Chemkin to Cantera format</flag> + <flag name="hdf5">Add HDF5 container files support</flag> </use> <upstream> <remote-id type="github">cantera/cantera</remote-id> diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest index d3c5f7633dcf..d8033d252e43 100644 --- a/sci-libs/cartopy/Manifest +++ b/sci-libs/cartopy/Manifest @@ -1 +1 @@ -DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788 SHA512 de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1 +DIST cartopy-0.23.0.gh.tar.gz 10645484 BLAKE2B aa9306e9f5bd85ae28be4802aac1a36d67df5812e9d188ad20d27103eaff1856b7d48e256459519b4e647bdf17fc207e8473ec6ead7413db113311fe821faba6 SHA512 8f357faad592db03c564d2c87f6d1600d2a04a68b71b250925c222cea418b8588f2eb48f64d3ec7210650a34372777ef8416c8f129af7911661615759d2c60b5 diff --git a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild deleted file mode 100644 index e7186c4571c4..000000000000 --- a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{9..11} ) - -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 multibuild multiprocessing virtualx - -MY_PV=${PV/_beta/b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Python package for geospatial data processing and analysis" -HOMEPAGE="https://scitools.org.uk/cartopy" -SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}] - sci-libs/geos - $(python_gen_cond_dep ' - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - dev-python/shapely[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/pillow[jpeg,${PYTHON_USEDEP}] - dev-python/pyproj[${PYTHON_USEDEP}] - sci-libs/pyshp[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND}" -BDEPEND=" - $(python_gen_cond_dep ' - dev-python/setuptools-scm[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - ') - test? ( - $(python_gen_cond_dep ' - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/flufl-lock[${PYTHON_USEDEP}] - dev-python/pytest-mpl[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ') - ) -" - -PATCHES=( "${FILESDIR}"/${P}-fix-test.patch - # backports to fix tests with >=PROJ9.2 - "${FILESDIR}"/${PN}-0.21.1-fix-test_proj92.patch - "${FILESDIR}"/${PN}-0.21.1-fix-test_proj92_1.patch ) - -EPYTEST_IGNORE=( - # Require network access, not covered by markers - lib/cartopy/tests/mpl/test_crs.py - lib/cartopy/tests/mpl/test_gridliner.py -) - -distutils_enable_tests pytest - -python_prepare_all() { - export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - - # Prepare matplotlib backend for test suite - export MPLCONFIGDIR="${T}" - echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die - - distutils-r1_python_prepare_all -} - -python_test() { - cd "${BUILD_DIR}" || die - - # Drop all tests needing network access - virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed" -} diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild b/sci-libs/cartopy/cartopy-0.23.0.ebuild index bad3ea5841c3..024cbd93e090 100644 --- a/sci-libs/cartopy/cartopy-0.21.1.ebuild +++ b/sci-libs/cartopy/cartopy-0.23.0.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{9..12} ) -inherit distutils-r1 multibuild multiprocessing virtualx +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 multiprocessing virtualx MY_PV=${PV/_beta/b} MY_P=${PN}-${MY_PV} @@ -16,7 +18,7 @@ HOMEPAGE="https://scitools.org.uk/cartopy" SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" S="${WORKDIR}"/${MY_P} -LICENSE="LGPL-3" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" @@ -26,7 +28,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}] - sci-libs/geos $(python_gen_cond_dep ' >=dev-python/numpy-1.19[${PYTHON_USEDEP}] dev-python/shapely[${PYTHON_USEDEP}] @@ -54,8 +55,9 @@ BDEPEND=" ') ) " - -PATCHES=( "${FILESDIR}"/${P}-fix-test.patch ) +PATCHES=( + "${FILESDIR}"/${P}-backport-test-fixes.patch +) EPYTEST_IGNORE=( # Require network access, not covered by markers @@ -72,6 +74,8 @@ python_prepare_all() { export MPLCONFIGDIR="${T}" echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die + sed -i -e "s/exclude =/#exclude =/" pyproject.toml || die + distutils-r1_python_prepare_all } diff --git a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test.patch deleted file mode 100644 index fd308b326c68..000000000000 --- a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -Matplotlib-3.7 has merged SubplotBase into AxesBase now, which makes the -class string representation here GeoAxes now, even though we are -still an _instance_ of GeoAxesSubplot - -Backported from https://github.com/SciTools/cartopy/commit/6b4572ba1a8a877f28e25dfe9559c14b7a565958?diff=unified -diff --git a/lib/cartopy/tests/mpl/test_axes.py b/lib/cartopy/tests/mpl/test_axes.py -index eaf5904..d4e37a1 100644 ---- a/lib/cartopy/tests/mpl/test_axes.py -+++ b/lib/cartopy/tests/mpl/test_axes.py -@@ -13,7 +13,8 @@ import pytest - - import cartopy.crs as ccrs - import cartopy.feature as cfeature --from cartopy.mpl.geoaxes import InterProjectionTransform, GeoAxes -+from cartopy.mpl.geoaxes import ( -+ InterProjectionTransform, GeoAxes, GeoAxesSubplot) - - - class TestNoSpherical: -@@ -119,7 +120,7 @@ class Test_Axes_add_geometries: - - def test_geoaxes_subplot(): - ax = plt.subplot(1, 1, 1, projection=ccrs.PlateCarree()) -- assert str(ax.__class__) == "<class 'cartopy.mpl.geoaxes.GeoAxesSubplot'>" -+ assert isinstance(ax, GeoAxesSubplot) - - - @pytest.mark.mpl_image_compare(filename='geoaxes_subslice.png') diff --git a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch deleted file mode 100644 index e9f1d03eeeb2..000000000000 --- a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/lib/cartopy/tests/crs/test_equidistant_conic.py b/lib/cartopy/tests/crs/test_equidistant_conic.py -index 045c87e5d..9f50b4f04 100644 ---- a/lib/cartopy/tests/crs/test_equidistant_conic.py -+++ b/lib/cartopy/tests/crs/test_equidistant_conic.py -@@ -10,6 +10,7 @@ - - import numpy as np - from numpy.testing import assert_almost_equal, assert_array_almost_equal -+import pyproj - import pytest - - import cartopy.crs as ccrs -@@ -23,11 +24,16 @@ def test_default(self): - 'y_0=0.0', 'lat_1=20.0', 'lat_2=50.0'} - check_proj_params('eqdc', eqdc, other_args) - -+ expected_x = (-22784919.35600352, 22784919.35600352) -+ expected_y = (-10001965.729313632, 17558791.85156368) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-22784919.3559981, 22784919.3559981) -+ expected_y = (-10001965.72931272, 17558791.85157471) - assert_almost_equal(np.array(eqdc.x_limits), -- (-22784919.35600352, 22784919.35600352), -+ expected_x, - decimal=7) - assert_almost_equal(np.array(eqdc.y_limits), -- (-10001965.729313632, 17558791.85156368), -+ expected_y, - decimal=7) - - def test_eccentric_globe(self): -@@ -37,12 +43,16 @@ def test_eccentric_globe(self): - other_args = {'a=1000', 'b=500', 'lon_0=0.0', 'lat_0=0.0', 'x_0=0.0', - 'y_0=0.0', 'lat_1=20.0', 'lat_2=50.0'} - check_proj_params('eqdc', eqdc, other_args) -- -+ expected_x = (-3016.869847713461, 3016.869847713461) -+ expected_y = (-1216.6029342241113, 2511.0574375797723) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-2960.1009481, 2960.1009481) -+ expected_y = (-1211.05573766, 2606.04249537) - assert_almost_equal(np.array(eqdc.x_limits), -- (-3016.869847713461, 3016.869847713461), -+ expected_x, - decimal=7) - assert_almost_equal(np.array(eqdc.y_limits), -- (-1216.6029342241113, 2511.0574375797723), -+ expected_y, - decimal=7) - - def test_eastings(self): -@@ -127,12 +137,16 @@ def test_ellipsoid_transform(self): - 'lat_0=23.0', 'x_0=0.0', 'y_0=0.0', 'lat_1=29.5', - 'lat_2=45.5'} - check_proj_params('eqdc', eqdc, other_args) -- -+ expected_x = (-22421870.719894886, 22421870.719894886) -+ expected_y = (-12546277.778958388, 17260638.403203618) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-22421870.71988974, 22421870.71988976) -+ expected_y = (-12546277.77895742, 17260638.403216) - assert_almost_equal(np.array(eqdc.x_limits), -- (-22421870.719894886, 22421870.719894886), -+ expected_x, - decimal=7) - assert_almost_equal(np.array(eqdc.y_limits), -- (-12546277.778958388, 17260638.403203618), -+ expected_y, - decimal=7) - - result = eqdc.transform_point(-75.0, 35.0, geodetic) -diff --git a/lib/cartopy/tests/crs/test_sinusoidal.py b/lib/cartopy/tests/crs/test_sinusoidal.py -index 2f2a1821a..9347260a1 100644 ---- a/lib/cartopy/tests/crs/test_sinusoidal.py -+++ b/lib/cartopy/tests/crs/test_sinusoidal.py -@@ -6,6 +6,7 @@ - - import numpy as np - from numpy.testing import assert_almost_equal -+import pyproj - import pytest - - import cartopy.crs as ccrs -@@ -32,10 +33,15 @@ def test_eccentric_globe(self): - other_args = {'a=1000', 'b=500', 'lon_0=0.0', 'x_0=0.0', 'y_0=0.0'} - check_proj_params('sinu', crs, other_args) - -+ expected_x = [-3141.59, 3141.59] -+ expected_y = [-1216.60, 1216.60] -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = [-3141.60, 3141.60] -+ expected_y = [-1211.05, 1211.05] - assert_almost_equal(np.array(crs.x_limits), -- [-3141.59, 3141.59], decimal=2) -+ expected_x, decimal=2) - assert_almost_equal(np.array(crs.y_limits), -- [-1216.60, 1216.60], decimal=2) -+ expected_y, decimal=2) - - def test_offset(self): - crs = ccrs.Sinusoidal() -diff --git a/lib/cartopy/tests/test_crs.py b/lib/cartopy/tests/test_crs.py -index c1a5d11da..b6c38ced3 100644 ---- a/lib/cartopy/tests/test_crs.py -+++ b/lib/cartopy/tests/test_crs.py -@@ -90,9 +90,17 @@ def test_osgb(self, approx): - def test_epsg(self): - uk = ccrs.epsg(27700) - assert uk.epsg_code == 27700 -- assert_almost_equal(uk.x_limits, (-104009.357, 688806.007), decimal=3) -- assert_almost_equal(uk.y_limits, (-8908.37, 1256558.45), decimal=2) -- assert_almost_equal(uk.threshold, 7928.15, decimal=2) -+ expected_x = (-104009.357, 688806.007) -+ expected_y = (-8908.37, 1256558.45) -+ expected_threshold = 7928.15 -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-104728.764, 688806.007) -+ expected_y = (-8908.36, 1256616.32) -+ expected_threshold = 7935.34 -+ assert_almost_equal(uk.x_limits, -+ expected_x, decimal=3) -+ assert_almost_equal(uk.y_limits, expected_y, decimal=2) -+ assert_almost_equal(uk.threshold, expected_threshold, decimal=2) - self._check_osgb(uk) - - def test_epsg_compound_crs(self): diff --git a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch deleted file mode 100644 index 7ce52bb23364..000000000000 --- a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/lib/cartopy/tests/crs/test_lambert_conformal.py b/lib/cartopy/tests/crs/test_lambert_conformal.py -index 6032d2e5c..c64022ff9 100644 ---- a/lib/cartopy/tests/crs/test_lambert_conformal.py -+++ b/lib/cartopy/tests/crs/test_lambert_conformal.py -@@ -5,6 +5,7 @@ - # licensing details. - - from numpy.testing import assert_array_almost_equal -+import pyproj - import pytest - - import cartopy.crs as ccrs -@@ -68,18 +69,29 @@ def test_too_many_parallel(self): - - def test_single_spole(self): - s_pole_crs = ccrs.LambertConformal(standard_parallels=[-1.]) -+ expected_x = (-19939660, 19939660) -+ expected_y = (-735590302, -8183795) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-19840440, 19840440) -+ expected_y = (-370239953, -8191953) -+ print(s_pole_crs.x_limits) - assert_array_almost_equal(s_pole_crs.x_limits, -- (-19939660, 19939660), -+ expected_x, - decimal=0) - assert_array_almost_equal(s_pole_crs.y_limits, -- (-735590302, -8183795), -+ expected_y, - decimal=0) - - def test_single_npole(self): - n_pole_crs = ccrs.LambertConformal(standard_parallels=[1.]) -+ expected_x = (-20130569, 20130569) -+ expected_y = (-8170229, 726200683) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-20222156, 20222156) -+ expected_y = (-8164817, 360848719) - assert_array_almost_equal(n_pole_crs.x_limits, -- (-20130569, 20130569), -+ expected_x, - decimal=0) - assert_array_almost_equal(n_pole_crs.y_limits, -- (-8170229, 726200683), -+ expected_y, - decimal=0) 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 new file mode 100644 index 000000000000..b88d4110dd6f --- /dev/null +++ b/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch @@ -0,0 +1,13 @@ +# 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-r1.ebuild b/sci-libs/cddlib/cddlib-094m-r1.ebuild index 5cb23824058f..4a38f957054c 100644 --- a/sci-libs/cddlib/cddlib-094m-r1.ebuild +++ b/sci-libs/cddlib/cddlib-094m-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit libtool + # This can't work forever; but for now, it's better than hard-coding the # correct version string. MY_PV="${PV:0:1}.${PV:1}" @@ -23,6 +25,11 @@ RDEPEND="dev-libs/gmp:0=" S="${WORKDIR}/${MY_P}" +src_prepare() { + default + elibtoolize +} + src_configure() { econf $(use_enable static-libs static) } diff --git a/sci-libs/cddlib/cddlib-094m-r2.ebuild b/sci-libs/cddlib/cddlib-094m-r2.ebuild new file mode 100644 index 000000000000..521abc9a7448 --- /dev/null +++ b/sci-libs/cddlib/cddlib-094m-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool + +# This can't work forever; but for now, it's better than hard-coding the +# correct version string. +MY_PV="${PV:0:1}.${PV:1}" +QA_PKGCONFIG_VERSION="${MY_PV}" + +MY_P="${PN}-${MY_PV}" +DESCRIPTION="C library implementing the Double Description Method" +HOMEPAGE="https://www.inf.ethz.ch/personal/fukudak/cdd_home/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2+" +KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples static-libs tools" + +DEPEND="dev-libs/gmp:0" +RDEPEND="dev-libs/gmp:0=" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + elibtoolize +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + + if ! use tools; then + rm "${ED}"/usr/bin/* || die + fi + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi + + # Nobody wants the dvi/ps manual... + rm "${ED}/usr/share/doc/${PF}"/cddlibman.{dvi,ps} || die + + # since the PDF manual is installed by default. + if ! use doc; then + rm "${ED}/usr/share/doc/${PF}"/cddlibman.pdf || die + fi + + # The docs and examples are *both* installed by default, so we + # have to remove the examples if the user doesn't want them. + docompress -x "/usr/share/doc/${PF}"/examples{,-ext,-ine,-ine3d} + if ! use examples; then + rm -r "${ED}/usr/share/doc/${PF}"/examples{,-ext,-ine,-ine3d} || die + fi +} diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest index 84ce1596aca8..5540c04bb014 100644 --- a/sci-libs/cdf/Manifest +++ b/sci-libs/cdf/Manifest @@ -7,3 +7,12 @@ DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c +DIST cdf390crm.pdf 2029732 BLAKE2B 011652b3c55910dea6c4e7b47e003335826e3471bfab41e27a1baf44397b4efd684f75b8e09018279cf9ee53f3d3de65a8c5905769e04aa93b893bbc470117a8 SHA512 b1b60c0b77bece7f0f722505bff1abba1798a220627216f04c84163a3efb51fdd31bc3abe2f8dacd0bb31e6aee585301939d38dc9353fda0535475ba973593be +DIST cdf390csrm.pdf 1865382 BLAKE2B 83bc066468867b946e3962f1c4b2717f218ea2b92100b43ff18457c1759e2bd71028919aa6403030b840aaa5709a0fafa3e5e6a8843df52e44b3ff335e44dff0 SHA512 f614e1cea672c69eb08e0559e6d1b743f1eaf4f20c1e9dda8ca372ece3040676ba312b5800640b6f202aa9cc45b90e3ce9fbf07fcf621ed8591cbcbfc4e42a24 +DIST cdf390frm.pdf 1896169 BLAKE2B 26cafadaaaf861a4556d54c2fcd09f74c763a8d56e170a75b1247ac700c4082b1d09c446568e814b8b126b5ca2c4d1d0c3cc658ceb49fa6823fcbfe6db7326b2 SHA512 a696a1a774d31f1b023e15d9d510baa7407ea0f6a76bd065bb7c69bb85a3ea5aff6999949a6ed8ce21c418928eca6d90d22e0439ab959f3c1d2b7b9f0a33878e +DIST cdf390prm.pdf 1226869 BLAKE2B c07bb0f0a078c3e68a9811d36bfb459840c6396cf67e129b2b138d0f194ab2637b32a9826709fff03a58e5b43d680197df27fa09182a03ff1501eca62e6fac6f SHA512 38dbff0fbf05c21270395d2207d171c4746d016a6a8051d39d3c66603aedd3d73b1b4e83924af53aaf391f9108770647c56f380fd98fdae3a3f027fe3cf88de3 +DIST cdf390ug.pdf 1566123 BLAKE2B 639f800454e8f27286d769d505001e07e972b194d589a189b291c51f322d3995c7a4040f319ca50ccd1a27bc0a494e356722071db058da52816d44af9eb685b5 SHA512 980e995534da349f7b38480924ace002ccd1b41c1d3468d7a7741f28edda6c65fb3bdb3b9a43a3b29d92195283c42eecc0d494be4a77275dec85430b9bffb54b +DIST cdf390vbrm.pdf 1729074 BLAKE2B d30d177202b516891dba0cb99113d6d19af41d950384469ec8a35d96dd2f7418646d1622bbf35376f02cabe686d6da0382e65b98a5beef0bcf81eb827dab5270 SHA512 98379bb4f30c8073ea1d43b7b4b75559722b6de1c7a500bb79b25162cb1bbc82afd9eec443af4645e369de6f59bf031fd097bc802896ad7310b7614a73486961 +DIST cdf39_0-dist-cdf.tar.gz 1290187 BLAKE2B 03f7c7840c44514046df0d63ff6086be7263858f90225debfb8a4fe6c4d6e5b03c95faa2762f76e2ffc198ac77359b3494520258ec17678746fd7f619e362853 SHA512 e054b763d86c09c53375ef60a8690f43fcb106be1dc6fd907763379db1ab4c9677692671a63da74d955aec8ce3f866f420ddc7217a59ed68e51c4623562af387 +DIST cdf39_0-dist-java.tar.gz 1162924 BLAKE2B 4e6416ec5a2a2eede428fa00906ca0e42460916506e7b2075d622e322ffe53e337a77bf81aa871e1559fb6b9339f2f49e365ca835874e060da33cd7c68e45177 SHA512 860468257c70bd6cb9592f40e495b5efb9092fc6fa3ab68c2fdc729c46d9ea4f0499a0b29904fe9c1ae07c13958e551b4e5cc8b9b71c2401ca833f2020073606 +DIST cdf39ifd.pdf 656522 BLAKE2B 2ec3831f27e92fcec8191bedb1617c9f590b726732e02dd8ca317b814c369b46d50dd19e7bfc81df233e1e32ca6fb8191bf7e075ce67dda1ddd50645d5fc754b SHA512 f4de5bea46b7d1ea2621b9fa0ac1ab0f9904ada9a1625ce613f6fdb68ad25ca52398cbf75bb27902e54ba5ee7820f3ea1a563c655186047b8954cb53b4cd8197 diff --git a/sci-libs/cdf/cdf-3.8.0-r1.ebuild b/sci-libs/cdf/cdf-3.8.0-r1.ebuild index 7d3f32ecb62b..7a705868953c 100644 --- a/sci-libs/cdf/cdf-3.8.0-r1.ebuild +++ b/sci-libs/cdf/cdf-3.8.0-r1.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=7 -inherit java-pkg-opt-2 multilib toolchain-funcs +inherit flag-o-matic java-pkg-opt-2 multilib toolchain-funcs MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)" MY_P="${MY_DP}_$(ver_cut 3)" @@ -56,6 +56,10 @@ src_prepare() { } src_compile() { + # Reported upstream by email in 2024-03-22 (bug #862675) + append-flags -fno-strict-aliasing + filter-lto + PV_SO=${PV:0:1} emake \ OS=linux \ diff --git a/sci-libs/cdf/cdf-3.9.0.ebuild b/sci-libs/cdf/cdf-3.9.0.ebuild new file mode 100644 index 000000000000..041ee9765e53 --- /dev/null +++ b/sci-libs/cdf/cdf-3.9.0.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic java-pkg-opt-2 toolchain-funcs + +MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)" +MY_P="${MY_DP}_$(ver_cut 3)" + +DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets" +HOMEPAGE="https://cdf.gsfc.nasa.gov" +SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/" +SRC_URI=" + ${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz + java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz ) + doc? ( + ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf + ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf + ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf + ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf + ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf + ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf + ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf + ) +" +S="${WORKDIR}/${MY_P}-dist" + +LICENSE="CDF" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples java ncurses static-libs" +RESTRICT="bindist" + +RDEPEND=" + java? ( >=virtual/jre-1.8:= ) + ncurses? ( sys-libs/ncurses:= ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ncurses? ( virtual/pkgconfig ) +" + +PATCHES=( + # Respect cflags, ldflags, soname + "${FILESDIR}"/${PN}-3.9.0-respect-flags.patch +) + +src_prepare() { + default + + # Use proper lib dir + sed -i \ + -e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \ + Makefile || die "sed failed" + # Uses the wide variant of *curses functions + sed -i \ + -e "s:-I/usr/include/ncurses:$($(tc-getPKG_CONFIG) --cflags-only-I ncursesw):g" \ + Makefile src/tools/Makefile || die "sed failed" +} + +src_compile() { + # Reported upstream by email in 2024-03-22 (bug #862675) + append-flags -fno-strict-aliasing + filter-lto + + PV_SO=${PV:0:1} + + emake \ + OS=linux \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + LD="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ + RANLIBcmd="$(tc-getRANLIB)" \ + ENV=gnu \ + SHARED=yes \ + SHAREDEXT_linux=so.${PV_SO} \ + CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncursesw)" "")" \ + CURSES=$(usex ncurses) \ + ${myconf} \ + all + + if use java; then + export CDF_BASE="${S}" + export CDF_LIB="${S}/src/lib" + cd cdfjava/jni + $(tc-getCC) \ + ${CFLAGS} -fPIC \ + -I${CDF_BASE}/src/include \ + -I$(java-config -O)/include \ + -I$(java-config -O)/include/linux \ + -c cdfNativeLibrary.c \ + -o cdfNativeLibrary.o \ + || die "compiling java lib failed" + $(tc-getCC) \ + ${LDFLAGS} \ + -shared cdfNativeLibrary.o \ + -Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \ + -L${CDF_LIB} -lcdf -lm \ + -o libcdfNativeLibrary.so.${PV_SO} \ + || die "linking java lib failed" + fi +} + +src_test() { + emake -j1 test +} + +src_install() { + dodir /usr/bin /usr/$(get_libdir) + # -j1 (fragile non-autotooled make) + emake -j1 \ + INSTALLDIR="${ED}/usr" \ + SHAREDEXT=so.${PV_SO} \ + install + dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so + use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a + dodoc Release.notes CHANGES.txt Welcome.txt + doenvd "${FILESDIR}"/50cdf + + if use doc; then + dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf + fi + + if use examples; then + docinto examples + dodoc samples/* + fi + + if use java; then + cd cdfjava || die + dolib.so jni/libcdfNativeLibrary.so.${PV_SO} + dosym libcdfNativeLibrary.so.${PV_SO} \ + /usr/$(get_libdir)/libcdfNativeLibrary.so + java-pkg_dojar */*.jar + if use examples; then + docinto examples/java + dodoc examples/* + fi + fi + + # move this to a better location + dodir "/usr/share/${PF}" + mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die +} diff --git a/sci-libs/cdf/files/cdf-3.9.0-respect-flags.patch b/sci-libs/cdf/files/cdf-3.9.0-respect-flags.patch new file mode 100644 index 000000000000..b47d5f1e9eeb --- /dev/null +++ b/sci-libs/cdf/files/cdf-3.9.0-respect-flags.patch @@ -0,0 +1,85 @@ +--- a/Makefile ++++ b/Makefile +@@ -1051,7 +1051,7 @@ install.tools: create.bin copy.tools + install.help_: create.help copy.help + + install.lib: create.lib copy.lib.a +- @if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \ ++ @if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \ + $(MAKE) $(EXTRAMAKE) MAKE=$(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \ + else \ + $(NULL) ; \ +@@ -1200,10 +1200,10 @@ copy.include: + cp $(INCsrcDIR)/cdftools.h $(INSTALLDIR)/include + + copy.lib.so: +- @echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib +- cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib/libcdf.$(VERSION).so +- rm -f $(INSTALLDIR)/lib/libcdf.so +- cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.so ++ @echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib ++ cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib/libcdf.$(VERSION).so ++ rm -f $(INSTALLDIR)/lib/libcdf.$(SHAREDEXT) ++ cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.$(SHAREDEXT) + + copy.lib.sl: + @echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib +--- a/src/lib/Makefile ++++ b/src/lib/Makefile +@@ -62,9 +62,9 @@ AR=ar + RANLIBcmd=ranlib + MACos=Darwin + +-CFLAGS=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR) ++CFLAGS+=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR) + CFLAGS2=-DZ_PREFIX +-LDFLAGS=$(LDOPTIONS) ++LDFLAGS+=$(LDOPTIONS) + ARFLAGS=$(AROPTIONS) + ZLIB=zlib + +@@ -108,17 +108,18 @@ ranlib.yes: + + shared.yes: libcdf.$(SHAREDEXT) + ++libcdf.$(SHAREDEXT) \ + libcdf.so \ + libcdf.dylib \ + libcdf.dll \ + libcdf.sl: $(OBJs) + @if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi +- @echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) +- $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) ++ @echo $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS) ++ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS) + + libcdf.o: $(OBJs) +- @echo $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) +- $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) ++ @echo $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) + + .c.o: + @if [ "$<" = "cdfgzip.c" ] || [ "$<" = "cdfgzip64.c" ] ; then \ +--- a/src/tools/Makefile ++++ b/src/tools/Makefile +@@ -33,7 +33,7 @@ + SHELL=/bin/sh + + CURSES=yes +-CCx=gcc ++CCx=$(CC) + COPTIONS=-I/usr/include/ncurses -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -O2 + COPTIONSld= + SYSLIBS=-lgcc +@@ -43,8 +43,8 @@ MAKE=make + INCLUDEcdf= ../include + + CC=$(CCx) +-CFLAGS=$(COPTIONS) -I$(INCLUDEcdf) +-CFLAGSld=$(COPTIONSld) ++CFLAGS+=$(COPTIONS) -I$(INCLUDEcdf) ++CFLAGSld=$(COPTIONSld) $(LDFLAGS) + + WHICHOS=$(shell uname -a | cut -f1 -d" ") + ifeq ("$(WHICHOS)","Darwin") diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest index c3da8e66ac75..e4bd9d33e5bc 100644 --- a/sci-libs/ceres-solver/Manifest +++ b/sci-libs/ceres-solver/Manifest @@ -1 +1,2 @@ DIST ceres-solver-2.1.0.tar.gz 3802187 BLAKE2B d8ff780cf9b9de2541c15a2b95bde07a2d1c8e60bab3a8a4b13134b99da699da452467afe3310b9f70c3c2a6bd033ea3c4bd3c401153899e9c70867fae30c633 SHA512 db777c4a4b85a9972628c714413fe9ca1a92cc6c8b14d80401842a02c4d7e7df4e9d236775e231e8337e47f21e47cd82c1a0fbcfeffbd9b654e46a66262996f2 +DIST ceres-solver-2.2.0.tar.gz 7635532 BLAKE2B ecdd5147e235df711705fc262fad18cfc79f8cfaaa9aba41428c70ae5996aab44c44e5b7d3f62d8ab4633ec2d7511c39191323911fea1276f5797e900c42bc60 SHA512 bf519fbcbd0ee2d4624be72cde061a09d191ee5e56dc33984669393799b885c2164efc99dcef71307f8b50a9ccad945882376ace3d9a44ba7e1f25c20511aabd diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild new file mode 100644 index 000000000000..eb2f320fe9bc --- /dev/null +++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DOCS_BUILDER="sphinx" +DOCS_DEPEND="dev-python/sphinx-rtd-theme" +DOCS_DIR="docs/source" +inherit cmake-multilib cuda flag-o-matic python-any-r1 docs + +DESCRIPTION="Nonlinear least-squares minimizer" +HOMEPAGE="http://ceres-solver.org/" +SRC_URI="http://ceres-solver.org/${P}.tar.gz" + +LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 )" +SLOT="0/1" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="examples cuda gflags lapack +schur sparse test" + +REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )" +RESTRICT="!test? ( test )" + +BDEPEND="${PYTHON_DEPS} + >=dev-cpp/eigen-3.3.4:3 + lapack? ( virtual/pkgconfig ) + doc? ( <dev-libs/mathjax-3 ) +" +RDEPEND=" + dev-cpp/glog[gflags?,${MULTILIB_USEDEP}] + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + lapack? ( virtual/lapack ) + sparse? ( + sci-libs/amd + sci-libs/camd + sci-libs/ccolamd + sci-libs/cholmod[metis(+)] + sci-libs/colamd + sci-libs/spqr + ) +" +DEPEND="${RDEPEND}" + +DOCS=( README.md VERSION ) + +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-system-mathjax.patch" +) + +src_prepare() { + cmake_src_prepare + + filter-lto + + # search paths work for prefix + sed -e "s:/usr:${EPREFIX}/usr:g" \ + -i cmake/*.cmake || die + + # remove Werror + sed -e 's/-Werror=(all|extra)//g' \ + -i CMakeLists.txt || die +} + +src_configure() { + # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF + local mycmakeargs=( + -DBUILD_BENCHMARKS=OFF + -DBUILD_EXAMPLES=$(usex examples) + -DBUILD_TESTING=$(usex test) + -DBUILD_DOCUMENTATION=$(usex doc) + -DGFLAGS=$(usex gflags) + -DLAPACK=$(usex lapack) + -DSCHUR_SPECIALIZATIONS=$(usex schur) + -DSUITESPARSE=$(usex sparse) + -DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3 + + -DBUILD_SHARED_LIBS="yes" + -DEIGENMETIS="yes" + -DEIGENSPARSE="yes" + -DMINIGLOG="no" + -DCUSTOM_BLAS="yes" + -DUSE_CUDA="$(usex cuda)" + ) + + if use cuda; then + : "${CUDAHOSTCXX:=$(cuda_gccdir)}" + : "${CUDAARCHS:=all}" + export CUDAHOSTCXX + export CUDAARCHS + fi + + use sparse || mycmakeargs+=( -DEIGENSPARSE=ON ) + + cmake-multilib_src_configure +} + +src_test() { + use cuda && cuda_add_sandbox -w + cmake_src_test +} + +src_install() { + cmake-multilib_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples data + fi +} diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index 64031fa708e5..e8ce87e899aa 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -1,4 +1 @@ -DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15 -DIST cfitsio-4.0.0.tar.gz 4746177 BLAKE2B a43a21d29522cac84294e81ad5f0a45839c21c2fafcbde42504670e73757a41ebd91e42d086529df8139ce920446332f827b1abf027f8932ee73dd025103cd8e SHA512 a5b20bd6ad648450e99167f63813cc7523347aadfc9f85d2c0ed3ba7e4516b3bb6bc0851f209268f2cb045cdacc43a3da9e4506af4581f806ab9f4de248065fa -DIST cfitsio-4.1.0.tar.gz 4305184 BLAKE2B 1edfce2b44ab990ed834b22dfc734af632f8f1401b6616f0c4322a3c40117123e52ba191610a3393c077f4a5fccd7462bcb4749e715cf2e9abae08edb1f1f8eb SHA512 bbbe10e890e74a30a9806dd2bbf711b3b1f15502b210b222d2d57cc083495c3b66b44927e4680f989045187fb7075f7187e2805ddcb4753ce53c68c3442cc813 -DIST cfitsio-4.2.0.tar.gz 4356372 BLAKE2B 7f5e695a56105866b2457e0f1c2d74bfb2aa86bc53e4eeb39aa9b8e79b278e1184a610422bf43c341a9f3159a93b980bab1ec9084475189b08dfa080b59ec2af SHA512 41b51653370874f50a7a9fe7d5f61577a979ab9d146b8249afa407d3858cb4dce0581eba23093972b66f7d1042b9693b98ad9130ec67b3b44e94005e72d60853 +DIST cfitsio-4.4.1.tar.gz 4308170 BLAKE2B 237a2f899b39a01ed73e3e41b420874c7654faf1f93e3c3b3454d2001a472f64b1c44fa2c88598ea21e3a8d60a1dcb76aa3001fee1e4443f91bcd565ce605a4f SHA512 a49e4e09a2e5f6e0ae823a68f02b3f6285cf3e0af66c9a1f8dadcd2867fa83c17fd27e446e8e5af9374ff2dc7b7a18334663ce977a1691c4ed4ced14d33232b7 diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild deleted file mode 100644 index 5f12eb26940e..000000000000 --- a/sci-libs/cfitsio/cfitsio-3.490.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${PN}-${PV%0*}" -inherit fortran-2 multilib-minimal - -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/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="ISC" -SLOT="0/9" -KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3" - -BDEPEND=" - sys-devel/bison - sys-devel/flex -" -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 -" - -PATCHES=( - "${FILESDIR}/${P}-ldflags.patch" - "${FILESDIR}/${P}-system-zlib.patch" - "${FILESDIR}/${P}-pkgconfig.patch" -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # Avoid internal cfortran - mv cfortran.h cfortran.h.disabled || die - ln -s "${EPREFIX}"/usr/include/cfortran.h . || die - - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_with bzip2) - $(use_enable curl) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - dodoc README docs/changes.txt - - dodoc docs/{quick,cfitsio,fpackguide}.pdf - dodoc docs/fitsio.pdf - - docinto examples - dodoc cookbook.c testprog.c speed.c smem.c - dodoc cookbook.f testf77.f - - # Remove static libs - find "${ED}" -name '*.a' -delete || die -} diff --git a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild deleted file mode 100644 index 9d0e3cc3f56e..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fortran-2 multilib-minimal - -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/9" -KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3" - -BDEPEND=" - sys-devel/bison - sys-devel/flex -" -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 -" - -PATCHES=( - "${FILESDIR}/${PN}-3.490-ldflags.patch" - "${FILESDIR}/${P}-system-zlib.patch" - "${FILESDIR}/${P}-pkgconfig.patch" -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # Avoid internal cfortran - mv cfortran.h cfortran.h.disabled || die - ln -s "${EPREFIX}"/usr/include/cfortran.h . || die - - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_with bzip2) - $(use_enable curl) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - dodoc README docs/changes.txt - - dodoc docs/{quick,cfitsio,fpackguide}.pdf - dodoc docs/fitsio.pdf - - docinto examples - dodoc cookbook.c testprog.c speed.c smem.c - dodoc cookbook.f testf77.f - - # Remove static libs - find "${ED}" -name '*.a' -delete || die -} diff --git a/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild deleted file mode 100644 index bff628779a26..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fortran-2 multilib-minimal - -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/9" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" - -BDEPEND=" - sys-devel/bison - sys-devel/flex -" -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 -" - -PATCHES=( - "${FILESDIR}/${PN}-3.490-ldflags.patch" - "${FILESDIR}/${P}-system-zlib.patch" - "${FILESDIR}/${P}-pkgconfig.patch" -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # Avoid internal cfortran - mv cfortran.h cfortran.h.disabled || die - ln -s "${EPREFIX}"/usr/include/cfortran.h . || die - - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_with bzip2) - $(use_enable curl) - $(use_enable threads reentrant) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if use tools ; then - emake utils - fi -} - -multilib_src_install_all() { - dodoc README docs/changes.txt - - dodoc docs/{quick,cfitsio,fpackguide}.pdf - dodoc docs/fitsio.pdf - - docinto examples - dodoc cookbook.c testprog.c speed.c smem.c - dodoc cookbook.f testf77.f - - # https://bugs.gentoo.org/855191 - if use tools; then - rm "${ED}/usr/bin/smem" || die - fi - - # Remove static libs - find "${ED}" -name '*.a' -delete || die -} diff --git a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild deleted file mode 100644 index 5983f292ee22..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fortran-2 multilib-minimal - -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/9" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" - -BDEPEND=" - sys-devel/bison - sys-devel/flex -" -RDEPEND=" - sys-libs/zlib[${MULTILIB_USEDEP}] - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) - tools? ( !dev-util/smem ) -" -# Bug #803350 -DEPEND="${RDEPEND} - <dev-lang/cfortran-20110621 -" - -PATCHES=( - "${FILESDIR}/${PN}-3.490-ldflags.patch" - "${FILESDIR}/${P}-system-zlib.patch" - "${FILESDIR}/${P}-pkgconfig.patch" -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # Avoid internal cfortran - mv cfortran.h cfortran.h.disabled || die - ln -s "${EPREFIX}"/usr/include/cfortran.h . || die - - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_with bzip2) - $(use_enable curl) - $(use_enable threads reentrant) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if use tools ; then - emake utils - fi -} - -multilib_src_install_all() { - dodoc README docs/changes.txt - - dodoc docs/{quick,cfitsio,fpackguide}.pdf - dodoc docs/fitsio.pdf - - docinto examples - dodoc cookbook.c testprog.c speed.c smem.c - dodoc cookbook.f testf77.f - - # Remove static libs - find "${ED}" -name '*.a' -delete || die -} diff --git a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild deleted file mode 100644 index ee2715047953..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fortran-2 multilib-minimal - -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" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" - -BDEPEND=" - sys-devel/bison - sys-devel/flex -" -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 -" - -PATCHES=( - "${FILESDIR}/${PN}-3.490-ldflags.patch" - "${FILESDIR}/${P}-system-zlib.patch" - "${FILESDIR}/${P}-pkgconfig.patch" -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # Avoid internal cfortran - mv cfortran.h cfortran.h.disabled || die - ln -s "${EPREFIX}"/usr/include/cfortran.h . || die - - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_with bzip2) - $(use_enable curl) - $(use_enable threads reentrant) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if use tools ; then - emake utils - fi -} - -multilib_src_install_all() { - dodoc README docs/changes.txt - - dodoc docs/{quick,cfitsio,fpackguide}.pdf - dodoc docs/fitsio.pdf - - docinto examples - dodoc cookbook.c testprog.c speed.c smem.c - dodoc cookbook.f testf77.f - - # https://bugs.gentoo.org/855191 - if use tools; then - rm "${ED}/usr/bin/smem" || die - fi - - # Remove static libs - find "${ED}" -name '*.a' -delete || die -} diff --git a/sci-libs/cfitsio/cfitsio-4.4.1.ebuild b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild new file mode 100644 index 000000000000..bd4c4375ffd6 --- /dev/null +++ b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild @@ -0,0 +1,77 @@ +# 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" +KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="bzip2 curl test threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" +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 + + if ! grep -q 'CFITSIO_SONAME,10' configure.in; then + die "Update subslot!" + fi + + # fix libdir & sync SONAME to configure.in + sed -e 's:lib/:${CMAKE_INSTALL_LIBDIR}/:' \ + -e "/SOVERSION/s:VERSION :VERSION ${SLOT#0/}.:" \ + -e "s:SOVERSION :SOVERSION ${SLOT#0/}.:" \ + -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=$(usex threads) + -DUSE_SSE2=$(usex cpu_flags_x86_sse2) + -DUSE_SSSE3=$(usex cpu_flags_x86_ssse3) + + -DTESTS=$(usex test) + -DUTILS=$(multilib_native_usex tools) + ) + cmake_src_configure +} + +multilib_src_install_all() { + dodoc README.md docs/changes.txt docs/*.pdf + + docinto examples + dodoc utilities/{cookbook.{c,f},testprog.c,testf77.f,speed.c,smem.c} +} diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch deleted file mode 100644 index 4b04fb9cc4fe..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/configure b/configure ---- a/configure 2018-05-09 21:16:00.000000000 +0200 -+++ b/configure 2018-05-23 17:17:18.452431657 +0200 -@@ -4215,8 +4215,8 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --LDFLAGS="$CFLAGS" --LDFLAGS_BIN="$LDFLAGS" -+# LDFLAGS="$CFLAGS" -+LDFLAGS_BIN="$CFLAGS" - - if test "x$FC" = "xnone" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5 diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch deleted file mode 100644 index 37b47c7b820f..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur a/cfitsio.pc.in b/cfitsio.pc.in ---- a/cfitsio.pc.in 2019-05-08 17:34:49.000000000 +0200 -+++ b/cfitsio.pc.in 2019-08-01 15:56:52.064310329 +0200 -@@ -1,12 +1,12 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --includedir=@includedir@ -+includedir=@includedir@/cfitsio - - Name: cfitsio - Description: FITS File Subroutine Library - URL: https://heasarc.gsfc.nasa.gov/fitsio/ - Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@ --Libs: -L${libdir} -lcfitsio --Libs.private: -lm @LIBS@ --Cflags: -I${includedir} -+Libs: -L${libdir} -lcfitsio -+Libs.private: -lm -lz @LIBS@ -+Cflags: -D_REENTRANT -I${includedir} diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch deleted file mode 100644 index 6ade40ce62f3..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ur a/Makefile.in b/Makefile.in ---- a/Makefile.in 2019-05-08 17:34:50.000000000 +0200 -+++ b/Makefile.in 2019-08-01 15:52:57.829760351 +0200 -@@ -68,9 +68,7 @@ - pliocomp.c fits_hcompress.c fits_hdecompress.c \ - simplerng.c @GSIFTP_SRC@ - --ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \ -- zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \ -- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c -+ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c - - SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@ - -@@ -103,7 +101,7 @@ - shared: lib${PACKAGE}${SHLIB_SUFFIX} - - lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} -- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS} -+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS} - @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ - ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ - ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ -@@ -140,28 +138,28 @@ - ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< - - smem: smem.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz - - testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - speed: speed.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - eval: # Rebuild eval_* files from flex/bison source - ${FLEX} -t eval.l > eval_l.c1 diff --git a/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch deleted file mode 100644 index 4d743f2d32d9..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cfitsio.pc.in b/cfitsio.pc.in -index 7cc25c6..95fb9d0 100644 ---- a/cfitsio.pc.in -+++ b/cfitsio.pc.in -@@ -1,12 +1,12 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --includedir=@includedir@ -+includedir=@includedir@/cfitsio - - Name: cfitsio - Description: FITS File Subroutine Library - URL: https://heasarc.gsfc.nasa.gov/fitsio/ - Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@ - Libs: -L${libdir} -lcfitsio --Libs.private: -lm @LIBS@ --Cflags: -I${includedir} -+Libs.private: -lm -lz @LIBS@ -+Cflags: -D_REENTRANT -I${includedir} diff --git a/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch deleted file mode 100644 index f26f3d431505..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index d607eec..b646458 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -102,7 +102,7 @@ lib${PACKAGE}.a: ${OBJECTS} - shared: lib${PACKAGE}${SHLIB_SUFFIX} - - lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} -- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS} -+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS} - @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ - ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ - ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ -@@ -140,28 +140,28 @@ swapproc.o: swapproc.c - ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< - - smem: smem.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz - - testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - speed: speed.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - eval: # Rebuild eval_* files from flex/bison source - ${FLEX} -t eval.l > eval_l.c1 diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch deleted file mode 100644 index 63502b77f756..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ur a/cfitsio.pc.in b/cfitsio.pc.in ---- a/cfitsio.pc.in 2022-05-26 17:25:47.094287274 +0200 -+++ b/cfitsio.pc.in 2022-05-26 17:30:27.552413663 +0200 -@@ -1,12 +1,12 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --includedir=@includedir@ -+includedir=@includedir@/cfitsio - - Name: cfitsio - Description: FITS File Subroutine Library - URL: https://heasarc.gsfc.nasa.gov/fitsio/ - Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@ - Libs: -L${libdir} -lcfitsio --Libs.private: -lm @LIBS@ --Cflags: -I${includedir} -+Libs.private: -lm -lz @LIBS@ -+Cflags: -D_REENTRANT -I${includedir} diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch deleted file mode 100644 index 6d740074857c..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ur a/Makefile.in b/Makefile.in ---- a/Makefile.in 2022-05-26 17:33:37.986215858 +0200 -+++ b/Makefile.in 2022-05-26 17:34:27.580944957 +0200 -@@ -102,7 +102,7 @@ - shared: lib${PACKAGE}${SHLIB_SUFFIX} - - lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} -- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS} -+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS} - @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ - ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ - ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ -@@ -140,31 +140,31 @@ - ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< - - smem: smem.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz - - testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - speed: speed.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - testf77: testf77.o lib${PACKAGE}.a ${OBJECTS} -- ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - eval: # Rebuild eval_* files from flex/bison source - ${FLEX} -t eval.l > eval_l.c1 diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch deleted file mode 100644 index 9ec614616552..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur a/cfitsio.pc.cmake b/cfitsio.pc.cmake ---- a/cfitsio.pc.cmake 2022-10-31 19:40:23.000000000 +0100 -+++ b/cfitsio.pc.cmake 2022-12-14 23:35:53.572102437 +0100 -@@ -1,12 +1,12 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@ - libdir=@LIB_DESTINATION@ --includedir=@INCLUDE_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@/cfitsio - - Name: cfitsio - Description: FITS File Subroutine Library - URL: https://heasarc.gsfc.nasa.gov/fitsio/ - Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@ - Libs: -L${libdir} -lcfitsio --Libs.private: @PKG_CONFIG_LIBS@ -lm --Cflags: -I${includedir} -+Libs.private: @PKG_CONFIG_LIBS@ -lm -z -+Cflags: -D_REENTRANT -I${includedir} diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch deleted file mode 100644 index fab375507f83..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur a/Makefile.in b/Makefile.in ---- a/Makefile.in 2022-10-31 19:40:23.000000000 +0100 -+++ b/Makefile.in 2022-12-14 23:37:10.785099554 +0100 -@@ -102,7 +102,7 @@ - shared: lib${PACKAGE}${SHLIB_SUFFIX} - - lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} -- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS} -+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS} - @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ - ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ - ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ -@@ -142,31 +142,31 @@ - ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< - - smem: smem.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz - - testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - speed: speed.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - testf77: testf77.o lib${PACKAGE}.a ${OBJECTS} -- ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} - - # Tested with bison 3.8 and flex 2.6.4 - eval: # Rebuild eval_* files from flex/bison source diff --git a/sci-libs/cfitsio/metadata.xml b/sci-libs/cfitsio/metadata.xml index c351d03c77d4..2f1ccc9b9b99 100644 --- a/sci-libs/cfitsio/metadata.xml +++ b/sci-libs/cfitsio/metadata.xml @@ -5,6 +5,11 @@ <email>sci-astronomy@gentoo.org</email> <name>Gentoo Astronomy Project</name> </maintainer> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + <!-- for dev-python/fitsio --> + </maintainer> <use> <flag name="tools"> Build optional utilities (cookbook fitscopy imcopy smem speed testprog fpack funpack) diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild index 6945d82b5a92..4caf7d901289 100644 --- a/sci-libs/cgcode/cgcode-1.0-r2.ebuild +++ b/sci-libs/cgcode/cgcode-1.0-r2.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 @@ -25,6 +25,10 @@ PATCHES=( src_prepare() { default + # bug #862681 + append-flags -fno-strict-aliasing + filter-lto + # GCC 10 workaround # bug #722000 append-fflags $(test-flags-FC -fallow-argument-mismatch) diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest index 2f912684c864..aff5aec578e2 100644 --- a/sci-libs/cgnslib/Manifest +++ b/sci-libs/cgnslib/Manifest @@ -1 +1,2 @@ DIST cgnslib-4.3.0.tar.gz 1472044 BLAKE2B 8fa59eb2c13b163553c03991af1886d2162295367094937c3b7bbbc687f098e736a927fb6835fabb43ecfbe59edcf0e58e8977e89eeb1ef12b26568fbdc78e2c SHA512 5db97b8df8cb5b108a65513e20774881c1dfa790dd96bec46119883d934db18e3f88450d287690cb785e0875af87a3ec32b6c4665c54edb623161122ee85aa93 +DIST cgnslib-4.4.0.tar.gz 1979828 BLAKE2B 1bf7a5eb8a69a488707da6e945228e053486cdfc64508ae6362ca84777bb5c22a7238676f24ca453cc8b5e2825482d473a2b84c1648849bb6f853fc0aa0a9100 SHA512 86c16d40b524519362645c553c91bade9bb7e4bffde7bf4de96a7f471ae3779a15781efa91efa059b2af0b127f08a560d2e903df6b45e1c79eaec6061db226e9 diff --git a/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild b/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild index 039b318c01be..39fb7c61d4a2 100644 --- a/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild +++ b/sci-libs/cgnslib/cgnslib-4.3.0-r2.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 @@ -6,7 +6,7 @@ EAPI=8 FORTRAN_NEEDED="fortran" FORTRAN_STANDARD="90 2003" -inherit cmake fortran-2 +inherit cmake flag-o-matic fortran-2 DESCRIPTION="CFD General Notation System standard library" HOMEPAGE=" @@ -56,6 +56,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862684 + # https://github.com/CGNS/CGNS/issues/758 + filter-lto + local mycmakeargs=( -DCGNS_BUILD_SHARED=ON -DCGNS_USE_SHARED=ON diff --git a/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild b/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild new file mode 100644 index 000000000000..e3836dc84986 --- /dev/null +++ b/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED="fortran" +FORTRAN_STANDARD="90 2003" + +inherit cmake flag-o-matic fortran-2 + +DESCRIPTION="CFD General Notation System standard library" +HOMEPAGE=" + https://cgns.github.io/ + https://github.com/CGNS/CGNS +" +SRC_URI="https://github.com/CGNS/CGNS/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CGNS-${PV}" + +LICENSE="ZLIB" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools" + +RDEPEND=" + hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) + tools? ( + dev-lang/tcl:= + dev-lang/tk:= + x11-libs/libXmu:= + virtual/glu + virtual/opengl + ) +" +DEPEND="${RDEPEND}" + +RESTRICT=" + fortran? ( test ) + !test? ( test ) +" +REQUIRED_USE=" + mpi? ( hdf5 ) + szip? ( hdf5 ) +" + +pkg_setup() { + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + # gentoo libdir + sed \ + -e 's|/lib|/'$(get_libdir)'|' \ + -e '/DESTINATION/s|lib|'$(get_libdir)'|g' \ + -i src/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862684 + # https://github.com/CGNS/CGNS/issues/758 + filter-lto + + local mycmakeargs=( + -DCGNS_BUILD_SHARED=ON + -DCGNS_USE_SHARED=ON + + -DCGNS_BUILD_CGNSTOOLS="$(usex tools)" + -DCGNS_ENABLE_BASE_SCOPE="$(usex base-scope)" + -DCGNS_ENABLE_FORTRAN="$(usex fortran)" + -DCGNS_ENABLE_HDF5="$(usex hdf5)" + -DCGNS_ENABLE_LEGACY="$(usex legacy)" + -DCGNS_ENABLE_SCOPING="$(usex scoping)" + -DCGNS_ENABLE_MEM_DEBUG="$(usex debug)" + -DCGNS_ENABLE_TESTS="$(usex test)" + ) + + if use mpi; then + mycmakeargs+=( + -DHDF5_NEED_MPI="$(usex mpi)" + -DHDF5_NEED_SZIP="$(usex szip)" + -DHDF5_NEED_ZLIB="$(usex szip)" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + dodoc README.md release_docs/{HISTORY,RELEASE,changes_from_2.5}.txt + rm "${ED}/usr/$(get_libdir)/libcgns.a" || die + dodoc release_docs/*.pdf + docompress -x /usr/share/doc/${PF}/examples + use examples && dodoc -r src/examples +} diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild index 1bc4d77580e2..ff0f058dd29e 100644 --- a/sci-libs/cholmod/cholmod-3.0.13.ebuild +++ b/sci-libs/cholmod/cholmod-3.0.13.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=7 +EAPI=8 -inherit toolchain-funcs +inherit autotools cuda toolchain-funcs DESCRIPTION="Sparse Cholesky factorization and update/downdate library" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" @@ -31,6 +31,18 @@ DEPEND=" )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-3.0.14-fix-CUDA.patch" +) + +src_prepare() { + use cuda && cuda_src_prepare + + default + # patch is modifying Makefile.am + eautoreconf +} + src_configure() { local lapack_libs=no local blas_libs=no diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild index 458f30a8b9c7..39f7dc95b12b 100644 --- a/sci-libs/cholmod/cholmod-3.0.14.ebuild +++ b/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit autotools cuda toolchain-funcs DESCRIPTION="Sparse Cholesky factorization and update/downdate library" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )" -SLOT="0" +SLOT="0/3" KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="cuda doc +lapack +matrixops +modify +partition" @@ -31,6 +31,18 @@ DEPEND=" )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-3.0.14-fix-CUDA.patch" +) + +src_prepare() { + use cuda && cuda_src_prepare + + default + # patch is modifying Makefile.am + eautoreconf +} + src_configure() { local lapack_libs=no local blas_libs=no diff --git a/sci-libs/cholmod/files/cholmod-3.0.14-fix-CUDA.patch b/sci-libs/cholmod/files/cholmod-3.0.14-fix-CUDA.patch new file mode 100644 index 000000000000..75cdee80bfe1 --- /dev/null +++ b/sci-libs/cholmod/files/cholmod-3.0.14-fix-CUDA.patch @@ -0,0 +1,109 @@ +https://bugs.gentoo.org/715610#c16 +https://bugs.gentoo.org/attachment.cgi?id=749631 + +--- cholmod-3.0.14.old/GPU/Makefile.am 2020-09-29 22:59:54.000000000 +0300 ++++ cholmod-3.0.14/GPU/Makefile.am 2021-11-09 02:20:06.579908785 +0300 +@@ -11,7 +11,7 @@ + libcholmodl_gpu_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG + + libcholmod_gpu_la_SOURCES = cholmod_gpu_kernels.cu +-libcholmod_gpu_la_LIBADD = libcholmodi_gpu.la libcholmodl_gpu.la ++libcholmod_gpu_la_LIBADD = libcholmodi_gpu.la libcholmodl_gpu.la cholmod_gpu_kernels.o + +-.cu.lo: +- $(LIBTOOL) --tag=CC --mode=compile $(NVCC) -c $< ++.cu.o: ++ $(NVCC) $(NVCCFLAGS) -o $@ -c $< +--- cholmod-3.0.14.old/GPU/cholmod_gpu.h 1970-01-01 03:00:00.000000000 +0300 ++++ cholmod-3.0.14/GPU/cholmod_gpu.h 2021-11-08 12:13:12.018328369 +0300 +@@ -0,0 +1,80 @@ ++/* ========================================================================== */ ++/* === Include/cholmod_gpu.h ================================================ */ ++/* ========================================================================== */ ++ ++/* ----------------------------------------------------------------------------- ++ * CHOLMOD/Include/cholmod_gpu.h. ++ * Copyright (C) 2014, Timothy A. Davis ++ * http://www.suitesparse.com ++ * -------------------------------------------------------------------------- */ ++ ++/* CHOLMOD GPU module ++ */ ++ ++#ifndef CHOLMOD_GPU_H ++#define CHOLMOD_GPU_H ++ ++#ifdef GPU_BLAS ++#include "omp.h" ++#include <fenv.h> ++#ifndef SUITESPARSE_GPU_EXTERN_ON ++#include <cuda.h> ++#include <cuda_runtime.h> ++#endif ++#endif ++ ++/* CHOLMOD_GPU_PRINTF: for printing GPU debug error messages */ ++/* ++#define CHOLMOD_GPU_PRINTF(args) printf args ++*/ ++#define CHOLMOD_GPU_PRINTF(args) ++ ++/* define supernode requirements for processing on GPU */ ++#define CHOLMOD_ND_ROW_LIMIT 256 /* required descendant rows */ ++#define CHOLMOD_ND_COL_LIMIT 32 /* required descendnat cols */ ++#define CHOLMOD_POTRF_LIMIT 512 /* required cols for POTRF & TRSM on GPU */ ++ ++/* # of host supernodes to perform before checking for free pinned buffers */ ++#define CHOLMOD_GPU_SKIP 3 ++ ++#define CHOLMOD_HANDLE_CUDA_ERROR(e,s) {if (e) {ERROR(CHOLMOD_GPU_PROBLEM,s);}} ++ ++typedef struct cholmod_gpu_pointers ++{ ++ double *h_Lx [CHOLMOD_HOST_SUPERNODE_BUFFERS] ; ++ double *d_Lx [CHOLMOD_DEVICE_STREAMS] ; ++ double *d_C ; ++ double *d_A [CHOLMOD_DEVICE_STREAMS] ; ++ void *d_Ls ; ++ void *d_Map ; ++ void *d_RelativeMap ; ++ ++} cholmod_gpu_pointers ; ++ ++int cholmod_gpu_memorysize /* GPU memory size available, 1 if no GPU */ ++( ++ size_t *total_mem, ++ size_t *available_mem, ++ cholmod_common *Common ++) ; ++ ++int cholmod_l_gpu_memorysize /* GPU memory size available, 1 if no GPU */ ++( ++ size_t *total_mem, ++ size_t *available_mem, ++ cholmod_common *Common ++) ; ++ ++int cholmod_gpu_probe ( cholmod_common *Common ) ; ++int cholmod_l_gpu_probe ( cholmod_common *Common ) ; ++ ++int cholmod_gpu_deallocate ( cholmod_common *Common ) ; ++int cholmod_l_gpu_deallocate ( cholmod_common *Common ) ; ++ ++void cholmod_gpu_end ( cholmod_common *Common ) ; ++void cholmod_l_gpu_end ( cholmod_common *Common ) ; ++ ++int cholmod_gpu_allocate ( cholmod_common *Common ) ; ++int cholmod_l_gpu_allocate ( cholmod_common *Common ) ; ++ ++#endif +--- cholmod-3.0.14.old/configure.ac 2020-09-29 22:59:54.000000000 +0300 ++++ cholmod-3.0.14/configure.ac 2021-11-08 12:17:00.865381081 +0300 +@@ -80,6 +80,7 @@ + NVCC, + nvcc,,) + AC_SUBST([NVCC]) ++ AC_SUBST([NVCCFLAGS]) + AX_CHECK_PKG_LIB( + [cublas], + [cublas_v2.h], diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml index 4b106db7f098..baceb4a3e5f7 100644 --- a/sci-libs/cholmod/metadata.xml +++ b/sci-libs/cholmod/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo Science Project</name> </maintainer> <use> - <flag name="cuda">Use nvidia cuda toolkit for speeding up computations</flag> <flag name="cholesky"> Enable sparse Cholesky factorisation </flag> diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest deleted file mode 100644 index b4e1510dc6e6..000000000000 --- a/sci-libs/cifparse-obj/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cifparse-obj-v7.105-prod-src.tar.gz 931151 BLAKE2B c362fc528e0c88b41ef8433c6d0235ae0bd4055c8c1704d2f1be8ba8aa27a7526b3d19172f2a4ffda79c323140a54dcb2b0a2eb78f30780473c9bcfb2ab6c6f9 SHA512 d626aa055bdd6762eda4b5b04121f37fff3bc09460b12cd6cb80566545d23e5c08a8ad54fa184076932d2cff38aa9d91fa659fbe9a70d4a07b8b1677c28549f4 diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild deleted file mode 100644 index 49706b8cea37..000000000000 --- a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_P="${PN}-v${PV}-prod-src" - -DESCRIPTION="Provides an object-oriented application interface to information in mmCIF format" -HOMEPAGE="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/index.html" -SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz" - -LICENSE="PDB" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" - -RDEPEND="" -DEPEND=" - sys-devel/bison - sys-devel/flex" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-makefile.patch - "${FILESDIR}"/${PN}-7.025-gcc5_6.patch -) - -src_prepare() { - default - - sed \ - -e "s:^\(CC=\).*:\1$(tc-getCC):g" \ - -e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \ - -e "s:^\(F77=\).*:\1${FORTRANC}:g" \ - -e "s:^\(F77_LINKER=\).*:\1${FORTRANC}:g" \ - -e "s:-static::g" \ - -i "${S}"/etc/make.* || die "Failed to fix makefile" -} - -src_compile() { - # parallel make fails - emake -j1 \ - C_OPT="${CFLAGS}" \ - CXX_OPT="${CXXFLAGS}" -} - -src_install() { - dolib.a lib/* - insinto /usr/include/${PN} - doins include/* -} diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5_6.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5_6.patch deleted file mode 100644 index 2ac0ec220d9e..000000000000 --- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5_6.patch +++ /dev/null @@ -1,16 +0,0 @@ - etc/platform.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/platform.sh b/etc/platform.sh -index ff0ab51..1b56ab1 100755 ---- a/etc/platform.sh -+++ b/etc/platform.sh -@@ -60,7 +60,7 @@ case `uname -s` in - # Check if it is a Linux platform - Linux) - # Check if it is GCC version 4.x -- gcc_ver=`gcc --version | grep -e " 4\."` -+ gcc_ver=`gcc --version | grep -e " [456]\."` - if [[ -z $gcc_ver ]] - then - # It is not GCC version 4.x. Check if it is GCC version 3.x diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.105-makefile.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.105-makefile.patch deleted file mode 100644 index 1716cd6390a4..000000000000 --- a/sci-libs/cifparse-obj/files/cifparse-obj-7.105-makefile.patch +++ /dev/null @@ -1,110 +0,0 @@ - etc/make.platform.gnu3 | 14 +++++++------- - etc/make.platform.gnu4 | 16 ++++++++-------- - 2 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/etc/make.platform.gnu3 b/etc/make.platform.gnu3 -index 54b0297..138fa47 100644 ---- a/etc/make.platform.gnu3 -+++ b/etc/make.platform.gnu3 -@@ -107,8 +107,8 @@ NON_ANSI_C_FLAG= - C_WARNINGS=$(WARNINGS) - - # C compiler flags --CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) --CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(C_WARNINGS) \ -+CFLAGS=$(C_OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) -+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(C_WARNINGS) \ - $(DEFINES) $(INCLUDES) - - ## C++ compiler -@@ -128,14 +128,14 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED) - EXT=C - - # C++ compiler flags --C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ -+C++FLAGS=$(CXX_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ - $(DEFINES) $(INCLUDES) --C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \ -+C++FLAGS_NONANSI=$(CXX_OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \ - $(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES) - - # C++FLAGS_RELAXED should be set to avoid warnings reported by third party - # source code that is not maintained by PDB --C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ -+C++FLAGS_RELAXED=$(CXX_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ - $(DEFINES) $(INCLUDES) - - ## Fortran compiler -@@ -145,7 +145,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ - F77=f77 - - # Fortran compiler flags --FFLAGS=-O -u -+FFLAGS=$(F_OPT) - - # Additional Fortran libraries - F77LIBS= -@@ -158,7 +158,7 @@ F77LIBS= - STATIC_LINKING=-static - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) -+LDFLAGS=$(ABI) -w $(STATIC_LINKING) $(LD_OPT) - LDFLAGS_NO_STATIC=$(ABI) -w - - # Fortran linker -diff --git a/etc/make.platform.gnu4 b/etc/make.platform.gnu4 -index 6676f35..51681fa 100644 ---- a/etc/make.platform.gnu4 -+++ b/etc/make.platform.gnu4 -@@ -107,11 +107,11 @@ NON_ANSI_C_FLAG= - C_WARNINGS=$(WARNINGS) - - # C compiler flags --CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) --CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) -+CFLAGS=$(C_OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) -+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) - - ## C++ compiler --## This part defines C++ compiler information -+ - - # C++ compiler executable - CCC=g++ -@@ -127,14 +127,14 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED) - EXT=C - - # C++ compiler flags --C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ -+C++FLAGS=$(CXX_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ - $(DEFINES) $(INCLUDES) --C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \ -+C++FLAGS_NONANSI=$(CXX_OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \ - $(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES) - - # C++FLAGS_RELAXED should be set to avoid warnings reported by third party - # source code that is not maintained by PDB --C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ -+C++FLAGS_RELAXED=$(CXX_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ - $(DEFINES) $(INCLUDES) - - ## Fortran compiler -@@ -144,7 +144,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ - F77=f77 - - # Fortran compiler flags --FFLAGS=-O -u -+FFLAGS=$(F_OPT) - - # Additional Fortran libraries - F77LIBS= -@@ -157,7 +157,7 @@ F77LIBS= - STATIC_LINKING=-static - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) -+LDFLAGS=$(ABI) -w $(STATIC_LINKING) $(LD_OPT) - LDFLAGS_NO_STATIC=$(ABI) -w - - # Fortran linker diff --git a/sci-libs/cifparse-obj/metadata.xml b/sci-libs/cifparse-obj/metadata.xml deleted file mode 100644 index e490bcb8aa87..000000000000 --- a/sci-libs/cifparse-obj/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-chemistry@gentoo.org</email> - <name>Gentoo Chemistry Project</name> - </maintainer> -</pkgmetadata> diff --git a/sci-libs/clblast/metadata.xml b/sci-libs/clblast/metadata.xml index 8525f0a2541e..a6b955fc76b2 100644 --- a/sci-libs/clblast/metadata.xml +++ b/sci-libs/clblast/metadata.xml @@ -21,9 +21,6 @@ <flag name="cuda"> Build with support for cuda instead of opencl (beta!) </flag> - <flag name="opencl"> - Build with support for opencl - </flag> </use> <upstream> <remote-id type="github">CNugteren/CLBlast</remote-id> diff --git a/sci-libs/coinhsl/Manifest b/sci-libs/coinhsl/Manifest deleted file mode 100644 index 2f8053212e27..000000000000 --- a/sci-libs/coinhsl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST coinhsl-2015.06.23.tar.gz 908522 BLAKE2B ccc64a7790b1f9105439f6690e87bed52ff48306132db5fa27a036b4ce87472dfc3ca92f3e9d94aefdf737ed292568f36831eb24ac94d77f4b9bab84bc3ea36e SHA512 ad831d6ffd3c1e46481da8e58c7075adc69cb02800002c2067053fd354c5971214025982b24a9b74c681c2c3d86fd5adac78820242209feb75898165cf38753f diff --git a/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild b/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild deleted file mode 100644 index 9e1cac607992..000000000000 --- a/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_STANDARD="77 90" - -inherit fortran-2 toolchain-funcs - -DESCRIPTION="HSL mathematical software library for IPOPT" -HOMEPAGE="http://www.hsl.rl.ac.uk/ipopt" -SRC_URI="${P}.tar.gz" - -LICENSE="HSL" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - sci-libs/metis - virtual/blas" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -RESTRICT="mirror fetch" - -src_configure() { - export LIBS="$($(tc-getPKG_CONFIG) --libs metis blas lapack)" - default - MAKEOPTS+=" -j1" -} diff --git a/sci-libs/coinhsl/metadata.xml b/sci-libs/coinhsl/metadata.xml deleted file mode 100644 index 8225fda14e49..000000000000 --- a/sci-libs/coinhsl/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - HSL (formerly the Harwell Subroutine Library) is a collection of - state-of-the-art packages for large-scale scientific computation - such as the solution of sparse linear systems of equations and - sparse eigenvalue problems. This package is specific as a plugin for - Ipopt. - </longdescription> -</pkgmetadata> diff --git a/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild b/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild index d4c00fae9301..97a0d723632a 100644 --- a/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild +++ b/sci-libs/coinor-alps/coinor-alps-1.5.7.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=7 @@ -18,7 +18,7 @@ RDEPEND="sci-libs/coinor-utils:=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-cgl )" src_prepare() { diff --git a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild index a904acfd1336..84b5772c1004 100644 --- a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild +++ b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.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=7 @@ -22,7 +22,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" PATCHES=( diff --git a/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild b/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild index 7776577f7aa2..e38fe634ef0a 100644 --- a/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild +++ b/sci-libs/coinor-bcps/coinor-bcps-0.94.5.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=7 @@ -21,7 +21,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-cgl sci-libs/coinor-sample diff --git a/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild b/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild index dcc2f33bd47e..babf843fc556 100644 --- a/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild +++ b/sci-libs/coinor-blis/coinor-blis-0.94.8.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=7 @@ -24,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" src_prepare() { diff --git a/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild b/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild index 7ec47de50280..22064e140cf8 100644 --- a/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild +++ b/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.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=7 @@ -26,7 +26,7 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] virtual/latex-base ) test? ( sci-libs/coinor-sample )" diff --git a/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild b/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild index 900a12b42ddd..00f1ec0b0c13 100644 --- a/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild +++ b/sci-libs/coinor-cbc/coinor-cbc-2.10.5.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=7 @@ -25,7 +25,7 @@ RESTRICT="!test? ( test )" # BDEPEND="virtual/fortran virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" DEPEND="sci-libs/coinor-clp:= sci-libs/coinor-cgl:= diff --git a/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild b/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild index 69da3cea193b..04e61728764d 100644 --- a/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild +++ b/sci-libs/coinor-cgl/coinor-cgl-0.60.3.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=7 @@ -25,7 +25,7 @@ RESTRICT="!test? ( test )" # BDEPEND="virtual/fortran virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" DEPEND="sci-libs/coinor-clp:= diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild index d3e93719609a..c58ce4d26447 100644 --- a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild +++ b/sci-libs/coinor-clp/coinor-clp-1.17.6.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=7 @@ -27,7 +27,7 @@ RESTRICT="!test? ( test )" # BDEPEND="virtual/fortran virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" # USE=mpi is disabled on sci-libs/mumps because mumps/scotch are in diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild index cd577558b1c2..b1e7029b5883 100644 --- a/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild +++ b/sci-libs/coinor-couenne/coinor-couenne-0.5.8-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=7 @@ -28,7 +28,7 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] virtual/latex-base )" diff --git a/sci-libs/coinor-cppad/coinor-cppad-20210000.5-r1.ebuild b/sci-libs/coinor-cppad/coinor-cppad-20210000.5-r1.ebuild index 877167b85113..31e95d9b417b 100644 --- a/sci-libs/coinor-cppad/coinor-cppad-20210000.5-r1.ebuild +++ b/sci-libs/coinor-cppad/coinor-cppad-20210000.5-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=7 @@ -28,7 +28,7 @@ DEPEND=" BDEPEND=" virtual/pkgconfig doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] virtual/latex-base )" diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild index 9ea837d36076..dc17e23f1a48 100644 --- a/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild +++ b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.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=7 @@ -25,7 +25,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" src_prepare() { diff --git a/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild b/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild index 4e63c3062924..73b6503f67f9 100644 --- a/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild +++ b/sci-libs/coinor-dylp/coinor-dylp-1.10.4.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=7 @@ -25,7 +25,7 @@ RESTRICT="!test? ( test )" # BDEPEND="virtual/fortran virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" DEPEND="sci-libs/coinor-osi:=" diff --git a/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild b/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild index 9139e3120b48..08dd09ec0b49 100644 --- a/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild +++ b/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.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=7 @@ -19,7 +19,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" + doc? ( app-text/doxygen[dot] )" src_prepare() { default diff --git a/sci-libs/coinor-os/Manifest b/sci-libs/coinor-os/Manifest deleted file mode 100644 index ceb7dc079f70..000000000000 --- a/sci-libs/coinor-os/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST OS-2.10.1.tgz 37106742 BLAKE2B 6cf206489e4a63c33a1610ca12d59fcb6607d58a053411d0f9cfa6896e85be82ec18387ffc2e8aae3bbff3326574e0938fdfae1ba96c3862c366d343149f559c SHA512 bfc0af075e0db2160db694ec1e6f69c36cd52b29449fcbd689c809db01a9cf5f6a8a59edb7fb7269db5757faa14da5cd9fef34dffc73de7b2953b35fc2b710f0 diff --git a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild deleted file mode 100644 index 792b443c5d97..000000000000 --- a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -MY_PN=OS - -DESCRIPTION="COIN-OR Optimization Services" -HOMEPAGE="https://projects.coin-or.org/OS/" -SRC_URI="http://www.coin-or.org/download/source/${MY_PN}/${MY_PN}-${PV}.tgz" -S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}" - -LICENSE="EPL-1.0" -SLOT="0/6" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sci-libs/coinor-bcp:= - sci-libs/coinor-bonmin:= - sci-libs/coinor-couenne:= - sci-libs/coinor-clp:= - sci-libs/coinor-dylp:= - sci-libs/coinor-symphony:= - sci-libs/coinor-utils:= - sci-libs/coinor-vol:= - sci-libs/ipopt:=" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - test? ( sci-libs/coinor-sample )" - -PATCHES=( - "${FILESDIR}/${PN}-2.10.1-fix-c++14.patch" -) - -src_prepare() { - default - - # needed for the --with-coin-instdir - dodir /usr -} - -src_configure() { - append-cppflags -DNDEBUG - - # Can be dropped > 2.10.3 as patches landed upstream but don't - # apply cleanly to 2.10.1. - # bug #808793 - append-cxxflags -std=c++14 - - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - --enable-dependency-linking \ - --with-coin-instdir="${ED%/}"/usr -} - -src_install() { - default - use doc && dodoc doc/*.pdf - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch b/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch deleted file mode 100644 index a788646abfe1..000000000000 --- a/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch +++ /dev/null @@ -1,100 +0,0 @@ -Fix building with C++14, which errors out due to bool -> T* conversions -and changed semantics caught by -Werror=terminate. - -See also: https://bugs.gentoo.org/show_bug.cgi?id=594180 -Patch partially taken from: https://projects.coin-or.org/OS/changeset/5137/ - ---- a/src/OSCommonInterfaces/OSInstance.cpp -+++ b/src/OSCommonInterfaces/OSInstance.cpp -@@ -165,6 +165,9 @@ - }
-
- OSInstance::~OSInstance()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
- {
- std::ostringstream outStr;
-
---- a/src/OSCommonInterfaces/OSInstance.h -+++ b/src/OSCommonInterfaces/OSInstance.h -@@ -2267,7 +2267,11 @@ - OSInstance();
-
- /** The OSInstance class destructor */
-- ~OSInstance();
-+ ~OSInstance()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
-+ ;
-
- /** the instanceHeader is implemented as a general file header object
- * to allow sharing of classes between schemas
---- a/src/OSCommonInterfaces/OSMatrix.cpp -+++ b/src/OSCommonInterfaces/OSMatrix.cpp -@@ -2297,7 +2297,7 @@ - - if (!processBlocks(rowPartition, rowPartitionSize, - colPartition, colPartitionSize, false, symmetry)) -- return false; -+ return NULL; - return ExpandedMatrixByBlocks.back(); - }// end of MatrixType::getBlocks - ---- a/src/OSParsers/OSParseosil.tab.cpp -+++ b/src/OSParsers/OSParseosil.tab.cpp -@@ -180,7 +180,7 @@ - - #define GETATTRIBUTETEXT \ - for(; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; \ -- if( *ch != '=') { osilerror_wrapper( ch, osillineno, "found an attribute not defined"); return false;} \ -+ if( *ch != '=') { osilerror_wrapper( ch, osillineno, "found an attribute not defined"); return NULL;} \ - ch++; \ - for(; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; \ - if(*ch == '\"'){ \ -@@ -196,7 +196,7 @@ - *p = ch; \ - for( ; *ch != '\''; ch++); \ - } \ -- else { osilerror_wrapper( ch, osillineno,"missing quote on attribute"); return false;} \ -+ else { osilerror_wrapper( ch, osillineno,"missing quote on attribute"); return NULL;} \ - }\ - numChar = ch - *p; \ - attText = new char[numChar + 1]; \ -@@ -11070,7 +11070,7 @@ - // eat the white space - for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; - for(i = 0; sizeOf[i] == *ch; i++, ch++); -- if(i != 6) { osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in <base64BinaryData> element"); return false;} -+ if(i != 6) { osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in <base64BinaryData> element"); return NULL;} - // ch should be pointing to the first character after sizeOf - GETATTRIBUTETEXT; - ch++; -@@ -11080,7 +11080,7 @@ - // eat the white space - for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; - // better have an > sign or not valid -- if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"<base64BinaryData> element does not have a proper closing >"); return false;} -+ if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"<base64BinaryData> element does not have a proper closing >"); return NULL;} - ch++; - // we are now pointing start of the data - const char *b64textstart = ch; -@@ -11089,7 +11089,7 @@ - const char *b64textend = ch; - // we should be pointing to </base64BinaryData> - for(i = 0; endBase64BinaryData[i] == *ch; i++, ch++); -- if(i != 18) { osilerror_wrapper( ch,osillineno," problem with <base64BinaryData> element"); return false;} -+ if(i != 18) { osilerror_wrapper( ch,osillineno," problem with <base64BinaryData> element"); return NULL;} - int b64len = b64textend - b64textstart; - b64string = new char[ b64len + 1]; - for(ki = 0; ki < b64len; ki++) b64string[ki] = b64textstart[ ki]; -@@ -11097,7 +11097,7 @@ - // burn the white space - for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; - // better have an > sign or not valid -- if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"</base64BinaryData> element does not have a proper closing >"); return false;} -+ if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"</base64BinaryData> element does not have a proper closing >"); return NULL;} - ch++; - for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; - *p = ch; diff --git a/sci-libs/coinor-os/metadata.xml b/sci-libs/coinor-os/metadata.xml deleted file mode 100644 index ba6fc02b9b6f..000000000000 --- a/sci-libs/coinor-os/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - The objective of Optimization Services (OS) is to provide a set of - standards for representing optimization instances, results, solver - options, and communication between clients and solvers in a - distributed environment using Web Services. - </longdescription> -</pkgmetadata> diff --git a/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild b/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild index 3a3dfebffd0f..18e7b9c1f4b1 100644 --- a/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild +++ b/sci-libs/coinor-osi/coinor-osi-0.108.6.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=7 @@ -33,7 +33,7 @@ RESTRICT="!test? ( test )" # BDEPEND="virtual/fortran virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" DEPEND="sci-libs/coinor-utils:=" RDEPEND="${DEPEND}" diff --git a/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild b/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild index e91f6006f743..9434313abe95 100644 --- a/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild +++ b/sci-libs/coinor-smi/coinor-smi-0.96.1.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=7 @@ -21,7 +21,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" + doc? ( app-text/doxygen[dot] )" src_prepare() { default diff --git a/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild b/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild index b5c346e982ed..d47ebd87a91f 100644 --- a/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild +++ b/sci-libs/coinor-utils/coinor-utils-2.11.4.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=7 @@ -27,7 +27,7 @@ RESTRICT="!test? ( test )" # BDEPEND="virtual/fortran virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" DEPEND="sys-libs/readline:0= blas? ( virtual/blas ) diff --git a/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild b/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild index 894f4b5605b5..df2b863571ea 100644 --- a/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild +++ b/sci-libs/coinor-utils/coinor-utils-2.11.9.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 @@ -27,7 +27,7 @@ RESTRICT="!test? ( test )" # BDEPEND="virtual/fortran virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" DEPEND="sys-libs/readline:0= blas? ( virtual/blas ) diff --git a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild index 9a1c8156b9a2..459d7cb9393f 100644 --- a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild +++ b/sci-libs/coinor-vol/coinor-vol-1.5.4.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=7 @@ -25,7 +25,7 @@ RESTRICT="!test? ( test )" # BDEPEND="virtual/fortran virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( sci-libs/coinor-sample )" DEPEND="sci-libs/coinor-osi:= diff --git a/sci-libs/composable-kernel/Manifest b/sci-libs/composable-kernel/Manifest new file mode 100644 index 000000000000..9272a772facf --- /dev/null +++ b/sci-libs/composable-kernel/Manifest @@ -0,0 +1,3 @@ +DIST composable-kernel-5.7.1.tar.gz 2158402 BLAKE2B 660c205c2a99cd17f29a9077e9e7b8b88e41f42ab40d92d0a235e7a60683a04234cce6b2eb6110265c2f461dd132c40151b2521b7d64df4cebb7f27094d8b2b0 SHA512 3931c5dbcab59513541103ebf7446311a1e318421a9e12aeafa7a98cf0717a75e1519140e6b2fbcaf4cb90829a11f03a724ff3ccc6636139c61667ac82558c55 +DIST composable-kernel-6.1.1.tar.gz 2520967 BLAKE2B 549d76c5c36b0a273a4c51159abd162403ad035520f97c43dd4b66560ad30021199d2f4cf7e2c12ffe33beee2fb49604db6d7c40b3b33fdcbfde111b9d4833aa SHA512 3f7667cea91760447c3f6ac0bfc261c0bca95abafbfce209d1c889e04f01ec29849e8d7f0e1cb1d77a4309ac06b3c2557721a773e4a67be383de91668cb279b2 +DIST gtest-1.14.0_p20220421.tar.gz 849107 BLAKE2B e9c32d9c1d98959583b696430a6be411f5d69e3db96669b16cffc0f1dcad42512391c0a4733f6e829c82953ff33fa243ee782f3cf6e86436f0d290f45d1a3db7 SHA512 967aac7d85da0e216fe13b17d10f894a31d763d9b88201bac7d3dfc37600552b5472d30a166a6ef27f2778677e73fd3e43d082695a48f47824262eb9cd4fcd2f diff --git a/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild b/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild new file mode 100644 index 000000000000..30016b8dbf79 --- /dev/null +++ b/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake flag-o-matic llvm rocm + +GTEST_COMMIT="b85864c64758dec007208e56af933fc3f52044ee" +GTEST_FILE="gtest-1.14.0_p20220421.tar.gz" + +LLVM_MAX_SLOT=17 + +DESCRIPTION="High Performance Composable Kernel for AMD GPUs" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/composable_kernel" +SRC_URI="https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +IUSE="debug test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/hip + >=dev-db/sqlite-3.17 + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + >=dev-libs/boost-1.72 + dev-cpp/nlohmann_json + dev-cpp/frugally-deep +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-build/rocm-cmake +" + +S="${WORKDIR}/composable_kernel-rocm-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-5.7.1-enable-test-examples.patch" +) + +src_prepare() { + sed -e '/-Werror/d' -i cmake/EnableCompilerWarnings.cmake || die + cmake_src_prepare +} + +src_configure() { + if ! use debug; then + append-cflags "-DNDEBUG" + append-cxxflags "-DNDEBUG" + CMAKE_BUILD_TYPE="Release" + else + CMAKE_BUILD_TYPE="Debug" + fi + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_DEV=OFF + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DBUILD_TESTS=$(usex test ON OFF) + ) + + if use test; then + mycmakeargs+=( + -DGOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + ) + fi + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + LD_LIBRARY_PATH="${BUILD_DIR}"/lib cmake_src_test -j1 +} diff --git a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild new file mode 100644 index 000000000000..8c096e29135a --- /dev/null +++ b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake flag-o-matic rocm + +GTEST_COMMIT="b85864c64758dec007208e56af933fc3f52044ee" +GTEST_FILE="gtest-1.14.0_p20220421.tar.gz" + +DESCRIPTION="High Performance Composable Kernel for AMD GPUs" +HOMEPAGE="https://github.com/ROCm/composable_kernel" +SRC_URI="https://github.com/ROCm/composable_kernel/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" +S="${WORKDIR}/composable_kernel-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +IUSE="debug test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/hip + >=dev-db/sqlite-3.17 + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + >=dev-libs/boost-1.72 + dev-cpp/nlohmann_json + dev-cpp/frugally-deep +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-build/rocm-cmake +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-enable-examples.patch + "${FILESDIR}"/${PN}-6.1.1-fix-clang-17-no-offload-uniform-block.patch + "${FILESDIR}"/${PN}-6.1.1-no-git-no-hash.patch +) + +src_prepare() { + sed -e '/-Werror/d' -i cmake/EnableCompilerWarnings.cmake || die + cmake_src_prepare +} + +src_configure() { + if ! use debug; then + append-cflags "-DNDEBUG" + append-cxxflags "-DNDEBUG" + CMAKE_BUILD_TYPE="Release" + else + CMAKE_BUILD_TYPE="Debug" + fi + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_DEV=OFF + -DGPU_TARGETS="$(get_amdgpu_flags)" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DBUILD_TESTING=$(usex test ON OFF) + ) + + if use test; then + mycmakeargs+=( + -DGOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + ) + fi + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + LD_LIBRARY_PATH="${BUILD_DIR}"/lib cmake_src_test -j1 +} diff --git a/sci-libs/composable-kernel/files/composable-kernel-5.7.1-enable-test-examples.patch b/sci-libs/composable-kernel/files/composable-kernel-5.7.1-enable-test-examples.patch new file mode 100644 index 000000000000..dd93b8af743a --- /dev/null +++ b/sci-libs/composable-kernel/files/composable-kernel-5.7.1-enable-test-examples.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,8 +280,14 @@ rocm_package_setup_component(profiler + ) + + add_subdirectory(library) +-add_subdirectory(example) +-add_subdirectory(test) ++option(BUILD_EXAMPLES "Build examples" OFF) ++if(BUILD_EXAMPLES) ++ add_subdirectory(example) ++endif() ++option(BUILD_TESTS "Build binaries for tests" OFF) ++if(BUILD_TESTS) ++ add_subdirectory(test) ++endif() + add_subdirectory(profiler) + + #Create an interface target for the include only files and call it "composablekernels" diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch new file mode 100644 index 000000000000..bedc79c562bd --- /dev/null +++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch @@ -0,0 +1,14 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -470,7 +470,10 @@ if(NOT DEFINED INSTANCES_ONLY) + LIBRARY_NAME composablekernel + PACKAGE_NAME examples + ) +- add_subdirectory(example) ++ option(BUILD_EXAMPLES "Build examples" OFF) ++ if(BUILD_EXAMPLES) ++ add_subdirectory(example) ++ endif() + if(BUILD_TESTING) + add_subdirectory(test) + endif() diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch new file mode 100644 index 000000000000..3a102bec49cd --- /dev/null +++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch @@ -0,0 +1,18 @@ +`-fno-offload-uniform-block` flag was added in Clang 18; do not use it if hipcc uses Clang 17 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -144,11 +144,9 @@ else() + message("Building CK for the following targets: ${AMDGPU_TARGETS}") + endif() + find_package(hip) +-# No assumption that HIP kernels are launched with uniform block size for backward compatibility +-# SWDEV-413293 and https://reviews.llvm.org/D155213 +-math(EXPR hip_VERSION_FLAT "(${hip_VERSION_MAJOR} * 1000 + ${hip_VERSION_MINOR}) * 100000 + ${hip_VERSION_PATCH}") +-message("hip_version_flat=${hip_VERSION_FLAT}") +-if(NOT WIN32 AND ${hip_VERSION_FLAT} GREATER 500723302) ++ ++check_cxx_compiler_flag("-x hip -fno-offload-uniform-block" COMPILER_HAS_OPTION_OFFLOAD_UNIFORM_BLOCK) ++if(COMPILER_HAS_OPTION_OFFLOAD_UNIFORM_BLOCK) + message("Adding the fno-offload-uniform-block compiler flag") + add_compile_options(-fno-offload-uniform-block) + endif() diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch new file mode 100644 index 000000000000..6c6b161b1a14 --- /dev/null +++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch @@ -0,0 +1,14 @@ +Fix "Could NOT find Git (missing: GIT_EXECUTABLE)", git is not needed for releases +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,9 +84,7 @@ include(getopt) + # CK config file to record supported datatypes, etc. + configure_file(include/ck/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/ck/config.h) + +-# CK version file to record release version as well as git commit hash +-find_package(Git REQUIRED) +-execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD OUTPUT_VARIABLE COMMIT_ID OUTPUT_STRIP_TRAILING_WHITESPACE) ++# CK version file to record release version + configure_file(include/ck/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/ck/version.h) + + set(ROCM_SYMLINK_LIBS OFF) diff --git a/sci-libs/composable-kernel/metadata.xml b/sci-libs/composable-kernel/metadata.xml new file mode 100644 index 000000000000..afd22272458c --- /dev/null +++ b/sci-libs/composable-kernel/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"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Science Project</name> + </maintainer> + <upstream> + <remote-id type="github">ROCm/composable_kernel</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/datasets/Manifest b/sci-libs/datasets/Manifest index ac1dc508ab82..8499b8b1ec10 100644 --- a/sci-libs/datasets/Manifest +++ b/sci-libs/datasets/Manifest @@ -1,4 +1 @@ -DIST datasets-2.11.0.gh.tar.gz 2141289 BLAKE2B 0fb471dd6ee5de3831eb6586c4a15e67381262470b72d5ab02ee87dfc7977cb4d40e04da6507049d1e47cb8948cad11988bb7627293b48231e1cd413d2cfb885 SHA512 9ec2274d7978e3dde1b2f8ce78dd65bdf66742bbfee7b8672af46216aeaae3ef5c4604a8a5ea0bdee808f1c362cca9a122c16d2e9a161678148e581e4cd5c863 -DIST datasets-2.12.0.gh.tar.gz 2149274 BLAKE2B 8f188901dfe293ac2b673f37e0d135e01a8f131adf9030ef1815ce2faa7ba0b36faf64a002cae1ced2d3ed5b7f50f43ba5cda90ab9254fd5f66bbfaed6085f3f SHA512 7389a1c6ee8ff4cda39a2c3f52218aa6f4b1cd6b45f48f83bfa2191359a8999d54153120d968b3cf7e5e932f88822783578e3d859dcb20f38fb0d915d88220c9 -DIST datasets-2.13.1.gh.tar.gz 2166516 BLAKE2B 2269434b94145837e491ec6784218f6972df94a558b9067020076fb44dd937a103e3c57dd3761bb0a4cb3c3b6248299ec2a6c3f03c5bd016daaa8957591bf7b6 SHA512 3d2d1aad86b6a472cd6d0e6c661d4730cc0ed1a0fff55c739fc6a0ba68a8f53ae8789029553abd713d0b30648dd020f1880b2d8110c72b5c89a320c2b24f7752 -DIST datasets-2.14.4.gh.tar.gz 2142214 BLAKE2B d4c98a9f29ca748c3c20f32b9a89f053cf6327f56353341ba0073d3b5561ed9aea372d2fa74cadfa8b0f2ba0f6c2e9b3181cca9724719cfe3969f36bbb893f11 SHA512 c3a0701dd83474f4a0d839fe4ef56cfccc9f1d45b6506d44d0f9100bc9dbc90014d16c8e0090dc13f3b2d963bd96af45281bde6e3d7af230467ec7dd26204aa3 +DIST datasets-2.18.0.gh.tar.gz 2169179 BLAKE2B 8a0daa0e8995b3fa5480d8aa892a26d1b6ba90f252ef7c7ca62f4afc2efa61a8ed2efbf48a40381f07178b826bde62af0f0cb8cbf80d470d5d4dfb1ba25f6cb8 SHA512 b1fb0e6636417683fa79679286505b921a7ba00b1cabd6a23e60d5804eb098527c5283058799a0776a7f1e93972fdbb948882f153a10557bcc6b6b22ab861292 diff --git a/sci-libs/datasets/datasets-2.11.0-r2.ebuild b/sci-libs/datasets/datasets-2.11.0-r2.ebuild deleted file mode 100644 index a2f4ad26e65b..000000000000 --- a/sci-libs/datasets/datasets-2.11.0-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -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}] - $(python_gen_cond_dep ' - dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/fsspec[${PYTHON_USEDEP}] - dev-python/multiprocess[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy] - dev-python/tqdm[${PYTHON_USEDEP}] - dev-python/xxhash[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND}" -BDEPEND="test? ( - $(python_gen_cond_dep ' - dev-python/pytest-datadir[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - sci-libs/jiwer[${PYTHON_USEDEP}] - sci-libs/seqeval[${PYTHON_USEDEP}] - ') -)" - -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) - -distutils_enable_tests pytest diff --git a/sci-libs/datasets/datasets-2.12.0.ebuild b/sci-libs/datasets/datasets-2.12.0.ebuild deleted file mode 100644 index 66b609fd2b57..000000000000 --- a/sci-libs/datasets/datasets-2.12.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -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}] - $(python_gen_cond_dep ' - dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/fsspec[${PYTHON_USEDEP}] - dev-python/multiprocess[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy] - dev-python/tqdm[${PYTHON_USEDEP}] - dev-python/xxhash[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND}" -BDEPEND="test? ( - $(python_gen_cond_dep ' - dev-python/pytest-datadir[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - =dev-python/sqlalchemy-1*[${PYTHON_USEDEP}] - sci-libs/jiwer[${PYTHON_USEDEP}] - sci-libs/seqeval[${PYTHON_USEDEP}] - ') -)" - -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) - -distutils_enable_tests pytest diff --git a/sci-libs/datasets/datasets-2.14.4.ebuild b/sci-libs/datasets/datasets-2.14.4.ebuild deleted file mode 100644 index 08ed796e9c2d..000000000000 --- a/sci-libs/datasets/datasets-2.14.4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -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}] - $(python_gen_cond_dep ' - dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/fsspec[${PYTHON_USEDEP}] - dev-python/multiprocess[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy] - dev-python/tqdm[${PYTHON_USEDEP}] - dev-python/xxhash[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND}" -BDEPEND="test? ( - $(python_gen_cond_dep ' - dev-python/pytest-datadir[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - =dev-python/sqlalchemy-1*[${PYTHON_USEDEP}] - sci-libs/jiwer[${PYTHON_USEDEP}] - sci-libs/seqeval[${PYTHON_USEDEP}] - ') -)" - -PATCHES=( "${FILESDIR}"/${P}-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 -} diff --git a/sci-libs/datasets/datasets-2.13.1.ebuild b/sci-libs/datasets/datasets-2.18.0-r1.ebuild index 60a16a43e361..d16c3e2459de 100644 --- a/sci-libs/datasets/datasets-2.13.1.ebuild +++ b/sci-libs/datasets/datasets-2.18.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 @@ -23,32 +23,42 @@ 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}] - sci-libs/scikit-learn[${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-1*[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] sci-libs/jiwer[${PYTHON_USEDEP}] sci-libs/seqeval[${PYTHON_USEDEP}] ') )" -PATCHES=( "${FILESDIR}"/${PN}-2.12.0-tests.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.17.1-tests.patch +) distutils_enable_tests pytest @@ -56,4 +66,21 @@ 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/files/datasets-2.11.0-tests.patch b/sci-libs/datasets/files/datasets-2.11.0-tests.patch deleted file mode 100644 index e105c01bc63b..000000000000 --- a/sci-libs/datasets/files/datasets-2.11.0-tests.patch +++ /dev/null @@ -1,242 +0,0 @@ ---- 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 ...") - def test_load_metric(self, metric_name): - doctest.ELLIPSIS_MARKER = "[...]" - metric_module = importlib.import_module( ---- a/tests/test_hf_gcp.py 2023-05-04 19:33:31.150825303 +0200 -+++ b/tests/test_hf_gcp.py 2023-05-04 19:40:08.401759538 +0200 -@@ -69,6 +69,7 @@ - self.assertTrue(os.path.exists(datset_info_path)) - - -+@pytest.mark.skip(reason="require apache_beam") - @pytest.mark.integration - def test_wikipedia_frr(tmp_path_factory): - tmp_dir = tmp_path_factory.mktemp("test_hf_gcp") / "test_wikipedia_simple" ---- 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 -@@ -55,6 +55,7 @@ - assert len({tuple(x.values()) for ds in datasets_per_rank for x in ds}) == full_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") -@@ -76,6 +77,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 -@@ -54,8 +54,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_locally -@@ -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_arrow_dataset.py 2023-05-06 15:36:11.080459079 +0200 -+++ b/tests/test_arrow_dataset.py 2023-05-06 15:38:07.452828528 +0200 -@@ -3928,6 +3928,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_streaming_download_manager.py 2023-05-15 23:06:59.146379973 +0200 -+++ b/tests/test_streaming_download_manager.py 2023-05-15 23:11:32.441363757 +0200 -@@ -217,6 +217,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", - [ -@@ -299,6 +300,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", - [ -@@ -328,6 +330,7 @@ - xlistdir(root_url, use_auth_token=hf_token) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, isdir", - [ -@@ -355,6 +358,7 @@ - xisdir(root_url, use_auth_token=hf_token) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, isfile", - [ -@@ -378,6 +382,7 @@ - assert xisfile(root_url + "qwertyuiop", use_auth_token=hf_token) is False - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, size", - [ -@@ -402,6 +407,7 @@ - xgetsize(root_url + "qwertyuiop", use_auth_token=hf_token) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, expected_paths", - [ -@@ -444,6 +450,7 @@ - assert len(xglob("zip://qwertyuiop/*::" + root_url, use_auth_token=hf_token)) == 0 - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, expected_outputs", - [ -@@ -533,6 +540,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", - [ -@@ -548,6 +556,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", - [ -@@ -586,6 +595,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", - [ diff --git a/sci-libs/datasets/files/datasets-2.12.0-tests.patch b/sci-libs/datasets/files/datasets-2.12.0-tests.patch deleted file mode 100644 index 6be3156bb70d..000000000000 --- a/sci-libs/datasets/files/datasets-2.12.0-tests.patch +++ /dev/null @@ -1,242 +0,0 @@ ---- 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_hf_gcp.py 2023-05-04 19:33:31.150825303 +0200 -+++ b/tests/test_hf_gcp.py 2023-05-04 19:40:08.401759538 +0200 -@@ -75,6 +75,7 @@ - self.assertTrue(os.path.exists(datset_info_path)) - - -+@pytest.mark.skip(reason="require apache_beam") - @pytest.mark.integration - def test_as_dataset_from_hf_gcs(tmp_path_factory): - tmp_dir = tmp_path_factory.mktemp("test_hf_gcp") / "test_wikipedia_simple" ---- 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 -@@ -55,8 +55,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_locally -@@ -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_arrow_dataset.py 2023-05-06 15:36:11.080459079 +0200 -+++ b/tests/test_arrow_dataset.py 2023-05-06 15:38:07.452828528 +0200 -@@ -3983,6 +3983,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_streaming_download_manager.py 2023-05-15 23:06:59.146379973 +0200 -+++ b/tests/test_streaming_download_manager.py 2023-05-15 23:11:32.441363757 +0200 -@@ -217,6 +217,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", - [ -@@ -299,6 +300,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", - [ -@@ -328,6 +330,7 @@ - xlistdir(root_url, use_auth_token=hf_token) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, isdir", - [ -@@ -355,6 +358,7 @@ - xisdir(root_url, use_auth_token=hf_token) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, isfile", - [ -@@ -378,6 +382,7 @@ - assert xisfile(root_url + "qwertyuiop", use_auth_token=hf_token) is False - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, size", - [ -@@ -402,6 +407,7 @@ - xgetsize(root_url + "qwertyuiop", use_auth_token=hf_token) - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, expected_paths", - [ -@@ -444,6 +450,7 @@ - assert len(xglob("zip://qwertyuiop/*::" + root_url, use_auth_token=hf_token)) == 0 - - -+@pytest.mark.skip(reason="not working in sandbox") - @pytest.mark.parametrize( - "input_path, expected_outputs", - [ -@@ -533,6 +540,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", - [ -@@ -548,6 +556,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", - [ -@@ -586,6 +595,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", - [ diff --git a/sci-libs/datasets/files/datasets-2.14.4-tests.patch b/sci-libs/datasets/files/datasets-2.17.1-tests.patch index 5dd322309b20..2281598dfb38 100644 --- a/sci-libs/datasets/files/datasets-2.14.4-tests.patch +++ b/sci-libs/datasets/files/datasets-2.17.1-tests.patch @@ -1,3 +1,135 @@ +--- 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 @@ @@ -8,16 +140,6 @@ @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_hf_gcp.py 2023-05-04 19:33:31.150825303 +0200 -+++ b/tests/test_hf_gcp.py 2023-05-04 19:40:08.401759538 +0200 -@@ -75,6 +75,7 @@ - self.assertTrue(os.path.exists(datset_info_path)) - - -+@pytest.mark.skip(reason="require apache_beam") - @pytest.mark.integration - def test_as_dataset_from_hf_gcs(tmp_path_factory): - tmp_dir = tmp_path_factory.mktemp("test_hf_gcp") / "test_wikipedia_simple" --- 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 @@ @@ -148,16 +270,6 @@ 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_arrow_dataset.py 2023-05-06 15:36:11.080459079 +0200 -+++ b/tests/test_arrow_dataset.py 2023-05-06 15:38:07.452828528 +0200 -@@ -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_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 @@ @@ -240,3 +352,13 @@ @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/dcmtk/Manifest b/sci-libs/dcmtk/Manifest index 50d810f71702..283fc868453b 100644 --- a/sci-libs/dcmtk/Manifest +++ b/sci-libs/dcmtk/Manifest @@ -1 +1,2 @@ DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45 +DIST dcmtk-3.6.8.tar.gz 9628364 BLAKE2B 367885c3fda65b7b2e42555ba648800f9585cbd4c4d94e01f737110fc726ce3396df50ccd6f2c9bacc59284fc1381683b72506a3c566f795c8157da39a95fb2a SHA512 1bb2aad1aa63e0a1b79d92d7c932a969deccde03fdb484dbd44198effb58d50de44a2b0cda150ce7df63e4e986af5bc1f694c8a7988b4c049c578d83ba81184a diff --git a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild index 88c510729a28..9a82a24e3064 100644 --- a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild +++ b/sci-libs/dcmtk/dcmtk-3.6.7-r1.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 -inherit cmake +inherit flag-o-matic cmake DESCRIPTION="The DICOM Toolkit" HOMEPAGE="https://dicom.offis.de/dcmtk.php.en" @@ -25,7 +25,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND="doc? ( - app-doc/doxygen + app-text/doxygen virtual/latex-base )" @@ -50,6 +50,9 @@ src_prepare() { } src_configure() { + # bug 908398 + use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE + local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" -DDCMTK_WITH_ICU=ON diff --git a/sci-libs/dcmtk/dcmtk-3.6.8.ebuild b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild new file mode 100644 index 000000000000..ed291a83e208 --- /dev/null +++ b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic cmake + +DESCRIPTION="The DICOM Toolkit" +HOMEPAGE="https://dicom.offis.de/dcmtk.php.en" +SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz" + +LICENSE="OFFIS" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc png ssl tcpd tiff +threads xml zlib" + +RDEPEND=" + dev-libs/icu:= + png? ( media-libs/libpng:* ) + ssl? ( dev-libs/openssl:= ) + tcpd? ( sys-apps/tcp-wrappers ) + tiff? ( media-libs/tiff:= ) + xml? ( dev-libs/libxml2:2 ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen + virtual/latex-base + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.8-docdir.patch +) + +src_prepare() { + cmake_src_prepare + + sed -i -e "s:COPYRIGHT::" CMakeLists.txt || die + # Temporary workaround: docs are not built with CMake + sed -i -e '/include/d' doxygen/Makefile.in || die + + # Fix -D deprecation warnings + sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \ + "${S}"/config/configure.in \ + "${S}"/CMakeLists.txt || die +} + +src_configure() { + # ODR violations (bug #862699). Reported upstream by email on 2024-03-11. + # master seems fixed, so >3.6.8 should be able to drop this. + filter-lto + + # bug 908398 + use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE + + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DDCMTK_WITH_ICU=ON + -DDCMTK_WITH_TIFF=$(usex tiff) + -DDCMTK_WITH_PNG=$(usex png) + -DDCMTK_WITH_XML=$(usex xml) + -DDCMTK_WITH_ZLIB=$(usex zlib) + -DDCMTK_WITH_OPENSSL=$(usex ssl) + -DDCMTK_WITH_DOXYGEN=$(usex doc) + -DDCMTK_WITH_THREADS=$(usex threads) + ) + + cmake_src_configure + + if use doc; then + cd "${S}"/doxygen || die + econf + fi +} + +src_compile() { + cmake_src_compile + + if use doc; then + emake -C "${S}"/doxygen + fi +} + +src_install() { + doman doxygen/manpages/man1/* + + if use doc; then + local HTML_DOCS=( "${S}"/doxygen/htmldocs/. ) + fi + cmake_src_install +} diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.8-docdir.patch b/sci-libs/dcmtk/files/dcmtk-3.6.8-docdir.patch new file mode 100644 index 000000000000..291571d0ce37 --- /dev/null +++ b/sci-libs/dcmtk/files/dcmtk-3.6.8-docdir.patch @@ -0,0 +1,12 @@ +--- a/CMake/GenerateDCMTKConfigure.cmake ++++ b/CMake/GenerateDCMTKConfigure.cmake +@@ -202,9 +202,6 @@ else() + + # Modify the installation paths for configuration files, data files and documents + # by adding a subdirectory with the DCMTK name and version number +- set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}") + + # These variables are defined as macros in osconfig.h and must end with a path separator + set(DCMTK_DEFAULT_CONFIGURATION_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/") diff --git a/sci-libs/dcmtk/metadata.xml b/sci-libs/dcmtk/metadata.xml index de52092e6f7b..19b26d43007c 100644 --- a/sci-libs/dcmtk/metadata.xml +++ b/sci-libs/dcmtk/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>sci-biology@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">DCMTK/dcmtk</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index d5a5844c5276..020200830dea 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -1,12 +1,8 @@ -DIST dealii-9.4.0-offline_documentation.tar.gz 390747598 BLAKE2B 6e8ed938b31a9e6bbbdd5baacce056edc31d489ecd3e9528283650f431d004ca122c968567fe342744d52bab8f8be53ab1b20d56636e2dc48f8cf551791a08bd SHA512 703eb50150ae5bd77f0d84271babd50483c3a9b069abb5b7e8827d00efaa5d189a43ac54f0ef8b2f746b12a10dc611669f5fddd655241a66af4915ec1d458185 -DIST dealii-9.4.0-offline_documentation.tar.gz.asc 246 BLAKE2B cb828efcdb38b88af9abc3be95c90c126144ee1edd076e2c47c7a90dad1df3ac29ce104de7be551fb93671b0b3ffe44b737fcba3841ccb0921e1f0795360fec4 SHA512 59f8997f9a19580861f0c7afd06b9737519c0dbf6990c4569f5c8dbd05e7e41dce19d1b9a639504696be2f99f6e8c555086dcd85c43976ccd5c7ebf007864dc0 -DIST dealii-9.4.0.tar.gz 30297914 BLAKE2B 6beb4c7b83f5316e703d4b77340900c376e622b1dc59c9058a8927174a8c6991994957588b6adf88238e72eec93f8941bfbfb2d0bb01070560468d051d9829f8 SHA512 3be740fbabff65a18870496f483ac4ed6d35c8a53b5128dd09b2dfabe82d60e4a75f02fd508b44f6c93805999aab98f551154f10ca2ad5fabede65c2d6dce320 -DIST dealii-9.4.0.tar.gz.asc 246 BLAKE2B 972d3fa18c83ff9b3aff996efaa0e6d1db848f64a46afb80b083c4f228d42ab1a2d7c5f6172a1ad3ae8542ca9c2a351c2badf98b9104dd5448a0f3d0cbd73e2a SHA512 b0754c891356bcf30d2d32b4ecc780d2ba814b720426d604c0596ebdbdb1a8ae00357b04596c03f75e809593067b022b9e7c08584f88e35f05248472dde44f3b DIST dealii-9.4.1-offline_documentation.tar.gz 392007419 BLAKE2B 81404b02ba7dc97a0314f52fa9d775183981864288f4ab4ca81b550a1763d90cb5b04b32c056008ad60a7829b929c78edd80cbeeeb861e4ef638780c13d80aa7 SHA512 9bbaf6e9a478ac643e87f2f07918c8a5216e17b0ddaeba4beb2acde9ea54833e2f0e7d11f61b2cac8b986e442dbb181317b53e1a40a807e7c098167bfd073266 DIST dealii-9.4.1-offline_documentation.tar.gz.asc 246 BLAKE2B 9ace22c9b174e642cd3fba94c165d816c62814f892f5f6f272efa0301613dc55251152825e726fc6cf7e89bbfb7fa3552ec58ad426a7d58a74ecb89b9072f742 SHA512 50b43dd34a0687395f516f4910581df71054fa8be3c98006566ea649d0af866d38c9793da548ba6bdb7a9fec452dfb6d928d336aace943522d7c3f854209b81b -DIST dealii-9.4.1.tar.gz 30298204 BLAKE2B 499f542c7a7f071d04048127199c7bebf5668b6e8d13fc2701dd18e28165442e58112ee9e4926e16a592bffdd5d7b7c240eea55808e5f9c021961f7e44b7da79 SHA512 39089aff462d3ff4244ce75f74a4cd908f8f72a81dcc3fb02ca91b3cad2442ceb78677e72cd928b36a04d352c4baa146a25fa5e14c886ca9e2bad0be0069f7b8 -DIST dealii-9.4.1.tar.gz.asc 246 BLAKE2B dbb1dc7b3e8a97f29287f154d11cd3db2566fdc4c7667fa57e686e2feba33f2115546408365f0e8f490ba593cb582b12489de373da3e33e8702b6e16804c7ebf SHA512 eb987d34f19b59d523d79f3c2c99f5f3125b1d0c71af0eb32b77ad5959d6197b79f1971a8a79dbc52bab698335dcb6091aac88c51d845a1e07d3681c089754c7 +DIST dealii-9.4.2.tar.gz 30298479 BLAKE2B bff5dd5a1b5458dd6e295b87cee9d24626ffce0b4c6a3329f190739d8fc67d34f11f0218dbbcd69dcf2e031e3e9f04cd1f2d0768d2fad32198bf1360d132a686 SHA512 6f6f032f6eef73421b53576e01f40bef0b4ce3d89583a016d057f8ec023c1f925a5c245991fd4639f9e73c4852d5cfd36da92258251a56179a98cd4a612cac9f +DIST dealii-9.4.2.tar.gz.asc 246 BLAKE2B b61a8e3e496ba34c87fe453fbcec9fd0fb0d59f8d7123f38352c65c81b3d0ea706a4f645444970857a9fd67a26a984fc5adcfe8ed6c43eae5656bba6dd3bed9e SHA512 b11a79da7eeaababf7ec2c2264b41d0a5df9fd2f870829c535f888f0f8c07a6765920e023fd9d74f24a5a4744bd8d68a6db1669e449ed1a81757ee6c3c60b873 DIST dealii-9.5.0-offline_documentation.tar.gz 412499027 BLAKE2B 521aa2488d84d48a624f4cbdbe9c173d0cdcee2df8d06b97b7c25ba28d4a2113a7da9fd9abd9eb64cd56b37f8edc716bd034fc3ba8823f8b1def26c34aaeeb55 SHA512 2e0d331f92d52b0fd909a0139157a1960a9222d46d537611f0508cdb79020a8e51ff0da6aefdf95adff732cea050b72df7dc1a8af7e93c736721970218815cfe DIST dealii-9.5.0-offline_documentation.tar.gz.asc 246 BLAKE2B 0a570885e80ad09ff154532b71c07e33894e93c96b3bca48dc8aae0b308883518cbb5eca57658c4e13de47efba47c3cb20bf376482ef7a26c6c0da93ee4dd689 SHA512 b63a9a0504fe5266b448ffda74e1d85ad5b6f344535c5b5f11d209546b51bb916ad69504ce5e4f1fd2287407c2d3d98a20b01bd830e8d45f510a85b7a057a8d5 -DIST dealii-9.5.1.tar.gz 31522808 BLAKE2B 99db2beafb949364869fc7f06f78bf921b0d99c69de57da40115b0eb939e1c9a40dcbf40a186a988189ea92a6e1295da4969fd33a7e4738b27813ff1842cb99a SHA512 7ba4e4751417a7916cb059379b3b70afcaa5f62786e92ac7332b6f55cbcfcb25df15de2a6071cc33444c911f104e576f8792ea4ac4e6702186e5740c7c909d72 -DIST dealii-9.5.1.tar.gz.asc 246 BLAKE2B 4d6aac271d1f460c66a54eff2012ded302093ef68777ff91f40d9472694541fa5e168e34e13dfada4444d3a8353dbca44756884c3f944f6f29169fc649d0395c SHA512 1065d0ab07b2ebc52fc52faf896e6d757f89f523c7a16c650307fe115dde361e6e0ecb96c9e5ecfbe5ebe58728fdd76bf83cbb3cb82cdb76b182526fee42ecb3 +DIST dealii-9.5.2.tar.gz 31523493 BLAKE2B 4ad55b0c4c7b1c02de17007f44b345856ec18127d6326b08fda76747087039344324c911409502f293e61eecd6d574f8a774ec0a1bbb200a2a4ee62a2f81e6d8 SHA512 5989c2dfd66f803b0bcc32816f69048c0bbb411c8b792691df9bbfc0c965c1c95c7e8c3782e1a3d160e9d124fd0c5396b55372e28e477fa474c3f3c03a5bd4e9 +DIST dealii-9.5.2.tar.gz.asc 246 BLAKE2B bacd1dac5a6f3d0d6639329512f5c4cafe39ecd036a7a4e38b81d31b6ee452d496190e8ae26c814631cc62c42208a1df1cd081ac8accd97d2821d7091495b898 SHA512 1821b4763ddcda11baf37b88ae90ec73576d2cacdeb53f4196dcde9e1649e685eb1666b86317d4573944769642b09bc76fc1de34a5e8e436004552f8652cad23 diff --git a/sci-libs/dealii/dealii-9.4.1-r1.ebuild b/sci-libs/dealii/dealii-9.4.1-r1.ebuild deleted file mode 100644 index 23dd968667ef..000000000000 --- a/sci-libs/dealii/dealii-9.4.1-r1.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# deal.II uses its own FindLAPACK.cmake file that calls into the system -# FindLAPACK.cmake module and does additional internal setup. Do not remove -# any of these modules: -CMAKE_REMOVE_MODULES_LIST="" - -inherit cmake flag-o-matic verify-sig - -DESCRIPTION="Solving partial differential equations with the finite element method" -HOMEPAGE="https://www.dealii.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dealii/dealii.git" - SRC_URI="" -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz.asc ) - doc? ( - https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz.asc ) - )" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE=" - adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f - cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 - +lapack metis mpi muparser opencascade p4est petsc scalapack slepc - +sparse static-libs sundials symengine trilinos -" - -# TODO: add slepc use flag once slepc is packaged for gentoo-science -REQUIRED_USE=" - arborx? ( trilinos ) - p4est? ( mpi ) - slepc? ( petsc ) - trilinos? ( mpi )" - -RDEPEND="dev-libs/boost:= - app-arch/bzip2 - sys-libs/zlib - dev-cpp/tbb:= - arborx? ( sci-libs/arborx[mpi=] ) - adolc? ( sci-libs/adolc ) - arpack? ( sci-libs/arpack[mpi=] ) - assimp? ( media-libs/assimp:= ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - ginkgo? ( sci-libs/ginkgo ) - gmsh? ( sci-libs/gmsh ) - gsl? ( sci-libs/gsl:= ) - hdf5? ( sci-libs/hdf5[mpi=] ) - lapack? ( virtual/lapack ) - metis? ( - >=sci-libs/metis-5 - mpi? ( >=sci-libs/parmetis-4 ) - ) - mpi? ( virtual/mpi[cxx] ) - muparser? ( dev-cpp/muParser ) - opencascade? ( sci-libs/opencascade:= ) - p4est? ( sci-libs/p4est[mpi] ) - petsc? ( sci-mathematics/petsc[mpi=] ) - scalapack? ( sci-libs/scalapack ) - slepc? ( sci-mathematics/slepc[mpi=] ) - sparse? ( sci-libs/umfpack ) - sundials? ( sci-libs/sundials:= ) - symengine? ( >=sci-libs/symengine-0.4:= ) - trilinos? ( sci-libs/trilinos )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] dev-lang/perl )" - -BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-dealii )" - -PATCHES=( - "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch -) - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dealii.asc" - -src_configure() { - # deal.II needs a custom build type: - local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release) - - local mycmakeargs=( - -DDEAL_II_PACKAGE_VERSION="${PV}" - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF - -DDEAL_II_ALLOW_AUTODETECTION=OFF - -DDEAL_II_ALLOW_BUNDLED=OFF - -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF - -DDEAL_II_COMPILE_EXAMPLES=OFF - -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html" - -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}" - -DDEAL_II_COMPILE_EXAMPLES=OFF - -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples" - -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)" - -DDEAL_II_SHARE_RELDIR="share/${PN}" - -DDEAL_II_WITH_ZLIB=ON - -DDEAL_II_WITH_ADOLC="$(usex adolc)" - -DDEAL_II_WITH_ARBORX="$(usex arborx)" - -DDEAL_II_WITH_ASSIMP="$(usex assimp)" - -DDEAL_II_WITH_ARPACK="$(usex arpack)" - -DDEAL_II_WITH_CGAL="$(usex cgal)" - -DDEAL_II_WITH_CUDA="$(usex cuda)" - -DDEAL_II_WITH_GINKGO="$(usex ginkgo)" - -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)" - -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)" - -DDEAL_II_WITH_GMSH="$(usex gmsh)" - -DDEAL_II_WITH_GSL="$(usex gsl)" - -DDEAL_II_WITH_HDF5="$(usex hdf5)" - -DDEAL_II_WITH_KOKKOS="$(usex trilinos)" - -DDEAL_II_WITH_LAPACK="$(usex lapack)" - -DDEAL_II_WITH_METIS="$(usex metis)" - -DDEAL_II_WITH_MPI="$(usex mpi)" - -DDEAL_II_WITH_MUPARSER="$(usex muparser)" - -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)" - -DDEAL_II_WITH_P4EST="$(usex p4est)" - -DDEAL_II_WITH_PETSC="$(usex petsc)" - -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)" - -DDEAL_II_WITH_SLEPC="$(usex slepc)" - -DDEAL_II_WITH_SUNDIALS="$(usex sundials)" - -DDEAL_II_WITH_SYMENGINE="$(usex symengine)" - -DDEAL_II_WITH_UMFPACK="$(usex sparse)" - -DBUILD_SHARED_LIBS="$(usex !static-libs)" - -DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)" - -DDEAL_II_WITH_TBB=ON - -DDEAL_II_WITH_TASKFLOW=OFF - -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" - ) - - use opencascade && mycmakeargs+=( - -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" - ) - - # Do a little dance for purely cosmetic QA reasons. The build system - # does query for the highest instruction set first and skips the other - # variables if a "higher" variant is set - if use cpu_flags_x86_avx512f; then - mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes ) - append-cxxflags "-mavx512f" - elif use cpu_flags_x86_avx; then - mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes ) - append-cxxflags "-mavx2" - elif use cpu_flags_x86_avx; then - mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes ) - append-cxxflags "-msse2" - fi - - # Unconditionally enable strict C++17 standard. This is necessary for - # USE=cgal and USE=kokkos and safe to set for all presently supported - # compilers - append-cxxflags "-std=c++17" - - cmake_src_configure -} - -src_install() { - if use doc && [[ ${PV} != *9999* ]]; then - # copy missing images to the build directory: - cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \ - "${BUILD_DIR}"/doc/doxygen/deal.II || die - # replace links: - sed -i \ - 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ - "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed" - fi - cmake_src_install - - # decompress the installed example sources: - use examples && docompress -x /usr/share/doc/${PF}/examples -} diff --git a/sci-libs/dealii/dealii-9.4.0-r1.ebuild b/sci-libs/dealii/dealii-9.4.2-r1.ebuild index 23dd968667ef..20803dea7102 100644 --- a/sci-libs/dealii/dealii-9.4.0-r1.ebuild +++ b/sci-libs/dealii/dealii-9.4.2-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 @@ -18,11 +18,12 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/dealii/dealii.git" SRC_URI="" else + DOC_PV=9.4.1 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz.asc ) doc? ( - https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz.asc ) + https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz + verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz.asc ) )" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi @@ -55,7 +56,7 @@ RDEPEND="dev-libs/boost:= ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) - hdf5? ( sci-libs/hdf5[mpi=] ) + hdf5? ( sci-libs/hdf5:=[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 @@ -75,16 +76,18 @@ RDEPEND="dev-libs/boost:= DEPEND="${RDEPEND} virtual/pkgconfig - doc? ( app-doc/doxygen[dot] dev-lang/perl )" + doc? ( app-text/doxygen[dot] dev-lang/perl )" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-dealii )" PATCHES=( "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch + "${FILESDIR}"/${PN}-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch + "${FILESDIR}"/${PN}-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dealii.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dealii.asc" src_configure() { # deal.II needs a custom build type: diff --git a/sci-libs/dealii/dealii-9.5.1.ebuild b/sci-libs/dealii/dealii-9.5.2-r1.ebuild index 60337976d7ad..8d1ff65c6e8c 100644 --- a/sci-libs/dealii/dealii-9.5.1.ebuild +++ b/sci-libs/dealii/dealii-9.5.2-r1.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 @@ -57,7 +57,7 @@ RDEPEND="dev-libs/boost:= ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) - hdf5? ( sci-libs/hdf5[mpi=] ) + hdf5? ( sci-libs/hdf5:=[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 @@ -82,15 +82,17 @@ RDEPEND="dev-libs/boost:= DEPEND="${RDEPEND} virtual/pkgconfig - doc? ( app-doc/doxygen[dot] dev-lang/perl )" + doc? ( app-text/doxygen[dot] dev-lang/perl )" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-dealii )" PATCHES=( + "${FILESDIR}"/${PN}-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch + "${FILESDIR}"/${PN}-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dealii.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dealii.asc" src_configure() { # deal.II needs a custom build type: diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild index c6d3a65a9086..26b651fea08e 100644 --- a/sci-libs/dealii/dealii-9999.ebuild +++ b/sci-libs/dealii/dealii-9999.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 @@ -54,7 +54,7 @@ RDEPEND="dev-libs/boost:= ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) - hdf5? ( sci-libs/hdf5[mpi=] ) + hdf5? ( sci-libs/hdf5:=[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 @@ -79,7 +79,7 @@ RDEPEND="dev-libs/boost:= DEPEND="${RDEPEND} virtual/pkgconfig - doc? ( app-doc/doxygen[dot] dev-lang/perl )" + doc? ( app-text/doxygen[dot] dev-lang/perl )" PATCHES=( ) diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch new file mode 100644 index 000000000000..85a78c4c1326 --- /dev/null +++ b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch @@ -0,0 +1,59 @@ +From aafc2c19dfd3ebc43e37ba3f13eda5f790376b1c Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@43-1.org> +Date: Thu, 15 Feb 2024 15:54:36 -0600 +Subject: [PATCH 1/2] base/mpi.cc: remove superfluous explicit instantiations + of template variable + +The `mpi.h` header already contains: +``` +template <typename T> +const MPI_Datatype mpi_type_id_for_type = /* implementation detail */; +``` +Meaning, the variable is known fully after including the header. +Furthermore, the `const` qualifier marks the (template) variable as +`static`. I.e., it has internal linkage. + +Thus, we must not explicitly instantiate the variables (suggesting +"extern" linkage in all but the `mpi.cc` compilation unit). This +apparently not an issue with OpenMPI because `MPI_Datatype` is a +complex data structure. But it is an issue with mpich where +`MPI_Datatype` is a simple `int` - leading to a segmentation fault when +during program startup. +--- + source/base/mpi.cc | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/source/base/mpi.cc b/source/base/mpi.cc +index dab88e2b97..f845845764 100644 +--- a/source/base/mpi.cc ++++ b/source/base/mpi.cc +@@ -100,26 +100,6 @@ namespace Utilities + + namespace MPI + { +-#ifdef DEAL_II_WITH_MPI +- // Provide definitions of template variables for all valid instantiations. +- template const MPI_Datatype mpi_type_id_for_type<bool>; +- template const MPI_Datatype mpi_type_id_for_type<char>; +- template const MPI_Datatype mpi_type_id_for_type<signed char>; +- template const MPI_Datatype mpi_type_id_for_type<short>; +- template const MPI_Datatype mpi_type_id_for_type<int>; +- template const MPI_Datatype mpi_type_id_for_type<long int>; +- template const MPI_Datatype mpi_type_id_for_type<unsigned char>; +- template const MPI_Datatype mpi_type_id_for_type<unsigned short>; +- template const MPI_Datatype mpi_type_id_for_type<unsigned long int>; +- template const MPI_Datatype mpi_type_id_for_type<unsigned long long int>; +- template const MPI_Datatype mpi_type_id_for_type<float>; +- template const MPI_Datatype mpi_type_id_for_type<double>; +- template const MPI_Datatype mpi_type_id_for_type<long double>; +- template const MPI_Datatype mpi_type_id_for_type<std::complex<float>>; +- template const MPI_Datatype mpi_type_id_for_type<std::complex<double>>; +-#endif +- +- + MinMaxAvg + min_max_avg(const double my_value, const MPI_Comm mpi_communicator) + { +-- +2.43.0 + diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch new file mode 100644 index 000000000000..032b12237bd2 --- /dev/null +++ b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch @@ -0,0 +1,28 @@ +From 2ef67e3896a2a7d0ba93539cf79310384470fc91 Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@43-1.org> +Date: Thu, 15 Feb 2024 16:03:22 -0600 +Subject: [PATCH 2/2] base/mpi.h: mark a template variable to have "const + inline" linkage. + +--- + include/deal.II/base/mpi.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h +index b77fd3e7c8..8ee55fbe41 100644 +--- a/include/deal.II/base/mpi.h ++++ b/include/deal.II/base/mpi.h +@@ -1728,8 +1728,8 @@ namespace Utilities + * not satisfied. + */ + template <typename T> +- const MPI_Datatype +- mpi_type_id_for_type = internal::MPIDataTypes::mpi_type_id( ++ inline const MPI_Datatype mpi_type_id_for_type = ++ internal::MPIDataTypes::mpi_type_id( + static_cast<std::remove_cv_t<std::remove_reference_t<T>> *>(nullptr)); + #endif + +-- +2.43.0 + diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml index 0d6c94a9258a..4db96f39c77d 100644 --- a/sci-libs/dealii/metadata.xml +++ b/sci-libs/dealii/metadata.xml @@ -32,7 +32,6 @@ <flag name="symengine">Add support for symengine (<pkg>sci-libs/symengine</pkg>)</flag> <flag name="trilinos">Add support for trilinos (<pkg>sci-libs/trilinos</pkg>)</flag> <flag name="assimp">Add support for assimp (<pkg>media-libs/assimp</pkg>)</flag> - <flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag> <flag name="ginkgo">Add support for ginkgo (<pkg>sci-libs/ginkgo</pkg>)</flag> <flag name="sundials">Add support for sundials (<pkg>sci-libs/sundials</pkg>)</flag> </use> diff --git a/sci-libs/dmlc-core/dmlc-core-0.5.ebuild b/sci-libs/dmlc-core/dmlc-core-0.5.ebuild index ae6cb41b64e6..7ae899dcbb27 100644 --- a/sci-libs/dmlc-core/dmlc-core-0.5.ebuild +++ b/sci-libs/dmlc-core/dmlc-core-0.5.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 @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" RDEPEND="s3? ( net-misc/curl[ssl] )" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] ) +BDEPEND="doc? ( app-text/doxygen[dot] ) test? ( dev-cpp/gtest )" pkg_pretend() { diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild index 991dc719c890..cfc14ac37ce4 100644 --- a/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild +++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719-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 @@ -31,7 +31,7 @@ RDEPEND="net-misc/curl[ssl]" DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" BDEPEND="doc? ( - app-doc/doxygen + app-text/doxygen dev-texlive/texlive-fontutils )" diff --git a/sci-libs/dsdp/dsdp-5.8-r3.ebuild b/sci-libs/dsdp/dsdp-5.8-r4.ebuild index 6ddc6b9b3640..ac3c51fb830b 100644 --- a/sci-libs/dsdp/dsdp-5.8-r3.ebuild +++ b/sci-libs/dsdp/dsdp-5.8-r4.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit multilib toolchain-funcs versionator +inherit multilib toolchain-funcs MY_P="${PN^^}${PV}" DESCRIPTION="Software for interior-point for semidefinite programming" HOMEPAGE="https://www.mcs.anl.gov/hs/software/DSDP/" SRC_URI="https://www.mcs.anl.gov/hs/software/DSDP/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} LICENSE="BSD" SLOT="0" @@ -17,10 +18,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="doc examples" RDEPEND="virtual/lapack" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-readsdpa.patch @@ -29,7 +28,7 @@ PATCHES=( ) make_shared_lib() { - local soname=$(basename "${1%.a}")$(get_libname $(get_major_version)) + local soname=$(basename "${1%.a}")$(get_libname $(ver_cut 1)) local cflags=() if [[ ${CHOST} == *-darwin* ]] ; then @@ -78,8 +77,8 @@ src_test() { } src_install() { - dolib.so lib/lib${PN}$(get_libname $(get_major_version)) - dosym lib${PN}$(get_libname $(get_major_version)) \ + dolib.so lib/lib${PN}$(get_libname $(ver_cut 1)) + dosym lib${PN}$(get_libname $(ver_cut 1)) \ /usr/$(get_libdir)/lib${PN}$(get_libname) doheader include/*.h src/sdp/*.h diff --git a/sci-libs/evaluate/evaluate-0.4.0-r2.ebuild b/sci-libs/evaluate/evaluate-0.4.0-r4.ebuild index 61fc96cebeac..44de1b5ec03a 100644 --- a/sci-libs/evaluate/evaluate-0.4.0-r2.ebuild +++ b/sci-libs/evaluate/evaluate-0.4.0-r4.ebuild @@ -1,10 +1,10 @@ -# Copyright 2023 Gentoo Authors +# 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_11 ) +PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 @@ -25,9 +25,9 @@ RDEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/pyarrow[${PYTHON_USEDEP},parquet] dev-python/unidecode[${PYTHON_USEDEP}] - sci-libs/transformers[${PYTHON_USEDEP}] ') sci-libs/datasets[${PYTHON_SINGLE_USEDEP}] + sci-libs/transformers[${PYTHON_SINGLE_USEDEP}] " BDEPEND="test? ( $(python_gen_cond_dep ' diff --git a/sci-libs/evaluate/files/evaluate-0.4.0-tests.patch b/sci-libs/evaluate/files/evaluate-0.4.0-tests.patch index 452a6d862ada..cc0a8b6a7eed 100644 --- a/sci-libs/evaluate/files/evaluate-0.4.0-tests.patch +++ b/sci-libs/evaluate/files/evaluate-0.4.0-tests.patch @@ -158,6 +158,14 @@ evaluation_module_factory( --- a/tests/test_metric.py 2023-05-20 15:54:32.558477445 +0200 +++ b/tests/test_metric.py 2023-05-20 15:55:40.775415987 +0200 +@@ -316,6 +316,7 @@ + self.assertDictEqual(expected_results[1], results[1]) + del results + ++ @pytest.mark.skip('') + def test_distributed_metrics(self): + with tempfile.TemporaryDirectory() as tmp_dir: + (preds_0, refs_0), (preds_1, refs_1) = DummyMetric.distributed_predictions_and_references() @@ -736,6 +736,7 @@ self.assertDictEqual(dummy_result_1, combined_evaluation.compute(predictions=preds, references=refs)) diff --git a/sci-libs/exodusii/metadata.xml b/sci-libs/exodusii/metadata.xml index 8a895a221612..bc618cf6b086 100644 --- a/sci-libs/exodusii/metadata.xml +++ b/sci-libs/exodusii/metadata.xml @@ -6,11 +6,11 @@ <name>Gentoo Science Project</name> </maintainer> <longdescription lang="en"> - EXODUS II is a model developed to store and retrieve transient data for - finite element analyses. It is used for preprocessing, postprocessing, - as well as code to code data transfer. ExodusII is based on netcdf. + EXODUS II is a model developed to store and retrieve transient data for + finite element analyses. It is used for preprocessing, postprocessing, + as well as code to code data transfer. ExodusII is based on netcdf. </longdescription> <upstream> - <remote-id type="sourceforge">exodusii</remote-id> + <remote-id type="github">certik/exodus</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/fcl/fcl-0.6.1-r1.ebuild b/sci-libs/fcl/fcl-0.6.1-r1.ebuild index 3ec5f3be81fc..99aad26ef2be 100644 --- a/sci-libs/fcl/fcl-0.6.1-r1.ebuild +++ b/sci-libs/fcl/fcl-0.6.1-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=7 @@ -30,7 +30,7 @@ RDEPEND=" " DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( dev-cpp/gtest )" BDEPEND="${RDEPEND} diff --git a/sci-libs/fcl/fcl-9999.ebuild b/sci-libs/fcl/fcl-9999.ebuild index a948d33b7591..edd97c84d7f2 100644 --- a/sci-libs/fcl/fcl-9999.ebuild +++ b/sci-libs/fcl/fcl-9999.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=7 @@ -29,7 +29,7 @@ RDEPEND=" octomap? ( sci-libs/octomap:= )" DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( dev-cpp/gtest )" BDEPEND="${RDEPEND} diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest index d10a12abc35b..cbc8cdfe88a2 100644 --- a/sci-libs/fflas-ffpack/Manifest +++ b/sci-libs/fflas-ffpack/Manifest @@ -1 +1 @@ -DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44 +DIST fflas-ffpack-2.5.0.tar.gz 1098354 BLAKE2B 34b0cd218e83a71c6540b1768c8231246a0dc360eb7e2353a923b5870d228e702291de14b0dc3e7c5055727fbd62e2bc1bd1d2ac432dd99df978a1edb513bfc0 SHA512 6753022f27d354160f5eb436c713002f61d24e9a942f2463e36bf324b19ec096f34dd9cacb8529ba566f245f88fa303dcfb448a40d0c39d340f7c337cd1788a4 diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild deleted file mode 100644 index f5b94166a028..000000000000 --- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="Library for dense linear algebra over word-size finite fields" -HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/" -SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl" - -# Our autotools patch hacks in PKG_CHECK_MODULES calls. -BDEPEND="virtual/pkgconfig" -DEPEND="virtual/cblas - virtual/blas - virtual/lapack - dev-libs/gmp[cxx(+)] - =sci-libs/givaro-4.1*" -RDEPEND="${DEPEND}" - -# The no-test-echelon patch works around a test failure that may -# eventually be fixed upstream. Gentoo bug 725446 and upstream -# Github issue 282. Same for test-fgesv (bug 807100). -PATCHES=( - "${FILESDIR}/${PN}-2.3.2-blaslapack.patch" - "${FILESDIR}/${P}-no-test-echelon.patch" - "${FILESDIR}/${P}-no-test-fgesv.patch" - "${FILESDIR}/${P}-fix-internal-linking.patch" - "${FILESDIR}/${P}-no-fabi-version.patch" - "${FILESDIR}/${P}-fix-pc-libdir.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - - econf \ - --enable-precompilation \ - $(use_enable openmp) \ - $(use_enable cpu_flags_x86_fma3 fma) \ - $(use_enable cpu_flags_x86_fma4 fma4) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_ssse3 ssse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) \ - $(use_enable cpu_flags_x86_sse4_2 sse42) \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable cpu_flags_x86_avx2 avx2) \ - $(use_enable cpu_flags_x86_avx512f avx512f) \ - $(use_enable cpu_flags_x86_avx512dq avx512dq) \ - $(use_enable cpu_flags_x86_avx512vl avx512vl) -} - -src_install() { - default - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild new file mode 100644 index 000000000000..b54cd124a841 --- /dev/null +++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Library for dense linear algebra over word-size finite fields" +HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/" +SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="openmp" + +# Our autotools patch hacks in PKG_CHECK_MODULES calls. +BDEPEND="virtual/pkgconfig" +DEPEND="virtual/cblas + virtual/blas + virtual/lapack + dev-libs/gmp[cxx(+)] + =sci-libs/givaro-4.2*" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.5.0-blaslapack.patch" + "${FILESDIR}/${PN}-2.4.3-no-test-echelon.patch" + "${FILESDIR}/${PN}-2.4.3-fix-pc-libdir.patch" + "${FILESDIR}/${PN}-2.5.0-no-test-fsyr2k.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + tc-export PKG_CONFIG + + econf \ + --enable-precompilation \ + $(use_enable openmp) +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch deleted file mode 100644 index 5f085554c33f..000000000000 --- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 7c959a3e938a32b386418ddfdfbb884a96762d90 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Sat, 7 Aug 2021 08:14:44 -0400 -Subject: [PATCH 1/1] fflas-ffpack/interfaces/libs/Makefile.am: fix internal - linking. - -This is just, - - https://github.com/linbox-team/fflas-ffpack/pull/339 - -but rebased onto the old release tarball. ---- - fflas-ffpack/interfaces/libs/Makefile.am | 22 ++++++++-------------- - 1 file changed, 8 insertions(+), 14 deletions(-) - -diff --git a/fflas-ffpack/interfaces/libs/Makefile.am b/fflas-ffpack/interfaces/libs/Makefile.am -index 8c56746..449f6e4 100644 ---- a/fflas-ffpack/interfaces/libs/Makefile.am -+++ b/fflas-ffpack/interfaces/libs/Makefile.am -@@ -24,7 +24,6 @@ pkgincludesubdir=$(pkgincludedir)/interfaces/libs - - AM_CXXFLAGS = @DEFAULT_CFLAGS@ - AM_CPPFLAGS = -I$(top_srcdir) #/fflas-ffpack/utils/ -I$(top_srcdir)/fflas-ffpack/fflas/ -I$(top_srcdir)/fflas-ffpack/ffpack -I$(top_srcdir)/fflas-ffpack/field --LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS) - #AM_LDFLAGS=-static - - -@@ -55,31 +54,26 @@ libfflas_la_SOURCES= fflas_L1_inst.C \ - fflas_L3_inst.C \ - fflas_L3_inst_implem.inl - --libfflas_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ -- -no-undefined -+libfflas_la_LIBADD= $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) -+libfflas_la_LDFLAGS= -version-info 1:0:0 -no-undefined - - libffpack_la_SOURCES= ffpack_inst.C \ - ffpack_inst_implem.inl --libffpack_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ -- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la -- --EXTRA_libffpack_la_DEPENDENCIES= libfflas.la -+libffpack_la_LIBADD= libfflas.la -+libffpack_la_LDFLAGS= -version-info 1:0:0 -no-undefined - - libfflas_c_la_SOURCES=fflas_lvl1.C \ - fflas_lvl2.C \ - fflas_lvl3.C \ - fflas_sparse.C - #libfflas_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED --libfflas_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ -- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la -- --EXTRA_libfflas_c_la_DEPENDENCIES=libfflas.la -+libfflas_c_la_LIBADD= libfflas.la -+libfflas_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined - - libffpack_c_la_SOURCES=ffpack.C - #libffpack_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED --libffpack_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \ -- -no-undefined -lfflas -lffpack --EXTRA_libffpack_c_la_DEPENDENCIES=libffpack.la -+libffpack_c_la_LIBADD= libffpack.la -+libffpack_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined - - - EXTRA_DIST=c_libs.doxy --- -2.31.1 - diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch deleted file mode 100644 index 48ae6c37166a..000000000000 --- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 11364be98b200405630117d5eebb33bfdbc8c19e Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Sat, 7 Aug 2021 12:09:39 -0400 -Subject: [PATCH 1/1] configure.ac: don't append -fabi-version=6 to CXXFLAGS. - -This is a quick hack to avoid appending -fabi-version=6 to CXXFLAGS. -Both givaro and fflas-ffpack have problems with this legacy cruft -that are fixed upstream but tough to backport. We don't support -compilers that old, so we can just delete it. ---- - configure.ac | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 571d923..616b2f5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -179,10 +179,6 @@ AC_SUBST(SIMD_FLAGS) - dnl gcc-4.9.2 bug See https://trac.sagemath.org/ticket/17635#comment:178 - AS_IF([ test "x$CCNAM" = "xgcc492" ],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fpermissive"],[]) - --dnl With GCC's default ABI version, a __m128 or __m256 are the same types and therefore we cannot --dnl have overloads for both types without linking error. --AS_IF([test "x$CCNAM" = "xgcc"],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6"],[]) -- - AC_SUBST(REQUIRED_FLAGS) - - PARFLAGS="${OMPFLAGS}" --- -2.31.1 - diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch deleted file mode 100644 index a995c0518566..000000000000 --- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3f7a5f601e73491ac7c39cc848fa98fe6224978c Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Mon, 16 Aug 2021 21:19:39 -0400 -Subject: [PATCH 1/1] tests/Makefile.am: disable test-fgesv. - -This test can fail on Gentoo, and has been reported upstream. In the -meantime, having it fail on end users is no good, so we disable it. - -Gentoo-bug: https://bugs.gentoo.org/807100 -Upstream-bug: https://github.com/linbox-team/fflas-ffpack/issues/341 ---- - tests/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 62e92bc..83cf71f 100755 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -63,7 +63,6 @@ BASIC_TESTS = \ - test-io \ - test-maxdelayeddim \ - test-solve \ -- test-fgesv \ - test-simd \ - test-fgemv \ - test-nullspace \ -@@ -143,7 +142,6 @@ test_ftrtri_SOURCES = test-ftrtri.C - # test_fullranksubmatrix_SOURCES = test-fullranksubmatrix.C - # test_invert_SOURCES = test-invert.C - # test_krylov_elim_SOURCES = test-krylov-elim.C --test_fgesv_SOURCES = test-fgesv.C - # test_frobenius_SOURCES = test-frobenius.C - test_nullspace_SOURCES = test-nullspace.C - test_fdot_SOURCES = test-fdot.C --- -2.31.1 - diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.5.0-blaslapack.patch index 3154a2618196..609aa034438d 100644 --- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch +++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.5.0-blaslapack.patch @@ -1,10 +1,24 @@ +From 8e350d3f47a1785eb4eea83dee43c596d6399459 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 10 Feb 2024 07:30:37 -0500 +Subject: [PATCH] configure.ac,fflas-ffpack-config.in: use pkg-config to check + for blas + +Patching configure.ac for this is ugly, but in this case it is +actually the simplest way to get sane behavior out of the blas/lapack +check. +--- + configure.ac | 29 ++++++++++++++++++----------- + fflas-ffpack-config.in | 4 ++-- + 2 files changed, 20 insertions(+), 13 deletions(-) + diff --git a/configure.ac b/configure.ac -index 5b46b18..5e0264a 100644 +index 5390bcf..2f5fc46 100644 --- a/configure.ac +++ b/configure.ac -@@ -248,49 +248,24 @@ dnl echo '********************************************************************** - dnl exit 1 - dnl ]) +@@ -133,17 +133,24 @@ FF_CHECK_GIVARO_USABILITY() + + AS_ECHO([---------------------------------------]) -BLAS_FOUND=false - @@ -16,39 +30,7 @@ index 5b46b18..5e0264a 100644 - -FF_OPENBLAS_NUM_THREADS - --# FF_CHECK_BLAS -- --# FF_CHECK_GOTOBLAS -- --# FF_CHECK_GSL -- --# if test "$BLAS_FOUND" = "false" ; then -- # FF_CHECK_CBLAS --# fi -- --# if test "$BLAS_FOUND" = "false" ; then -- # FF_CHECK_OTHERBLAS --# fi -- --# FF_CHECK_LAPACK -- --# if test "$BLAS_FOUND" = "false" ; then -- # FF_CHECK_BLAS2 --# fi -- -- -- --# BLAS_LIBS="${BLAS_LIBS}" --# BLAS_LIBS="-L/${BLAS_PATH} ${LAPACK_LIBS} ${BLAS_LIBS}" --# AC_SUBST(BLAS_LIBS) -- -# FF_CHECK_CUDA -- --# AM_CONDITIONAL(FFLASFFPACK_HAVE_BLAS, test "x$BLAS_FOUND" != "xfalse") -- -- --# FF_BENCH -- +PKG_PROG_PKG_CONFIG + +PKG_CHECK_MODULES([BLAS], [cblas blas],[ @@ -68,23 +50,26 @@ index 5b46b18..5e0264a 100644 + +AM_CONDITIONAL(FFLASFFPACK_HAVE_LAPACK, test "x$HAVE_LAPACK" == "x1") - FF_DOC + AS_ECHO([---------------------------------------]) diff --git a/fflas-ffpack-config.in b/fflas-ffpack-config.in -index f1dac22..17633a0 100644 +index 3e2f53f..e227ce0 100644 --- a/fflas-ffpack-config.in +++ b/fflas-ffpack-config.in -@@ -107,11 +107,11 @@ while test $# -gt 0; do +@@ -106,11 +106,11 @@ while test $# -gt 0; do ;; --libs) -- echo @PARLIBS@ @PRECOMPILE_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ # @CUDA_LIBS@ -+ echo @PARLIBS@ @PRECOMPILE_LIBS@ @LAPACK_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ # @CUDA_LIBS@ +- echo @PARLIBS@ @PRECOMPILE_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ ++ echo @PARLIBS@ @PRECOMPILE_LIBS@ @LAPACK_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ ;; --blas-libs) -- echo @BLAS_LIBS@ -+ echo @LAPACK_LIBS@ @BLAS_LIBS@ +- echo @BLAS_LIBS@ ++ echo @LAPACK_LIBS@ @BLAS_LIBS@ ;; - --blas-home) + *) +-- +2.43.0 + diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.5.0-no-test-fsyr2k.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.5.0-no-test-fsyr2k.patch new file mode 100644 index 000000000000..102f5f7dd90b --- /dev/null +++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.5.0-no-test-fsyr2k.patch @@ -0,0 +1,30 @@ +From 59ba369aee228b0d166cd7f86d365b17a0104777 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sun, 18 Feb 2024 07:39:09 -0500 +Subject: [PATCH 1/1] tests/Makefile.am: disable test-fsyr2k + +We have a report of this failing on Gentoo, and it's unlikely to get +fixed any time soon. In any case it's reported upstream at, + + https://github.com/linbox-team/fflas-ffpack/issues/393 + +Bug: https://bugs.gentoo.org/924880 +--- + tests/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index cd73818..2941182 100755 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -57,7 +57,6 @@ BASIC_TESTS = \ + test-quasisep \ + test-pluq-check \ + test-fsyrk \ +- test-fsyr2k \ + test-fsytrf \ + test-invert-check \ + test-rankprofiles \ +-- +2.43.0 + diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild index 213b53606d55..ea7a5189348f 100644 --- a/sci-libs/fftw/fftw-3.3.10.ebuild +++ b/sci-libs/fftw/fftw-3.3.10.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 FORTRAN_NEEDED=fortran -inherit fortran-2 multibuild multilib-minimal toolchain-funcs +inherit fortran-2 libtool multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" HOMEPAGE="https://www.fftw.org/" @@ -33,6 +33,12 @@ BDEPEND="test? ( dev-lang/perl )" HTML_DOCS=( doc/html/. ) +QA_CONFIG_IMPL_DECL_SKIP=( + # check fails with any version of gcc. On <14: + # <artificial>:(.text.startup+0x19): undefined reference to `_rtc' + _rtc +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -50,8 +56,12 @@ pkg_setup() { src_prepare() { default - # fix info file for category directory - [[ ${PV} == *9999 ]] && eautoreconf + if [[ ${PV} == *9999 ]]; then + # fix info file for category directory + eautoreconf + else + elibtoolize + fi } multilib_src_configure() { diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild index f3fa7dd693b0..176526968102 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 FORTRAN_NEEDED=fortran -inherit fortran-2 multibuild multilib-minimal toolchain-funcs +inherit fortran-2 libtool multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" HOMEPAGE="https://www.fftw.org/" @@ -33,6 +33,12 @@ BDEPEND="test? ( dev-lang/perl )" HTML_DOCS=( doc/html/. ) +QA_CONFIG_IMPL_DECL_SKIP=( + # check fails with any version of gcc. On <14: + # <artificial>:(.text.startup+0x19): undefined reference to `_rtc' + _rtc +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -50,8 +56,12 @@ pkg_setup() { src_prepare() { default - # fix info file for category directory - [[ ${PV} == *9999 ]] && eautoreconf + if [[ ${PV} == *9999 ]]; then + # fix info file for category directory + eautoreconf + else + elibtoolize + fi } multilib_src_configure() { diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r6.ebuild index 6f4b7099f0e9..8f253ff0802e 100644 --- a/sci-libs/flann/flann-1.9.1-r5.ebuild +++ b/sci-libs/flann/flann-1.9.1-r6.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 @@ -24,7 +24,7 @@ DEPEND=" cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( dev-libs/boost:=[mpi] - sci-libs/hdf5[mpi] + sci-libs/hdf5:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1:= ) diff --git a/sci-libs/flann/metadata.xml b/sci-libs/flann/metadata.xml index a90e992e1916..c33b2618d660 100644 --- a/sci-libs/flann/metadata.xml +++ b/sci-libs/flann/metadata.xml @@ -17,7 +17,6 @@ <use> <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag> - <flag name="cuda">Enable support for nVidia CUDA</flag> </use> <upstream> <remote-id type="github">mariusmuja/flann</remote-id> diff --git a/sci-libs/foxi/foxi-2021.05.27.ebuild b/sci-libs/foxi/foxi-2021.05.27.ebuild index 5a3d59c25fd3..667c6691565a 100644 --- a/sci-libs/foxi/foxi-2021.05.27.ebuild +++ b/sci-libs/foxi/foxi-2021.05.27.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 @@ -15,10 +15,6 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -DEPEND="" -RDEPEND=" - ${DEPEND} -" RESTRICT="test" # No test available S="${WORKDIR}"/${PN}-${CommitId} diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest index 6cb16cd50382..a47edd02beb0 100644 --- a/sci-libs/fplll/Manifest +++ b/sci-libs/fplll/Manifest @@ -1 +1 @@ -DIST fplll-5.4.4.tar.gz 2630101 BLAKE2B b990c9346acd2c506b4697f27ff21d8453bb97473b2e988beb2ab9da34b3edd8a64d7558bca5f66a888fb4397c1e5340cf50f543ec580f0ec6980bc8c73a9390 SHA512 32a6515a3ab2677739a60a4ef0938e4284b5d3119a396104a7af22a6291ef669b42a4fb6e59f5c6daf97ff2402e7d035ea84fd1c76bfe7c0e17402bd03ae7166 +DIST fplll-5.4.5.tar.gz 2630275 BLAKE2B 43d1601f401c3a4eba60939028b26f99d32f92b9d53b763768427d05b2d709645532c4fbb14556c8d8d92cc14efe86468469ed69a77bdb03af75ec08499cc17e SHA512 3e1281f1b993ebe4a767b7fc526f49a27d58f24b1b4c6074310cc971f6f569388d6ba27102087a2eb11671d2d5b87bd60306e2597567f4ae8dd2a9efd13beb77 diff --git a/sci-libs/fplll/fplll-5.4.4.ebuild b/sci-libs/fplll/fplll-5.4.5.ebuild index f947f1eaf1d1..f947f1eaf1d1 100644 --- a/sci-libs/fplll/fplll-5.4.4.ebuild +++ b/sci-libs/fplll/fplll-5.4.5.ebuild diff --git a/sci-libs/gamer/gamer-1.5-r2.ebuild b/sci-libs/gamer/gamer-1.5-r2.ebuild index 1a48e31ad7e5..29179b74bea1 100644 --- a/sci-libs/gamer/gamer-1.5-r2.ebuild +++ b/sci-libs/gamer/gamer-1.5-r2.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=7 @@ -20,7 +20,7 @@ DEPEND="${RDEPEND}" BDEPEND=" doc? ( media-gfx/graphviz - app-doc/doxygen + app-text/doxygen )" PATCHES=( diff --git a/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild index 21816edadf13..106917e74514 100644 --- a/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild +++ b/sci-libs/gaul-devel/gaul-devel-0.1849-r2.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=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Genetic Algorithm Utility Library" HOMEPAGE="https://gaul.sourceforge.net" -SRC_URI="mirror://sourceforge/gaul/${P}-0.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/gaul/${P}-0.tar.bz2" LICENSE="GPL-2+" SLOT="0" diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index bced264317d2..09dac3ab08c8 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -1,8 +1,6 @@ -DIST gdal-3.6.4.tar.xz 8648032 BLAKE2B d6abdbcc87029bf230dae5586f06cbd329e5e43be37d8f5e9a72c67c93a6769458cc9c693b498e3f697b1ee1b68c9f9dbf7545ff9819fceb8fdde81b8d4ac882 SHA512 a8f69158d44ea456c44cfcb8937892697a28d2e4a43333c28db8fb9e81c51436a6edcb7a392b8c7ef63cd7453be6350a938bc4ba910720d9d5d9a1f32c57c558 -DIST gdal-3.7.0.tar.xz 8604724 BLAKE2B 400cc17fc636c637f7c40e93aed8e2db7bfbbe73741da4135cfeec8dbcda24ce0c8035214edf038afc29a916012da86a78d789729540f870231dfa6aa27e424a SHA512 4a3262d75ffbb58ec0821cd266843e28ca64c34383fb2bfaf30c984bf01c6d012381892a31a2ebc7c27a58b058fb44389cd45b05b619579b6178feb192f37bc6 -DIST gdal-3.7.1.tar.xz 8614512 BLAKE2B c137ca19809170948b5b7bf852193d922d167fed554eef0cf43f326098b7b7faa40427fddbe14b051af31bbc53a91555ce562f88d04f37f81e0753265383c42a SHA512 c72483a28af8f5512757a9f319c70a12e5d5cd5e30cb2ace160e7cbad6099544526a7136875582b6e76ce10968ef1bd67a78e4df65d64bc4e8feeb7684146ca6 -DIST gdal-3.7.2.tar.xz 8619608 BLAKE2B 29a96e34f4ffe661fc2af786b9a229be779ed5e91e4c580834f6624f4173ede8adf22c27b2830c446736c0ff37501441ab2afea9f780dad4588636b03deb1f71 SHA512 6f2bd93520bd45e64b7613c8bcb0e0848d7ce10bcf716ff6ba5ef9ec9cad5798d65c79461fe0b83e99103ac12893893fea44b9b4c23f1e2f05b914f3e7f982f1 -DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1 -DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B cac18436ad2acb558e27e8ba3f1f2c22aa6c7ba258abe25118acf65fb2cb8a3d5f132ccb8315912a54d07f035b5ff331cf6a66bdf51a54c8275c5203e844eb82 SHA512 81e80c799a8a910a861182480e8306c8583cdffe7cb62f47fbaddf031e1c4d1d3fb341edf0daddbb8c934e5f2d547b380feb2f5a9f22cd50db14e43c2b02737b -DIST gdalautotest-3.7.1.tar.gz 13830135 BLAKE2B 277574c603fe92758246577df3717363a45c7321378ea15766f4198100f3277e12028ee3b480bc1a7d803519664974c6a745f2968de50278c6e8e6d389a95b46 SHA512 d69de5daa9e1f49089b5465f93b09a2717065d119127150e65dbbfb23dc664c34b7e21e59edb17ce827b62d43d72f1d672ac70dca592ade90fe07359644e2c66 -DIST gdalautotest-3.7.2.tar.gz 13835621 BLAKE2B 38cf190bf5f81836da0b56c89cf3a4fa5461215d82df48a598420bc1bdde81cdcb2e56f9b987ec60c35646470297ade41b6ca5fd3dc7df131cdfeb3de33a7b87 SHA512 9c3ace4811805b6393fe4f06d95e155427da8bb18aa8ceec0f28966c92bdf6edd57c565889c4d8deb58f46a3cb88e39fc31aa33fe27804f228e91781bd9e91b3 +DIST gdal-3.8.0.tar.xz 8853728 BLAKE2B 646aa91283e7228a054221d120bddb456c8b898f9155edd289f2b2e0bf8706fa3045a98d26e4cf5ba5dba6d8c1c7f0a7f4aaaded9457481a65910c2d313c8f9d SHA512 42b3a381190922e546ae83355f56532b92d519b1eac357a9c116ee19b67b67362f282e248e2d82c14ae04cae04dce175bb652f481879442ffa5b58f764a088dd +DIST gdal-3.8.5.tar.xz 8871404 BLAKE2B 2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a259443a8ad68ff8f471f4efa8d2fd7935c57317ee5e94789244067706967f9c5df413bccd2556b5790d51d349 SHA512 4cdf1c45ea110cf6ba6ffe5b890ebd8f82654899ed6224ede6c59864f28626c758b5ea15f26c1840a4d3f70abaf9c1255754c565ef2fe5e5b39e0499ace63521 +DIST gdal-3.9.0.tar.xz 9081116 BLAKE2B 5b1453b889768359d36c6da435b27f6d31bb1ba95cecfd05d525d63258100705778d2675219711d0c2ab0e2392dd0eabffa1af3ffd055ebfc14840aaa1e768c0 SHA512 05e50a3898b4c71351125c59b0058eb8213858ef14f213b251dee44638522e7e87ed660d028677803a74728543531b0f438e53a543e6529bb8cdc391e9a09b02 +DIST gdalautotest-3.8.0.tar.gz 15615239 BLAKE2B fa524bb796a6f5b28bea79b51c4ce34e231b1d10a108a4590e30a48dc946df45880828a5a1ee0db07ed191e0f7dd5631fb294f3a73d1ce24244b6132f5cc3de1 SHA512 e72705571a337412d379cdf36debbe01aca61e789527c5e1f1c47904ba817c390a04032913fde75f899b96ec4f0b3a849ec3ead2539c31b59ca5006cd5e4e431 +DIST gdalautotest-3.8.5.tar.gz 15711701 BLAKE2B 3f0a5ba7f6a2072aaf46e2867739faaba9fae89f2679ad5cb4cb356112b197141e996fc10365bb6a95c3fce648a440bd746aa68f5c52a8743995cf696d230ef0 SHA512 18251e2fe5870bcbbde9c4278d7ce969feb6397a727679f56e6cf051cf5a3ded29217c034566cb9c5ebb02d51ad4d12933ab918eeadb0017c78859892bbf4f19 +DIST gdalautotest-3.9.0.tar.gz 16280839 BLAKE2B e9d294dcbf98b052889b807992ec435837da37a8ecf6bf97ab3cac5c798feea4f69c930cfcecbe072f959c140788136f34525fed9086e14d9bf4fb1fe44e0113 SHA512 411037da7c8de6985dad7b5f3868527b8f59b280a2b7fd29addab81ae1ae58f8611843de355d9a39ea3fca09001b7931c669f379e88b407116784e597b2cda7f diff --git a/sci-libs/gdal/files/gdal-3.8.0-java21.patch b/sci-libs/gdal/files/gdal-3.8.0-java21.patch new file mode 100644 index 000000000000..3e924c5206c1 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.8.0-java21.patch @@ -0,0 +1,20 @@ +--- a/swig/java/build.xml ++++ b/swig/java/build.xml +@@ -21,7 +21,7 @@ + <target name="compile" depends="init" description="Compile the source files."> + <mkdir dir="${build_dir}/build/classes"/> + <javac srcdir="${build_dir}/org" destdir="${build_dir}/build/classes" +- debug="on" source="7" target="7" ++ debug="on" source="8" target="8" + includeantruntime="false" deprecation="true"> + </javac> + <echo>compilation complete</echo> +@@ -38,7 +38,7 @@ + <target name="compile_tests" depends="archive" description="Compile the tests files."> + <mkdir dir="${build_dir}/build/apps"/> + <javac srcdir="${source_apps}" destdir="${build_dir}/build/apps" +- debug="on" source="7" target="7" ++ debug="on" source="8" target="8" + includeantruntime="false" deprecation="true" classpath="${build_dir}/gdal.jar"> + </javac> + <echo>compilation of tests complete</echo> diff --git a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch new file mode 100644 index 000000000000..606dc3e05089 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch @@ -0,0 +1,22 @@ +From cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sat, 18 Nov 2023 15:38:46 +0100 +Subject: [PATCH] Fix build error with libxml2 2.12 + +--- + port/cpl_xml_validate.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp +index 7eb49ff40c90..29070d957b65 100644 +--- a/port/cpl_xml_validate.cpp ++++ b/port/cpl_xml_validate.cpp +@@ -914,7 +914,7 @@ static void CPLLibXMLWarningErrorCallback(void *ctx, const char *msg, ...) + + if (strstr(pszStr, "since this namespace was already imported") == nullptr) + { +- xmlErrorPtr pErrorPtr = xmlGetLastError(); ++ const xmlError *pErrorPtr = xmlGetLastError(); + const char *pszFilename = static_cast<char *>(ctx); + char *pszStrDup = CPLStrdup(pszStr); + int nLen = static_cast<int>(strlen(pszStrDup)); diff --git a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch new file mode 100644 index 000000000000..410b79e2ec15 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch @@ -0,0 +1,27 @@ +From ec33f6d6dfe944f59dc5454d01b4d000d9479c02 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sat, 18 Nov 2023 16:33:25 +0100 +Subject: [PATCH] Fix build error with libxml2 2.12 (cont'd) + +--- + gcore/gdaljp2metadatagenerator.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gcore/gdaljp2metadatagenerator.cpp b/gcore/gdaljp2metadatagenerator.cpp +index b6caa2db9def..751fa3d5e9dd 100644 +--- a/gcore/gdaljp2metadatagenerator.cpp ++++ b/gcore/gdaljp2metadatagenerator.cpp +@@ -357,7 +357,12 @@ static CPLString GDALGMLJP2EvalExpr(const CPLString &osTemplate, + /************************************************************************/ + + static void GDALGMLJP2XPathErrorHandler(void * /* userData */, +- xmlErrorPtr error) ++#if LIBXML_VERSION >= 21200 ++ const xmlError *error ++#else ++ xmlErrorPtr error ++#endif ++) + { + if (error->domain == XML_FROM_XPATH && error->str1 != nullptr && + error->int1 < static_cast<int>(strlen(error->str1))) diff --git a/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch new file mode 100644 index 000000000000..837a50f6b825 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch @@ -0,0 +1,23 @@ +From 60dcddbf5fab917338caf433b3e7dca283cf9720 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Thu, 4 Apr 2024 17:48:33 +0200 +Subject: [PATCH] Fix build with Poppler 24.05 (unreleased yet) + +--- + frmts/pdf/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt +index 9b9a1898a730..bcb19c3aa24c 100644 +--- a/frmts/pdf/CMakeLists.txt ++++ b/frmts/pdf/CMakeLists.txt +@@ -54,6 +54,9 @@ if (GDAL_USE_POPPLER) + if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+") + string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR ${Poppler_VERSION_MINOR}) + endif () ++ if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05") ++ target_compile_features(gdal_PDF PRIVATE cxx_std_20) ++ endif () + target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR} + -DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR}) + endif () diff --git a/sci-libs/gdal/gdal-3.6.4.ebuild b/sci-libs/gdal/gdal-3.6.4.ebuild deleted file mode 100644 index b714e11787bd..000000000000 --- a/sci-libs/gdal/gdal-3.6.4.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -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/32" # subslot is libgdal.so.<SONAME> -KEYWORDS="amd64 ~arm arm64 ~ia64 ~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 pdf png postgres python spatialite sqlite test webp xls zstd" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - spatialite? ( sqlite ) -" - -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen ) - java? ( - dev-java/ant-core - dev-lang/swig:0 - >=virtual/jdk-1.8:* - ) - python? ( - dev-lang/swig:0 - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - )" -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] ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - 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:= ) - 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() { - use python && python-single-r1_pkg_setup - 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 - - # 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=OFF - -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=OFF - -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) - ) - - 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 - # TODO: install docs? -} - -pkg_postinst() { - elog "Check available image and data formats after building with" - elog "gdalinfo and ogrinfo (using the --formats switch)." -} diff --git a/sci-libs/gdal/gdal-3.7.0.ebuild b/sci-libs/gdal/gdal-3.8.0-r1.ebuild index ad7b0c96ad80..1a8dd8a1059a 100644 --- a/sci-libs/gdal/gdal-3.7.0.ebuild +++ b/sci-libs/gdal/gdal-3.8.0-r1.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 @@ -12,7 +12,7 @@ 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/33" # subslot is libgdal.so.<SONAME> +SLOT="0/34" # subslot is libgdal.so.<SONAME> KEYWORDS="amd64 ~arm arm64 ~ia64 ~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 pdf png postgres python spatialite sqlite test webp xls zstd" RESTRICT="!test? ( test )" @@ -25,9 +25,9 @@ REQUIRED_USE=" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) java? ( - dev-java/ant-core + >=dev-java/ant-1.10.14-r3:0 dev-lang/swig ) python? ( @@ -99,8 +99,10 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) PATCHES=( + "${FILESDIR}/gdal-3.8.0-java21.patch" "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch + "${FILESDIR}"/${P}-libxml2-2.12-{1,2}.patch # bug 917564 ) pkg_setup() { @@ -267,8 +269,8 @@ src_install() { # 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/share/java/libgdalalljni.so" - rm "${D}/usr/share/java/libgdalalljni.so" || die + java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" + rm -rf "${ED}/usr/$(get_libdir)/jni" || die fi # TODO: install docs? diff --git a/sci-libs/gdal/gdal-3.7.1.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild index b652d383e470..d566ab246d33 100644 --- a/sci-libs/gdal/gdal-3.7.1.ebuild +++ b/sci-libs/gdal/gdal-3.8.5.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_{10..11} ) +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)" @@ -12,8 +12,8 @@ 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/33" # subslot is libgdal.so.<SONAME> -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +SLOT="0/34" # subslot is libgdal.so.<SONAME> +KEYWORDS="amd64 ~arm arm64 ~ia64 ~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 pdf png postgres python spatialite sqlite test webp xls zstd" RESTRICT="!test? ( test )" @@ -25,9 +25,9 @@ REQUIRED_USE=" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) java? ( - dev-java/ant-core + >=dev-java/ant-1.10.14-r3:0 dev-lang/swig ) python? ( @@ -99,8 +99,9 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) PATCHES=( + "${FILESDIR}"/${PN}-3.8.0-java21.patch "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch - "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch + "${FILESDIR}"/${P}-poppler-24.05.0.patch # in 3.9.0 ) pkg_setup() { @@ -267,8 +268,8 @@ src_install() { # 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/share/java/libgdalalljni.so" - rm "${D}/usr/share/java/libgdalalljni.so" || die + java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" + rm -rf "${ED}/usr/$(get_libdir)/jni" || die fi # TODO: install docs? diff --git a/sci-libs/gdal/gdal-3.7.2.ebuild b/sci-libs/gdal/gdal-3.9.0.ebuild index b652d383e470..1d4b3b7c902b 100644 --- a/sci-libs/gdal/gdal-3.7.2.ebuild +++ b/sci-libs/gdal/gdal-3.9.0.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_{10..11} ) +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)" @@ -12,9 +12,9 @@ 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/33" # subslot is libgdal.so.<SONAME> +SLOT="0/34" # subslot is libgdal.so.<SONAME> KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~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 pdf png postgres python spatialite sqlite test webp xls zstd" +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 )" REQUIRED_USE=" @@ -25,9 +25,9 @@ REQUIRED_USE=" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) java? ( - dev-java/ant-core + >=dev-java/ant-1.10.14-r3:0 dev-lang/swig ) python? ( @@ -74,6 +74,7 @@ DEPEND=" ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) + parquet? ( dev-libs/apache-arrow:=[parquet] ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) @@ -100,7 +101,6 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch - "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch ) pkg_setup() { @@ -190,7 +190,7 @@ src_configure() { -DGDAL_USE_OPENJPEG=$(usex jpeg2k) -DGDAL_USE_OPENSSL=ON -DGDAL_USE_ORACLE=$(usex oracle) - -DGDAL_USE_PARQUET=OFF + -DGDAL_USE_PARQUET=$(usex parquet) -DGDAL_USE_PCRE2=ON -DGDAL_USE_PDFIUM=OFF -DGDAL_USE_PNG=$(usex png) @@ -267,8 +267,8 @@ src_install() { # 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/share/java/libgdalalljni.so" - rm "${D}/usr/share/java/libgdalalljni.so" || die + java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" + rm -rf "${ED}/usr/$(get_libdir)/jni" || die fi # TODO: install docs? diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml index 6f7f7f1ec90e..6aed0112ba9c 100644 --- a/sci-libs/gdal/metadata.xml +++ b/sci-libs/gdal/metadata.xml @@ -19,7 +19,7 @@ <flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>)</flag> <flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag> <flag name="ogdi">Enable support for the open geographic datastore interface (<pkg>sci-libs/ogdi</pkg>)</flag> - <flag name="opencl">Enable OpenCL support</flag> + <flag name="parquet">Enables read/write parquet data format (<pkg>dev-libs/apache-arrow</pkg>)</flag> <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag> <flag name="xls">Add the <pkg>dev-libs/freexl</pkg> library for xls import support</flag> </use> diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index 9581af48922a..9fca3d6d3ed3 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -2,3 +2,4 @@ DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f 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 diff --git a/sci-libs/geos/geos-3.11.0.ebuild b/sci-libs/geos/geos-3.11.0.ebuild index 1ff24602fef5..1cf22d560bb0 100644 --- a/sci-libs/geos/geos-3.11.0.ebuild +++ b/sci-libs/geos/geos-3.11.0.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 @@ -15,7 +15,7 @@ KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~p IUSE="doc test" RESTRICT="!test? ( test )" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_configure() { local mycmakeargs=( diff --git a/sci-libs/geos/geos-3.11.1.ebuild b/sci-libs/geos/geos-3.11.1.ebuild index 7f268e5f6bbb..1010da5740a8 100644 --- a/sci-libs/geos/geos-3.11.1.ebuild +++ b/sci-libs/geos/geos-3.11.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 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-lin IUSE="doc test" RESTRICT="!test? ( test )" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/${P}-gcc-13.patch diff --git a/sci-libs/geos/geos-3.11.2.ebuild b/sci-libs/geos/geos-3.11.2.ebuild index 88b55f52a870..ea63aa08b670 100644 --- a/sci-libs/geos/geos-3.11.2.ebuild +++ b/sci-libs/geos/geos-3.11.2.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 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Geometry engine library for Geographic Information Systems" HOMEPAGE="https://libgeos.org/" @@ -11,17 +11,22 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/${P}-gcc-13.patch ) src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/862702 + # https://github.com/libgeos/geos/issues/1054 + filter-lto + local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc) -DBUILD_TESTING=$(usex test) diff --git a/sci-libs/geos/geos-3.12.0.ebuild b/sci-libs/geos/geos-3.12.0.ebuild index a95d93f605b6..71105c249023 100644 --- a/sci-libs/geos/geos-3.12.0.ebuild +++ b/sci-libs/geos/geos-3.12.0.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 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Geometry engine library for Geographic Information Systems" HOMEPAGE="https://libgeos.org/" @@ -15,9 +15,14 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-lin IUSE="doc test" RESTRICT="!test? ( test )" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/862702 + # https://github.com/libgeos/geos/issues/1054 + filter-lto + local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc) -DBUILD_TESTING=$(usex test) diff --git a/sci-libs/geos/geos-3.12.1.ebuild b/sci-libs/geos/geos-3.12.1.ebuild new file mode 100644 index 000000000000..71105c249023 --- /dev/null +++ b/sci-libs/geos/geos-3.12.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +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 ~ia64 ~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() { + # -Werror=odr + # https://bugs.gentoo.org/862702 + # https://github.com/libgeos/geos/issues/1054 + filter-lto + + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc) + -DBUILD_TESTING=$(usex test) + -DUSE_CCACHE=OFF + + # bug #709368 + $(usev 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/getdata/files/getdata-0.11.0-bashisms-configure.patch b/sci-libs/getdata/files/getdata-0.11.0-bashisms-configure.patch new file mode 100644 index 000000000000..df3915f7b849 --- /dev/null +++ b/sci-libs/getdata/files/getdata-0.11.0-bashisms-configure.patch @@ -0,0 +1,66 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -571,7 +571,7 @@ if test "x${use_modules}" != "xno"; then + LDFLAGS=$saved_ldflags + LIBS=$saved_libs + +- if test "x$have_ltdl" == "xno"; then ++ if test "x$have_ltdl" = "xno"; then + AC_MSG_ERROR([libltdl is required to build modules. Please either specify the location of the libltdl library using --with-ltdl=PREFIX or else disable the building of modules by using --disable-modules]) + fi + +@@ -601,18 +601,18 @@ AC_SUBST([LIBLTDL]) + AC_SUBST([LTDLINCL]) + + dnl check if we found a C++ compiler +-if test "x$CXX" == "x"; then ++if test "x$CXX" = "x"; then + make_cxxbindings=no + fi + + dnl check if we found a Fortran 77 compiler +-if test "x$F77" == "x"; then ++if test "x$F77" = "x"; then + make_f77bindings=no + make_f95bindings=no + fi + + dnl check if we found a free-form Fortran compiler +-if test "x$FC" == "x"; then ++if test "x$FC" = "x"; then + make_f95bindings=no + fi + +@@ -641,7 +641,7 @@ fi + dnl F77 stuff + if test "x$make_f77bindings" != "xno"; then + AC_F77_WRAPPERS +- if test "x$ac_cv_f77_mangling" == "xunknown"; then ++ if test "x$ac_cv_f77_mangling" = "xunknown"; then + make_f77bindings=no + make_f95bindings=no + fi +@@ -1065,7 +1065,7 @@ else + AC_MSG_RESULT([$use_slim]) + AC_MSG_CHECKING([for zzip support]) + AC_MSG_RESULT([$use_zzip]) +- if test "$use_slim$use_zzip" == "yesyes"; then ++ if test "$use_slim$use_zzip" = "yesyes"; then + if test $zzslim_override = "yes"; then + AC_MSG_CHECKING([for zzslim support]) + AC_MSG_RESULT([yes (forced)]) +@@ -1200,11 +1200,11 @@ AC_CONFIG_FILES([test/Makefile]) + AC_CONFIG_FILES([util/Makefile]) + + dnl Automake conditionals +-AM_CONDITIONAL(GETDATA_DEBUG, [test "x$enable_debug" == "xyes"]) ++AM_CONDITIONAL(GETDATA_DEBUG, [test "x$enable_debug" = "xyes"]) + AM_CONDITIONAL(HAVE_SED, [ test "x${SED}" != 'x' ]) + AM_CONDITIONAL(INTEL_F77_COMPILER, +- [test "x$gd_cv_f77_compiler_intel" == "xyes"]) +-AM_CONDITIONAL(INTEL_FC_COMPILER, [test "x$gd_cv_fc_compiler_intel" == "xyes"]) ++ [test "x$gd_cv_f77_compiler_intel" = "xyes"]) ++AM_CONDITIONAL(INTEL_FC_COMPILER, [test "x$gd_cv_fc_compiler_intel" = "xyes"]) + AM_CONDITIONAL(INCLUDE_LEGACY_API, [test "x$include_legacy_api" != "xno"]) + AM_CONDITIONAL(MAKE_CXXBINDINGS, [test "x$make_cxxbindings" = "xyes"]) + AM_CONDITIONAL(MAKE_F77BINDINGS, [test "x$make_f77bindings" != "xno"]) diff --git a/sci-libs/getdata/getdata-0.11.0-r1.ebuild b/sci-libs/getdata/getdata-0.11.0-r2.ebuild index 698d2697d850..124d9278735a 100644 --- a/sci-libs/getdata/getdata-0.11.0-r1.ebuild +++ b/sci-libs/getdata/getdata-0.11.0-r2.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 @@ inherit autotools fortran-2 flag-o-matic DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data" HOMEPAGE="https://getdata.sourceforge.net" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz" SLOT="0" LICENSE="LGPL-2.1+" @@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 cxx debug flac fortran lzma perl static-libs" DEPEND=" + dev-libs/libltdl bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) @@ -25,6 +26,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-0.11.0-fix-gzseek64-not-found.patch + "${FILESDIR}"/${PN}-0.11.0-bashisms-configure.patch ) src_prepare() { @@ -33,6 +35,12 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # + # In theory I could report a bug. In practice the project has ignored all + # bug reports since immediately after switching to github. + filter-lto + # GCC 10 workaround # bug #723076 append-fflags $(test-flags-FC -fallow-argument-mismatch) diff --git a/sci-libs/getdata/getdata-0.11.0.ebuild b/sci-libs/getdata/getdata-0.11.0.ebuild index 4b0f5f033a18..8aa7b4621951 100644 --- a/sci-libs/getdata/getdata-0.11.0.ebuild +++ b/sci-libs/getdata/getdata-0.11.0.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 @@ -9,7 +9,7 @@ inherit autotools fortran-2 flag-o-matic DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data" HOMEPAGE="https://getdata.sourceforge.net" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz" SLOT="0" LICENSE="LGPL-2.1+" @@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 cxx debug flac fortran lzma perl static-libs" DEPEND=" + dev-libs/libltdl bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) diff --git a/sci-libs/getdata/metadata.xml b/sci-libs/getdata/metadata.xml index 716f2c3c2ae5..d1f4f454496b 100644 --- a/sci-libs/getdata/metadata.xml +++ b/sci-libs/getdata/metadata.xml @@ -12,6 +12,7 @@ provide a fast, simple format for storing and reading data. </longdescription> <upstream> + <remote-id type="github">ketiltrout/getdata</remote-id> <remote-id type="sourceforge">getdata</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest index 85fa14f2e7ef..4dbc70ea0a35 100644 --- a/sci-libs/ginkgo/Manifest +++ b/sci-libs/ginkgo/Manifest @@ -1,2 +1,3 @@ DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807 DIST ginkgo-1.6.0.tar.gz 12788830 BLAKE2B c452e20eddb3673b5863106d8a8d42aab253cb5a17cf0445194903ebadcffe53ef0df6b5f26e2602e137faaa4a23dddd0b192f3453b4bd440907385fc09d004a SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50 +DIST ginkgo-1.8.0.tar.gz 13140660 BLAKE2B 4b1800566ec2852b3dd7e58b01ec58e2cab45b55134fdf3d478832435c40b45320dc066d281a07127d1fc42e57c6f3d99440209d2286adc1294e44a1f660ad36 SHA512 9d121a5eec9f5d17d1bd4b8924ebb32985a68e8087addc7385b619e365ed260a40ab73eb7a8a16f46a590d3162a78c9311ff41dd3dc74a9117a61e0445d96c52 diff --git a/sci-libs/ginkgo/files/ginkgo-1.8.0-disable_automagic_dependencies.patch b/sci-libs/ginkgo/files/ginkgo-1.8.0-disable_automagic_dependencies.patch new file mode 100644 index 000000000000..c37259e3294a --- /dev/null +++ b/sci-libs/ginkgo/files/ginkgo-1.8.0-disable_automagic_dependencies.patch @@ -0,0 +1,24 @@ +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 653d52a..c56af59 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -41,8 +41,7 @@ if(GINKGO_BUILD_EXTLIB_EXAMPLE) + list(APPEND EXAMPLES_LIST external-lib-interfacing) + endif() + +-find_package(OpenCV QUIET) +-if(OpenCV_FOUND) ++if(FALSE) + list(APPEND EXAMPLES_LIST heat-equation schroedinger-splitting) + else() + message(STATUS "No OpenCV found, disabling examples with video output") +@@ -56,8 +55,7 @@ if(GINKGO_BUILD_MPI) + list(APPEND EXAMPLES_LIST distributed-solver) + endif() + +-find_package(Kokkos 4.1.00 QUIET) +-if(Kokkos_FOUND) ++if(FALSE) + list(APPEND EXAMPLES_LIST kokkos-assembly) + else() + message(STATUS "No Kokkos found, disabling examples with Kokkos assembly.") diff --git a/sci-libs/ginkgo/ginkgo-1.8.0.ebuild b/sci-libs/ginkgo/ginkgo-1.8.0.ebuild new file mode 100644 index 000000000000..5b507b79f030 --- /dev/null +++ b/sci-libs/ginkgo/ginkgo-1.8.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Numerical linear algebra software package" +HOMEPAGE="https://ginkgo-project.github.io/" + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD-with-attribution" +SLOT="0" +IUSE="cuda hwloc +openmp" + +RDEPEND=" + cuda? ( dev-util/nvidia-cuda-toolkit ) + hwloc? ( sys-apps/hwloc:= ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-disable_automagic_dependencies.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + sed -i \ + -e "s#\"lib\"#\"$(get_libdir)\"#g" \ + -e "s#\"lib/#\"$(get_libdir)/#g" \ + cmake/install_helpers.cmake || die "sed failed" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DGINKGO_DEVEL_TOOLS=OFF + -DGINKGO_BUILD_TESTS=OFF + -DGINKGO_BUILD_BENCHMARKS=OFF + -DGINKGO_BUILD_REFERENCE=ON + -DGINKGO_BUILD_CUDA=$(usex cuda) + -DGINKGO_BUILD_HWLOC=$(usex hwloc) + -DGINKGO_BUILD_OMP=$(usex openmp) + ) + cmake_src_configure +} diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest index 6682189b6b2d..1b16b256a854 100644 --- a/sci-libs/givaro/Manifest +++ b/sci-libs/givaro/Manifest @@ -1 +1 @@ -DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c +DIST givaro-4.2.0.tar.gz 969595 BLAKE2B 07c9f08269ee60c06b1589e56ccf61870df6c7cab93fb8ebf27791d9231b153a2da9aed296105fd6dcd52aaa7d27ea03eacd6f2066d29de267455c9ca3747995 SHA512 1a3280563181710d364b77e1efe8c8f52ce3119a08b35f329cfd98136a742431b7e9d102289448d337797f815439682d0cfce1567a5a88d5851b244673a84486 diff --git a/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch b/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch deleted file mode 100644 index 0564c7f94fef..000000000000 --- a/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5ba9fa4930b347aea8817da444bea5a88971079a Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Sat, 7 Aug 2021 11:43:29 -0400 -Subject: [PATCH 1/1] configure: hack out old GCC-4.x test. - -The Givaro ./configure script fails to detect modern versions of GCC, -instead deciding that they must be gcc-4.8. As a result, we wind up -with "-fabi-version=6" in CXXFLAGS, which then gets propagated to -users of "givaro-config --cflags", like fflas-ffpack. - -This is already fixed upstream, but not in a release, and not in a -way that I care to backport. Here we just hack the configure script -directly since the change is so trivial. ---- - configure | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure b/configure -index 1eb75b0..f3bbb52 100755 ---- a/configure -+++ b/configure -@@ -17172,11 +17172,6 @@ fi - - echo "-----------------------------------------------" - --if test "x$CCNAM" = "xgcc48"; then : -- REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6" --fi -- -- - - # Machine characteristics - --- -2.31.1 - diff --git a/sci-libs/givaro/files/givaro-4.2.0-configure.ac-fix-a-bashism.patch b/sci-libs/givaro/files/givaro-4.2.0-configure.ac-fix-a-bashism.patch new file mode 100644 index 000000000000..f8d942191040 --- /dev/null +++ b/sci-libs/givaro/files/givaro-4.2.0-configure.ac-fix-a-bashism.patch @@ -0,0 +1,32 @@ +From 1132161483e756902c86c190855e260164c025fd Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Fri, 9 Feb 2024 16:41:03 -0500 +Subject: [PATCH] configure.ac: fix a bashism + +There's one instance of VAR+=" value" in the configure script, but +that only works in bash. With dash, for example, it results in + + checking whether gmp version is at least 40000... yes + ./configure: 17953: REQUIRED_FLAGS+= : not found + +We change it to a VAR="${VAR} value" instead. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b03e5e4d..a94286ac 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -121,7 +121,7 @@ AS_ECHO([---------------------------------------]) + + # Look for GMP and add flags if necessary + GIV_CHECK_GMP(40000) +-REQUIRED_FLAGS+=" ${GMP_CFLAGS}" ++REQUIRED_FLAGS="${REQUIRED_FLAGS} ${GMP_CFLAGS}" + + GIV_DOC + +-- +2.43.0 + diff --git a/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch b/sci-libs/givaro/files/givaro-4.2.0-cstdint.patch index 15178289ca84..0fc532220da7 100644 --- a/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch +++ b/sci-libs/givaro/files/givaro-4.2.0-cstdint.patch @@ -1,3 +1,26 @@ +From a6b370873e406f9921a50359ed8ebf4714776411 Mon Sep 17 00:00:00 2001 +From: Jean-Guillaume Dumas <Jean-Guillaume.Dumas@imag.fr> +Date: Wed, 11 Oct 2023 14:19:52 +0200 +Subject: [PATCH] cstdint required for uint64_t + +--- + src/kernel/system/givpower.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/kernel/system/givpower.h b/src/kernel/system/givpower.h +index 5644264d..080e114d 100644 +--- a/src/kernel/system/givpower.h ++++ b/src/kernel/system/givpower.h +@@ -16,6 +16,8 @@ + #ifndef __GIVARO_power_H + #define __GIVARO_power_H + ++#include <cstdint> ++ + namespace Givaro { + + // ------------------------------------------------------------- + From c7744bb133496cd7ac04688f345646d505e1bf52 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" <code@musicinmybrain.net> Date: Thu, 19 Jan 2023 09:12:22 -0500 diff --git a/sci-libs/givaro/files/givaro-4.2.0-gcc14.patch b/sci-libs/givaro/files/givaro-4.2.0-gcc14.patch new file mode 100644 index 000000000000..83d7256abfd5 --- /dev/null +++ b/sci-libs/givaro/files/givaro-4.2.0-gcc14.patch @@ -0,0 +1,31 @@ +From 20caba1b549fe46b483f120f8eec6ec4e9f4572d Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" <code@musicinmybrain.net> +Date: Thu, 25 Jan 2024 08:29:17 -0500 +Subject: [PATCH] Temporary GCC 14 workaround +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes https://github.com/linbox-team/givaro/issues/226 “GCC 14: No match +for operator= for Givaro::ZRing<Givaro::Integer>” + +Recommended in +https://github.com/linbox-team/givaro/issues/226#issuecomment-1908853755 +--- + src/kernel/integer/random-integer.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/kernel/integer/random-integer.h b/src/kernel/integer/random-integer.h +index f9361d33..ea189a36 100644 +--- a/src/kernel/integer/random-integer.h ++++ b/src/kernel/integer/random-integer.h +@@ -87,7 +87,6 @@ namespace Givaro + if (this != &R) { + _bits = R._bits; + _integer = R._integer; +- const_cast<Integer_Domain&>(_ring)=R._ring; + } + return *this; + } +-- +2.43.0 diff --git a/sci-libs/givaro/givaro-4.1.1-r3.ebuild b/sci-libs/givaro/givaro-4.1.1-r3.ebuild deleted file mode 100644 index e072eb6ffbe7..000000000000 --- a/sci-libs/givaro/givaro-4.1.1-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - doc? ( - app-doc/doxygen[dot] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -DEPEND="dev-libs/gmp:0[cxx(+)]" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS ChangeLog README.md ) - -PATCHES=( - "${FILESDIR}/givaro-4.1.1-gcc-10.patch" - "${FILESDIR}/givaro-4.1.1-gcc-13.patch" - "${FILESDIR}/givaro-4.1.1-fix-pc-libdir.patch" -) - -src_configure() { - # Passing "--disable-doc" also accidentally enables building - # the documentation, so we can't just $(use_enable doc) here. - # https://github.com/linbox-team/givaro/issues/148 - econf \ - $(usex doc --enable-doc "" "" "") \ - --with-docdir="/usr/share/doc/${PF}/html" \ - $(use_enable static-libs static) \ - $(use_enable cpu_flags_x86_fma3 fma) \ - $(use_enable cpu_flags_x86_fma4 fma4) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_ssse3 ssse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) \ - $(use_enable cpu_flags_x86_sse4_2 sse42) \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable cpu_flags_x86_avx2 avx2) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/givaro/givaro-4.2.0.ebuild b/sci-libs/givaro/givaro-4.2.0.ebuild new file mode 100644 index 000000000000..d657e0e4660f --- /dev/null +++ b/sci-libs/givaro/givaro-4.2.0.ebuild @@ -0,0 +1,54 @@ +# 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 ~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" +) + +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/gklib/gklib-5.1.1_p20230327-r1.ebuild b/sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild index f310b03c4511..0090a307166a 100644 --- a/sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild +++ b/sci-libs/gklib/gklib-5.1.1_p20230327-r1.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 @@ -14,7 +14,7 @@ S="${WORKDIR}/GKlib-${COMMIT}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~arm64-macos ~x64-macos" PATCHES=( "${FILESDIR}/${P}-multilib.patch" diff --git a/sci-libs/gloo/Manifest b/sci-libs/gloo/Manifest index 07e768131dfa..2ac526930342 100644 --- a/sci-libs/gloo/Manifest +++ b/sci-libs/gloo/Manifest @@ -1 +1,2 @@ -DIST gloo-2023.01.17.tar.gz 252199 BLAKE2B 66b5fc6786a4c07aa639a30036a21d86f43c1577a950934f558051f241d198dd3e0d7bd9da39835c5e3d617a754164cb77ae30b9bc284b0119436bf0a26f5000 SHA512 d39102ed00c813576066b755730e367337f2558a4223fe8dd127bd48882db6a97c67522782f7e7b00c36198ccd2096e61e84382358783d2edb1ca4ee55123344 +DIST gloo-2023.07.19.tar.gz 260264 BLAKE2B b787794a6b5e791da5f8693ad9a522c8caa5410316d64ad3a2c23ae744ca9f0b45ac6a6f60572049d3e5825a2e29833ff887fc39f6fe6a6efef61d848c225318 SHA512 e84e8a69a8548a8bfcb6044b960fca3204eb358c50fa79f3053779f2a61703d5219ef428f4ba057ed08e6ec437aadb7f8e67565f03f3510e0bf94c6f793af8d9 +DIST gloo-2023.12.03.tar.gz 259857 BLAKE2B b56cbbb0986b70ed327a8d019f140099c5d1d725576120089cd5e640dc42daa6c6bb67de877d540fd2160f5b8d89cf54af7c11a1b81039e62e4de97daa4f63d6 SHA512 597679dd96394e7d0009be34ef9bd6f8446d22e2faa006c0853e055caf0d6d821c7532ff867b4d924197e92ab53c4c7ee9b74f897d6c5a469ee797c11ce0d28d diff --git a/sci-libs/gloo/files/gloo-2023.01.17-ssl3.patch b/sci-libs/gloo/files/gloo-2023.01.17-ssl3.patch new file mode 100644 index 000000000000..f01beafa4596 --- /dev/null +++ b/sci-libs/gloo/files/gloo-2023.01.17-ssl3.patch @@ -0,0 +1,19 @@ +--- a/gloo/CMakeLists.txt 2023-11-27 22:39:53.709670525 +0100 ++++ b/gloo/CMakeLists.txt 2023-11-27 22:42:29.784250524 +0100 +@@ -77,7 +77,7 @@ + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(GLOO_HAVE_TRANSPORT_TCP 1) + if(${USE_TCP_OPENSSL_LINK} OR ${USE_TCP_OPENSSL_LOAD}) +- find_package(OpenSSL 1.1 REQUIRED EXACT) ++ find_package(OpenSSL 1.1...<4 REQUIRED) + set(GLOO_HAVE_TRANSPORT_TCP_TLS 1) + else() + set(GLOO_HAVE_TRANSPORT_TCP_TLS 0) +--- a/gloo/test/CMakeLists.txt 2023-11-27 22:42:55.969844380 +0100 ++++ b/gloo/test/CMakeLists.txt 2023-11-27 22:43:14.873551147 +0100 +@@ -1,4 +1,4 @@ +-find_package(OpenSSL 1.1 REQUIRED EXACT) ++find_package(OpenSSL 1.1...<4 REQUIRED) + + set(GLOO_TEST_SRCS + "${CMAKE_CURRENT_SOURCE_DIR}/allgather_test.cc" diff --git a/sci-libs/gloo/gloo-2023.01.17-r1.ebuild b/sci-libs/gloo/gloo-2023.07.19.ebuild index a2c76198f848..5bdcf1d00a44 100644 --- a/sci-libs/gloo/gloo-2023.01.17-r1.ebuild +++ b/sci-libs/gloo/gloo-2023.07.19.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake cuda -CommitId=10909297fedab0a680799211a299203e53515032 +CommitId=cf1e1abc95d0b961222ee82b6935f76250fbcf16 DESCRIPTION="library of floating-point neural network inference operators" HOMEPAGE="https://github.com/facebookincubator/gloo/" @@ -17,14 +17,14 @@ KEYWORDS="~amd64" IUSE="cuda libuv mpi redis ssl test" RDEPEND=" - cuda? ( <dev-util/nvidia-cuda-toolkit-12:= ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) libuv? ( dev-libs/libuv ) mpi? ( virtual/mpi ) redis? ( dev-db/redis dev-libs/hiredis ) - ssl? ( dev-libs/openssl:0/1.1 ) + ssl? ( dev-libs/openssl:= ) " DEPEND="${RDEPEND} " @@ -36,7 +36,8 @@ S="${WORKDIR}"/${PN}-${CommitId} PATCHES=( "${FILESDIR}"/${PN}-2022.05.18-gentoo.patch - "${FILESDIR}"/${P}-cuda.patch + "${FILESDIR}"/${PN}-2023.01.17-cuda.patch + "${FILESDIR}"/${PN}-2023.01.17-ssl3.patch ) src_prepare() { @@ -56,6 +57,8 @@ src_configure() { -DUSE_TCP_OPENSSL_LINK=$(usex ssl ON OFF) ) if use cuda; then + addpredict "/proc/self/task" + mycmakeargs+=( -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" ) diff --git a/sci-libs/gloo/gloo-2023.12.03.ebuild b/sci-libs/gloo/gloo-2023.12.03.ebuild new file mode 100644 index 000000000000..16201cde8c0d --- /dev/null +++ b/sci-libs/gloo/gloo-2023.12.03.ebuild @@ -0,0 +1,67 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake cuda + +CommitId=5354032ea08eadd7fc4456477f7f7c6308818509 + +DESCRIPTION="library of floating-point neural network inference operators" +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" +IUSE="cuda libuv mpi redis ssl test" + +RDEPEND=" + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + libuv? ( dev-libs/libuv ) + mpi? ( virtual/mpi ) + redis? ( + dev-db/redis + dev-libs/hiredis + ) + ssl? ( dev-libs/openssl:= ) +" +DEPEND="${RDEPEND} +" + +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="test" # For some test the network is needed + +PATCHES=( + "${FILESDIR}"/${PN}-2022.05.18-gentoo.patch + "${FILESDIR}"/${PN}-2023.01.17-cuda.patch + "${FILESDIR}"/${PN}-2023.01.17-ssl3.patch +) + +src_prepare() { + eapply_user + cmake_src_prepare + use cuda && cuda_add_sandbox +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TEST=$(usex test ON OFF) + -DUSE_CUDA=$(usex cuda ON OFF) + -DGLOO_USE_CUDA_TOOLKIT=$(usex cuda ON OFF) + -DUSE_LIBUV=$(usex libuv ON OFF) + -DUSE_MPI=$(usex mpi ON OFF) + -DUSE_REDIS=$(usex redis ON OFF) + -DUSE_TCP_OPENSSL_LINK=$(usex ssl ON OFF) + ) + if use cuda; then + addpredict "/proc/self/task" + + mycmakeargs+=( + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + ) + fi + cmake_src_configure +} diff --git a/sci-libs/gloo/metadata.xml b/sci-libs/gloo/metadata.xml index e83d24904d0f..453b2878b484 100644 --- a/sci-libs/gloo/metadata.xml +++ b/sci-libs/gloo/metadata.xml @@ -9,7 +9,6 @@ <remote-id type="github">facebookincubator/gloo</remote-id> </upstream> <use> - <flag name="cuda">Enable CUDA support</flag> <flag name="libuv">Enable libuv support</flag> <flag name="redis">Enable Redis backend for storage via <pkg>dev-libs/hiredis</pkg></flag> </use> diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest index e46c8c64722c..3f2c1958a6ca 100644 --- a/sci-libs/gmsh/Manifest +++ b/sci-libs/gmsh/Manifest @@ -1,3 +1,3 @@ -DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880 SHA512 4da61bdf03fb9466af80ac790e83c8888bab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484 -DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e SHA512 863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653 DIST gmsh-4.11.1-source.tgz 17985611 BLAKE2B 087664cfbfec758eaa3740a65920ccf673dbcc97a1ef8010222da64b8c586334ed1a77904e94061bdf34e714aae34311ee4f6fb38740473046f99ad6c1e0984c SHA512 8f2a71d6db80dd6bacde6dc1ccd120c7f83609dd69a84a910455a21a43b7392cd7e0e7b4d37aaa6a1b1cbfdb816646cd4828d2ac6d784edba072167280432e4c +DIST gmsh-4.12.2-source.tgz 18150293 BLAKE2B 16f8048d8962d2a8e41d813713c147a691d24c7fabdcc7f3787bff804b1dfa477d4853b4b366a409c2ed9649e8c83710b4f73ac23a0c5885d0e65cd25bb88d6f SHA512 935148aff89b608f9d671d5fd4f12aed52b5c8ba4453e978d0febcc6934c045f2bba0078b13a64b2cbf4e852b413bbd05873335099ea7a967cc81ef58a7f8367 +DIST gmsh-4.13.1-source.tgz 18383962 BLAKE2B bf0d002b7d0fa187b47440f167fc02ad41acc327745d0fcdfce8e78877c794696f5e84c5fa6d36664be00c92219d3a338a817832b22edf8baec2954ac39d2f82 SHA512 273067b0d20b4afaa84aa8729f670a3d0666a9ffebe6c802f3b5e6e58daac68300aff6be7973ad7c272e22c0db0473a8ee2ad1e3ddda2d37f2cc208f18fcbdc5 diff --git a/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild index ee7ff513289d..deffafdf47c5 100644 --- a/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild +++ b/sci-libs/gmsh/gmsh-4.11.1-r2.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 @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..11} ) inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="Three-dimensional finite element mesh generator" -HOMEPAGE="https://gmsh.info" +HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" SRC_URI="https://gmsh.info/src/${P}-source.tgz" S="${WORKDIR}/${P}-source" @@ -42,14 +42,14 @@ RDEPEND=" ) cgns? ( sci-libs/cgnslib - sci-libs/hdf5[mpi=] + sci-libs/hdf5:=[mpi=] ) eigen? ( dev-cpp/eigen ) gmm? ( sci-mathematics/gmm ) jpeg? ( media-libs/libjpeg-turbo ) med? ( sci-libs/med[mpi=] - sci-libs/hdf5[mpi=] + sci-libs/hdf5:=[mpi=] ) metis? ( >=sci-libs/metis-5.2.0 ) mpi? ( virtual/mpi[cxx] ) diff --git a/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild b/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild index 3e5432701c03..60c811c184fd 100644 --- a/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild +++ b/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild @@ -1,14 +1,14 @@ -# 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..11} ) +PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake fortran-2 python-any-r1 toolchain-funcs +inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="Three-dimensional finite element mesh generator" -HOMEPAGE="https://gmsh.info" +HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" SRC_URI="https://gmsh.info/src/${P}-source.tgz" S="${WORKDIR}/${P}-source" @@ -42,16 +42,16 @@ RDEPEND=" ) cgns? ( sci-libs/cgnslib - sci-libs/hdf5[mpi=] + sci-libs/hdf5:=[mpi=] ) eigen? ( dev-cpp/eigen ) gmm? ( sci-mathematics/gmm ) jpeg? ( media-libs/libjpeg-turbo ) med? ( sci-libs/med[mpi=] - sci-libs/hdf5[mpi=] + sci-libs/hdf5:=[mpi=] ) - metis? ( <sci-libs/metis-5.2.0 ) + metis? ( >=sci-libs/metis-5.2.0 ) mpi? ( virtual/mpi[cxx] ) mumps? ( sci-libs/mumps[mpi=] ) opencascade? ( sci-libs/opencascade:* ) @@ -69,7 +69,10 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig:0 ) " -PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-4.9.5-opencascade.patch + "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch +) pkg_setup() { fortran-2_pkg_setup @@ -114,4 +117,21 @@ src_install() { dodoc -r examples tutorials docompress -x /usr/share/doc/${PF}/{examples,tutorials} fi + + if use X ; then + newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png + make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" + fi +} + +pkg_postinst() { + if use X ; then + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use X ; then + xdg_icon_cache_update + fi } diff --git a/sci-libs/gmsh/gmsh-4.13.1.ebuild b/sci-libs/gmsh/gmsh-4.13.1.ebuild new file mode 100644 index 000000000000..5f67d86017b6 --- /dev/null +++ b/sci-libs/gmsh/gmsh-4.13.1.ebuild @@ -0,0 +1,137 @@ +# 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 desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="Three-dimensional finite element mesh generator" +HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" +SRC_URI="https://gmsh.info/src/${P}-source.tgz" +S="${WORKDIR}/${P}-source" + +LICENSE=" + GPL-2+ free-noncomm + alglib? ( MIT ) + gmm? ( LGPL-2.1+ ) + metis? ( Apache-2.0 ) + netgen? ( LGPL-2.1+ ) + voro? ( BSD ) +" +SLOT="0" +KEYWORDS="~amd64 ~x86" +## cgns is not compiling ATM, maybe fix cgns lib first +IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" + +REQUIRED_USE=" + ^^ ( blas eigen ) + mumps? ( blas ) + slepc? ( petsc ) + " + +RDEPEND=" + virtual/fortran + X? ( x11-libs/fltk:1[xft] ) + alglib? ( sci-libs/alglib ) + blas? ( + virtual/blas + virtual/lapack + sci-libs/fftw:3.0 + ) + cgns? ( + sci-libs/cgnslib + sci-libs/hdf5:=[mpi=] + ) + eigen? ( dev-cpp/eigen ) + gmm? ( sci-mathematics/gmm ) + jpeg? ( media-libs/libjpeg-turbo ) + med? ( + sci-libs/med[mpi=] + sci-libs/hdf5:=[mpi=] + ) + metis? ( >=sci-libs/metis-5.2.0 ) + mpi? ( virtual/mpi[cxx] ) + mumps? ( sci-libs/mumps[mpi=] ) + opencascade? ( sci-libs/opencascade:* ) + pdf? ( app-text/poppler:= ) + png? ( media-libs/libpng:0 ) + petsc? ( sci-mathematics/petsc[mpi=] ) + slepc? ( sci-mathematics/slepc[mpi=] ) + voro? ( sci-libs/voro++ ) + zlib? ( sys-libs/zlib ) + " + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + python? ( dev-lang/swig:0 ) + " + +PATCHES=( + "${FILESDIR}"/${PN}-4.9.5-opencascade.patch + "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_configure() { + local mycmakeargs=( ) + + use blas && \ + mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) + + mycmakeargs+=( + -DENABLE_ALGLIB="$(usex alglib)" + -DENABLE_BLAS_LAPACK="$(usex blas)" + -DENABLE_BUILD_DYNAMIC="$(usex shared)" + -DENABLE_CGNS="$(usex cgns)" + -DENABLE_EIGEN="$(usex eigen)" + -DENABLE_FLTK="$(usex X)" + -DENABLE_GMM="$(usex gmm)" + -DENABLE_GRAPHICS="$(usex X)" + -DENABLE_MED="$(usex med)" + -DENABLE_MPI="$(usex mpi)" + -DENABLE_METIS="$(usex metis)" + -DENABLE_MUMPS="$(usex mumps)" + -DENABLE_NETGEN="$(usex netgen)" + -DENABLE_OCC="$(usex opencascade)" + -DENABLE_PETSC="$(usex petsc)" + -DENABLE_POPPLER="$(usex pdf)" + -DENABLE_SLEPC="$(usex slepc)" + -DENABLE_PRIVATE_API="$(usex shared)" + -DENABLE_SYSTEM_CONTRIB="YES" + -DENABLE_VOROPP="$(usex voro)" + -DENABLE_WRAP_PYTHON="$(usex python)") + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples ; then + dodoc -r examples tutorials + docompress -x /usr/share/doc/${PF}/{examples,tutorials} + fi + + if use X ; then + newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png + make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" + fi +} + +pkg_postinst() { + if use X ; then + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use X ; then + xdg_icon_cache_update + fi +} diff --git a/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild deleted file mode 100644 index 9f6486414bc6..000000000000 --- a/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild +++ /dev/null @@ -1,81 +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} ) - -inherit cmake fortran-2 python-any-r1 toolchain-funcs - -DESCRIPTION="Three-dimensional finite element mesh generator" -HOMEPAGE="https://gmsh.info/" -SRC_URI="https://gmsh.info/src/${P}-source.tgz" -S="${WORKDIR}/${P}-source" - -LICENSE="GPL-3 free-noncomm" -SLOT="0" -KEYWORDS="~amd64 ~x86" -## cgns is not compiling ATM, maybe fix cgns lib first -IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png python shared X zlib" - -REQUIRED_USE="med? ( mpi )" - -RDEPEND=" - virtual/fortran - X? ( x11-libs/fltk:1[xft] ) - blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) - cgns? ( sci-libs/cgnslib ) - jpeg? ( media-libs/libjpeg-turbo ) - med? ( sci-libs/med[mpi] ) - metis? ( <sci-libs/metis-5.2.0 ) - opencascade? ( sci-libs/opencascade:* ) - png? ( media-libs/libpng:0 ) - petsc? ( sci-mathematics/petsc[mpi=] ) - zlib? ( sys-libs/zlib ) - mpi? ( virtual/mpi[cxx] ) - " - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - python? ( dev-lang/swig:0 ) - " - -PATCHES=( "${FILESDIR}"/${P}-opencascade.patch ) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_configure() { - local mycmakeargs=( ) - - use blas && \ - mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) - - mycmakeargs+=( - -DENABLE_BLAS_LAPACK="$(usex blas)" - -DENABLE_BUILD_DYNAMIC="$(usex shared)" - -DENABLE_CGNS="$(usex cgns)" - -DENABLE_FLTK="$(usex X)" - -DENABLE_GRAPHICS="$(usex X)" - -DENABLE_MED="$(usex med)" - -DENABLE_MPI="$(usex mpi)" - -DENABLE_METIS="$(usex metis)" - -DENABLE_NETGEN="$(usex netgen)" - -DENABLE_OCC="$(usex opencascade)" - -DENABLE_PETSC="$(usex petsc)" - -DENABLE_PRIVATE_API="$(usex shared)" - -DENABLE_WRAP_PYTHON="$(usex python)") - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use examples ; then - dodoc -r examples tutorials - docompress -x /usr/share/doc/${PF}/{examples,tutorials} - fi -} diff --git a/sci-libs/gsl/files/gsl-2.7.1-test-tolerance.patch b/sci-libs/gsl/files/gsl-2.7.1-test-tolerance.patch new file mode 100644 index 000000000000..8ddce4388e90 --- /dev/null +++ b/sci-libs/gsl/files/gsl-2.7.1-test-tolerance.patch @@ -0,0 +1,47 @@ +From 8306771281f9b2883c5200ee241b0c0767bfe1b4 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sun, 30 Jun 2024 19:45:45 -0400 +Subject: [PATCH 1/1] eigen/test.c: loosen tolerance in eigenvalue norm tests + +One test for the (unit) norm of a random hermitian matrix's +eigenvalues is victim to tolerance issues, e.g. + + FAIL: herm random, normalized(1), unsorted (0.999999999999999112 + observed vs 1 expected) [117761] + +The tolerance used is N*GSL_DBL_EPSILON, where N is the size of the +matrix. On my machine, the actual error is four times GSL_DBL_EPSILON, +which means that the tolernace is close but not quite right. Despite +having done a PhD in numerical analysis, I am choosing to fix this +with a shotgun: + + * By a factor of 10 + * Then also by a factor of N + +That's still extremely close, and hopefully will sweep the problem +under the rug whether it's off by a constant or off by a function +of N. + +Bug: https://bugs.gentoo.org/664936 +Bug: https://git.adelielinux.org/adelie/packages/-/issues/504 +Bug: https://savannah.gnu.org/bugs/?56843 +--- + eigen/test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eigen/test.c b/eigen/test.c +index b0bdcc7..2681721 100644 +--- a/eigen/test.c ++++ b/eigen/test.c +@@ -506,7 +506,7 @@ test_eigen_herm_results (const gsl_matrix_complex * A, + { + gsl_vector_complex_const_view vi = gsl_matrix_complex_const_column(evec, i); + double nrm_v = gsl_blas_dznrm2(&vi.vector); +- gsl_test_rel (nrm_v, 1.0, N * GSL_DBL_EPSILON, "%s, normalized(%d), %s", ++ gsl_test_rel (nrm_v, 1.0, N*N * 10.0 * GSL_DBL_EPSILON, "%s, normalized(%d), %s", + desc, i, desc2); + } + +-- +2.44.2 + diff --git a/sci-libs/gsl/gsl-2.7.1-r3.ebuild b/sci-libs/gsl/gsl-2.7.1-r3.ebuild new file mode 100644 index 000000000000..81205249e873 --- /dev/null +++ b/sci-libs/gsl/gsl-2.7.1-r3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="The GNU Scientific Library" +HOMEPAGE="https://www.gnu.org/software/gsl/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7-cblas.patch.bz2" + +LICENSE="GPL-3+" +# Usually 0/${PV} but check +SLOT="0/27" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cblas-external +deprecated static-libs" + +RDEPEND="cblas-external? ( virtual/cblas:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${WORKDIR}"/${PN}-2.7-cblas.patch + "${FILESDIR}"/${PN}-2.7.1-configure-clang16.patch + "${FILESDIR}"/${PN}-2.7.1-test-tolerance.patch +) + +src_prepare() { + default + + if use deprecated; then + sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die + fi + + eautoreconf +} + +src_configure() { + filter-flags -ffast-math + + if use cblas-external; then + export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" + export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" + fi + + econf \ + --enable-shared \ + $(use_with cblas-external) \ + $(use_enable static-libs static) +} + +src_test() { + local MAKEOPTS="${MAKEOPTS} -j1" + default +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml index f5537a657e7b..acd1668f306e 100644 --- a/sci-libs/gsl/metadata.xml +++ b/sci-libs/gsl/metadata.xml @@ -25,5 +25,6 @@ </use> <upstream> <remote-id type="savannah">gsl</remote-id> + <remote-id type="cpe">cpe:/a:gnu:gnu_scientific_library</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild index f020d7942f5c..c5de6af4d23e 100644 --- a/sci-libs/gts/gts-20121130.ebuild +++ b/sci-libs/gts/gts-20121130.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="doc test" RESTRICT="test" # bug #277165 diff --git a/sci-libs/h5hut/Manifest b/sci-libs/h5hut/Manifest deleted file mode 100644 index 63e2e43f3f1f..000000000000 --- a/sci-libs/h5hut/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST H5hut-1.99.13.tar.gz 3029357 BLAKE2B 555d1f89ff60fbd72763026643ae76d5f68bb9d76bfd2fb29d846e3c777184db3be1bae98763ae683e72566e2624678118eea0da8d0bc1e57b84fd0b4777abe7 SHA512 c2590795c45ecf5e642308f5b36c4e573fdcbb6e985f5867c13fd9e1f0ddd9b48fbc423ad0165b8f047256e42a1eb54d508c9322a593bcfad3a2769547d2887a diff --git a/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch b/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch deleted file mode 100644 index 262aa61461a3..000000000000 --- a/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Naur H5hut-1.99.13.orig/src/Fortran/Makefile.am H5hut-1.99.13/src/Fortran/Makefile.am ---- H5hut-1.99.13.orig/src/Fortran/Makefile.am 2017-07-02 16:46:44.899690038 -0600 -+++ H5hut-1.99.13/src/Fortran/Makefile.am 2017-07-02 16:53:46.414587073 -0600 -@@ -49,9 +49,6 @@ - awk '/INTEGER\*8 :: /{print "\t" $$0}' $^ >$@ - awk '/PARAMETER /{print "\t" $$0}' $^ >> $@ - awk '/INTEGER\*8 FUNCTION/{print "\t" $$1 " " $$3}' $^ >>$@ -- --all-local: $(top_srcdir)/src/include/H5hutF.h -- $(INSTALL) -m644 .libs/libH5hutF.a $(top_srcdir)/src/lib - endif - - clean: clean-am -diff -Naur H5hut-1.99.13.orig/src/h5core/Makefile.am H5hut-1.99.13/src/h5core/Makefile.am ---- H5hut-1.99.13.orig/src/h5core/Makefile.am 2017-07-02 16:46:44.899690038 -0600 -+++ H5hut-1.99.13/src/h5core/Makefile.am 2017-07-02 16:58:03.017839542 -0600 -@@ -89,15 +89,10 @@ - - libH5hut_la_LDFLAGS = -version-info 2:0:0 - --all-local: -- $(INSTALL) -m0755 -d $(top_builddir)/src/lib -- $(INSTALL) -m644 .libs/libH5hut.a $(top_builddir)/src/lib -- - install-exec-local: - @$(INSTALL) -d $(DESTDIR)$(includedir)/h5core - @$(INSTALL) -m644 $(top_srcdir)/src/include/h5core/*.h $(DESTDIR)$(includedir)/h5core/ - - clean-local: -- $(RM) -f $(top_srcdir)/src/lib/libH5hut.* - $(RM) -f *~ - -diff -Naur H5hut-1.99.13.orig/test/Makefile.am H5hut-1.99.13/test/Makefile.am ---- H5hut-1.99.13.orig/test/Makefile.am 2017-07-02 16:46:44.919690283 -0600 -+++ H5hut-1.99.13/test/Makefile.am 2017-07-02 16:58:01.297818301 -0600 -@@ -1,10 +1,9 @@ - # test level Makefile.am - - AM_CPPFLAGS += -I$(top_srcdir)/src/include --AM_LDFLAGS += -L${abs_top_builddir}/src/lib - - LDADD = --LDADD += -lH5hut -+LDADD += ../src/h5core/libH5hut.la - - noinst_PROGRAMS = - -diff -Naur H5hut-1.99.13.orig/tools/Makefile.am H5hut-1.99.13/tools/Makefile.am ---- H5hut-1.99.13.orig/tools/Makefile.am 2017-07-02 16:46:44.919690283 -0600 -+++ H5hut-1.99.13/tools/Makefile.am 2017-07-02 16:59:30.228916458 -0600 -@@ -8,10 +8,9 @@ - - AM_CPPFLAGS += -I${abs_top_builddir}/src/include -Wno-deprecated - FFLAGS += -cpp $(AM_CPPFLAGS) --AM_LDFLAGS += -L${abs_top_builddir}/src/lib - - LDADD = --LDADD += -lH5hut -+LDADD += ../src/h5core/libH5hut.la - - if ENABLE_C - EXTRA_SCRIPTS = # h5hutcc -diff -Naur H5hut-1.99.13.orig/tools/vtk2h5grid/Makefile.am H5hut-1.99.13/tools/vtk2h5grid/Makefile.am ---- H5hut-1.99.13.orig/tools/vtk2h5grid/Makefile.am 2017-07-02 16:46:44.919690283 -0600 -+++ H5hut-1.99.13/tools/vtk2h5grid/Makefile.am 2017-07-02 16:58:58.978530564 -0600 -@@ -1,10 +1,9 @@ - AM_CPPFLAGS = -I${abs_top_srcdir}/src/include -Wno-deprecated - FFLAGS += -cpp $(AM_CPPFLAGS) --LDFLAGS += -L${abs_top_builddir}/src/lib - - LDADD = - --LDADD += -lH5hut -lvtkIO -lvtkFiltering -lvtkCommon -lvtksys -lpthread -ldl -+LDADD += ../src/h5core/libH5hut.la -lvtkIO -lvtkFiltering -lvtkCommon -lvtksys -lpthread -ldl - - - bin_PROGRAMS = diff --git a/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch b/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch deleted file mode 100644 index a94c8e59000f..000000000000 --- a/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur H5hut-1.99.13.orig/src/h5core/h5_hdf5_private.h H5hut-1.99.13/src/h5core/h5_hdf5_private.h ---- H5hut-1.99.13.orig/src/h5core/h5_hdf5_private.h 2017-07-02 16:46:44.899690038 -0600 -+++ H5hut-1.99.13/src/h5core/h5_hdf5_private.h 2017-07-02 16:47:16.550080867 -0600 -@@ -934,7 +934,7 @@ - HDF5_WRAPPER_ENTER (h5_err_t, - "fapl_id=%d, comm=..., use_gpfs=%d", - fapl_id, (int)use_gpfs); -- if ( H5Pset_fapl_mpiposix (fapl_id, comm, use_gpfs) < 0) -+ if ( H5Pset_fapl_mpio (fapl_id, comm, use_gpfs) < 0) - HDF5_WRAPPER_LEAVE ( - h5_error ( - H5_ERR_HDF5, diff --git a/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild deleted file mode 100644 index 8401f6468846..000000000000 --- a/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -MY_P="${P^h}" -DESCRIPTION="High-Performance I/O Library for Particle-based Simulations" -HOMEPAGE="http://www-vis.lbl.gov/Research/H5hut/" -SRC_URI="https://amas.psi.ch/H5hut/raw-attachment/wiki/DownloadSources/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# < dep on hdf5 because of bug #809221 -# Needs a proper fix. -DEPEND=" - virtual/mpi - <sci-libs/hdf5-1.12[mpi] - " -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-mpio.patch" - "${FILESDIR}/${P}-autotools.patch" - ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --enable-parallel --enable-shared --disable-static CC=mpicc CXX=mpicxx -} diff --git a/sci-libs/h5hut/metadata.xml b/sci-libs/h5hut/metadata.xml deleted file mode 100644 index c0cd18916a93..000000000000 --- a/sci-libs/h5hut/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> -</pkgmetadata> diff --git a/sci-libs/h5part/Manifest b/sci-libs/h5part/Manifest deleted file mode 100644 index 70c6be3ebff2..000000000000 --- a/sci-libs/h5part/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST H5Part-1.6.6.tar.gz 441755 BLAKE2B bc0027a91cc5f28009dc1b716fe548c670307ca19782158314d3358e66091608cf81149dece1fddf4f279aa920b06930019a26c5f34e4e3ce58df80d003ff5e6 SHA512 0842017bfe1510746e6f9451daaaaff3d9f6eee5209e241bcc8f2d0ce96450b8929f718c41a3434f53c9457adc2547628ad57ac8a0fb1cbfb7c74862aebf996d diff --git a/sci-libs/h5part/files/h5part-1.6.6-mpio.patch b/sci-libs/h5part/files/h5part-1.6.6-mpio.patch deleted file mode 100644 index 152cfec34985..000000000000 --- a/sci-libs/h5part/files/h5part-1.6.6-mpio.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/quinoacomputing/H5Part/commit/b8b106c368c3400b4df3d38e97ae2943d37d3c7d.patch - -From b8b106c368c3400b4df3d38e97ae2943d37d3c7d Mon Sep 17 00:00:00 2001 -From: Jozsef Bakosi <jbakosi@lanl.gov> -Date: Thu, 28 Jul 2016 08:37:24 -0600 -Subject: [PATCH] Replace H5Pset_fapl_mpiposix with H5Pset_fapl_mpio - -Based on the advice at -http://www.unidata.ucar.edu/mailing_lists/archives/netcdfgroup/2014/msg00188.html. ---- - src/H5Part.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/H5Part.c b/src/H5Part.c -index 433a574..8a1b893 100644 ---- a/src/H5Part.c -+++ b/src/H5Part.c -@@ -246,7 +246,7 @@ _H5Part_open_file ( - /* select the HDF5 VFD */ - if (flags & H5PART_VFD_MPIPOSIX) { - _H5Part_print_info ( "Selecting MPI-POSIX VFD" ); -- if (H5Pset_fapl_mpiposix ( f->access_prop, comm, 0 ) < 0) { -+ if (H5Pset_fapl_mpio ( f->access_prop, comm, 0 ) < 0) { - HANDLE_H5P_SET_FAPL_ERR; - goto error_cleanup; - } diff --git a/sci-libs/h5part/h5part-1.6.6.ebuild b/sci-libs/h5part/h5part-1.6.6.ebuild deleted file mode 100644 index abf619f99793..000000000000 --- a/sci-libs/h5part/h5part-1.6.6.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${P^^[hp]}" -DESCRIPTION="Portable High Performance Parallel Data Interface to HDF5" -HOMEPAGE="http://vis.lbl.gov/Research/H5Part/" -SRC_URI="https://codeforge.lbl.gov/frs/download.php/latestfile/18/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND=" - virtual/mpi - sci-libs/hdf5[mpi] - " -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-mpio.patch" ) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf --enable-parallel --enable-shared --disable-static CC=mpicc CXX=mpicxx -} diff --git a/sci-libs/h5part/metadata.xml b/sci-libs/h5part/metadata.xml deleted file mode 100644 index c0cd18916a93..000000000000 --- a/sci-libs/h5part/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> -</pkgmetadata> diff --git a/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch b/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch new file mode 100644 index 000000000000..c57481a6cb84 --- /dev/null +++ b/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch @@ -0,0 +1,30 @@ +From 5a93f7ba5bea12bd78616a2168035324054ed7b7 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 23:11:43 -0400 +Subject: [PATCH] simply do not build the mfhdf tools ncgen/ncdump + +They were removed upstream in: +https://github.com/HDFGroup/hdf4/commit/57b87b9927f0127d0d04ab7cd6c93e01bf54e3ee + +With the note that people who want them can get them from... yup, you +guessed it, netcdf. +--- + mfhdf/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mfhdf/Makefile.am b/mfhdf/Makefile.am +index d62d3af..0963923 100644 +--- a/mfhdf/Makefile.am ++++ b/mfhdf/Makefile.am +@@ -17,7 +17,7 @@ FORTRAN_DIR = + endif + + # src folder in root Makefile, build other folders now +-SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test ncdump ncgen dumper hdfimport hdiff hrepack nctest ++SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test dumper hdfimport hdiff hrepack nctest + + DIST_SUBDIRS = xdr libsrc fortran test ncdump ncgen dumper hdfimport hdiff hrepack nctest examples + +-- +2.43.2 + diff --git a/sci-libs/hdf/files/hdf4-c99.patch b/sci-libs/hdf/files/hdf4-c99.patch new file mode 100644 index 000000000000..de5f5d07847d --- /dev/null +++ b/sci-libs/hdf/files/hdf4-c99.patch @@ -0,0 +1,371 @@ +From a3d4d30fe457fc9a85fce5508119dffd3ace54c1 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 21:28:39 -0400 +Subject: [PATCH 01/11] fix tests omitting required header + +sys/time.h is not time.h. + +Purports to be fixed by https://github.com/HDFGroup/hdf4/commit/276e2c205b767d31f9d0b757f53a36aee1e1f9b2 +which however doesn't directly include time.h, as of the current +version. In later releases it does. +--- + hdf/test/buffer.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hdf/test/buffer.c b/hdf/test/buffer.c +index c7990e7..9f0f06f 100644 +--- a/hdf/test/buffer.c ++++ b/hdf/test/buffer.c +@@ -50,6 +50,7 @@ + #ifdef H4_HAVE_SYS_TIME_H + #include <sys/time.h> + #endif ++#include <time.h> + #include "tutils.h" + #include "hfile.h" + +-- +2.43.2 + + +From 02ec8e25e096241e20664acfc6596767f050ec86 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 20:41:06 -0400 +Subject: [PATCH 02/11] fix util omitting required header + +sys/wait.h is POSIX, but for some godforsaken reason upstream has +decided to only include it behind random OS identifier macros. In a +newer upstream version, they at least migrate over to including it +whenever the header exists. + +https://github.com/HDFGroup/hdf4/commit/67e11955e41471c8892acc3c8930ea538f719a03 +--- + hdf/util/he_file.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/hdf/util/he_file.c b/hdf/util/he_file.c +index 8686e2f..d6c5e7f 100644 +--- a/hdf/util/he_file.c ++++ b/hdf/util/he_file.c +@@ -17,9 +17,7 @@ + #include "he.h" + + /* get the prototype for the wait() func. */ +-#if defined SUN | defined HP9000 | defined IRIX | defined UNIX386 + #include <sys/wait.h> +-#endif /* SUN | HP9000 */ + #ifdef H4_HAVE_UNISTD_H + #include <unistd.h> + #endif +-- +2.43.2 + + +From 60223f44459e7b43a26bdccf473804f1f0fd710f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 20:46:48 -0400 +Subject: [PATCH 03/11] another POSIX function with a missing header + +For this one it is not immediately apparent to me that it's fixed +upstream at all. Will check later. +--- + mfhdf/libsrc/file.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mfhdf/libsrc/file.c b/mfhdf/libsrc/file.c +index a53301f..df73212 100644 +--- a/mfhdf/libsrc/file.c ++++ b/mfhdf/libsrc/file.c +@@ -20,6 +20,7 @@ + #include <assert.h> + #endif /* DEBUG */ + ++#include <unistd.h> + #include <string.h> + #include <errno.h> + #include "local_nc.h" +-- +2.43.2 + + +From 2b4772cf958a1af0fff6117d4f7127607d3f1a50 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 20:48:56 -0400 +Subject: [PATCH 04/11] add brand new definition of function no one bothered to + define at all + +Added upstream in https://github.com/HDFGroup/hdf4/commit/8a4137d60e2d932703fc6ee91501ad374ccba885 +--- + mfhdf/test/hdftest.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/mfhdf/test/hdftest.h b/mfhdf/test/hdftest.h +index a211c49..a946e5c 100644 +--- a/mfhdf/test/hdftest.h ++++ b/mfhdf/test/hdftest.h +@@ -52,6 +52,9 @@ + + /*************************** Utility Functions ***************************/ + ++/* Generates the correct name for the test file */ ++intn make_datafilename(char* basename, char* testfile, unsigned int size); ++ + /* Calls SDcreate, SDwritedata, and SDendaccess */ + int32 make_SDS(int32 sd_id, char* sds_name, int32 type, int32 rank, + int32* dim_sizes, int32 unlim_dim, VOIDP written_data); +@@ -65,6 +68,9 @@ int32 make_Ext3D_SDS(int32 sd_id, char* sds_name, int32 type, int32 rank, + int32* dim_sizes, VOIDP written_data, + int32 offset, char* ext_file_name); + ++/* Verifies the unlimited dimension's size and the variable's data. */ ++int verify_info_data(int32 sds_id, int32 expected_dimsize, int16 *result); ++ + /* Calls SDnametoindex and SDselect */ + int32 get_SDSbyName(int32 sd_id, char* sds_name); + +-- +2.43.2 + + +From 1be129c91ec9db6991daebddfe5124cc8180f0ea Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 20:58:13 -0400 +Subject: [PATCH 05/11] fix typoed function definition + +https://github.com/HDFGroup/hdf4/commit/490abfc71219657ecfa81cd90413b623f73603fd +--- + mfhdf/test/hdftest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mfhdf/test/hdftest.c b/mfhdf/test/hdftest.c +index da9a36b..04f8641 100644 +--- a/mfhdf/test/hdftest.c ++++ b/mfhdf/test/hdftest.c +@@ -59,7 +59,7 @@ extern int test_SDSprops(); + extern int test_coordvar(); + extern int test_chunk(); + extern int test_compression(); +-extern int test_dimension(); ++extern int test_dimensions(); + extern int test_attributes(); + extern int test_datasizes(); + extern int test_datainfo(); +-- +2.43.2 + + +From 60fcf1802bd015b01095c6a0463200f09c47f677 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 21:53:59 -0400 +Subject: [PATCH 06/11] make defines actually do anything whatsoever + +Rendered obsolete by https://github.com/HDFGroup/hdf4/commit/218c8da49eda25799577ac905209c1e972a77771 +--- + mfhdf/test/tdatainfo.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/mfhdf/test/tdatainfo.c b/mfhdf/test/tdatainfo.c +index df2539b..ab36044 100644 +--- a/mfhdf/test/tdatainfo.c ++++ b/mfhdf/test/tdatainfo.c +@@ -23,6 +23,9 @@ + * -BMR, Jul 2010 + ****************************************************************************/ + ++#ifndef DATAINFO_TESTER ++#define DATAINFO_TESTER /* to include mfdatainfo.h */ ++#endif + #include "mfhdf.h" + + #ifdef H4_HAVE_SYS_TYPES_H +@@ -44,10 +47,6 @@ + #define ssize_t int32 + #endif + +-#ifndef DATAINFO_TESTER +-#define DATAINFO_TESTER /* to include mfdatainfo.h */ +-#endif +- + #ifdef H4_HAVE_LIBSZ + #include "szlib.h" + #endif +-- +2.43.2 + + +From e967cb577fa0ba39cee7d5a128672c61adbb839e Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 22:01:14 -0400 +Subject: [PATCH 07/11] Include correct header + +https://github.com/HDFGroup/hdf4/commit/3f61fb461d2d19cc1d9da41f29e5cbb2ce0c4365 +--- + mfhdf/test/tfile.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mfhdf/test/tfile.c b/mfhdf/test/tfile.c +index a90fc02..b0ea001 100644 +--- a/mfhdf/test/tfile.c ++++ b/mfhdf/test/tfile.c +@@ -13,6 +13,7 @@ + + /* $Id: tfile.c 5218 2009-08-29 04:21:49Z bmribler $ */ + ++#include "local_nc.h" + #include "mfhdf.h" + + #ifdef HDF +-- +2.43.2 + + +From fda204abcb83516177d6c81a23261e1c641bcdcf Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 22:03:18 -0400 +Subject: [PATCH 08/11] include header needed for unlink() + +Upstream in https://github.com/HDFGroup/hdf4/commit/9055b673990b2dc3c9248f720f3e8a03f8d86434 + +It is unclear why they think it was only needed then... +--- + mfhdf/test/tsd.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/mfhdf/test/tsd.c b/mfhdf/test/tsd.c +index 397aeba..a6e9b6c 100644 +--- a/mfhdf/test/tsd.c ++++ b/mfhdf/test/tsd.c +@@ -15,6 +15,8 @@ + * tsd.c - tests SDstart for file with no write permission + ****************************************************************************/ + ++#include <unistd.h> ++ + #include "mfhdf.h" + + #ifdef HDF +-- +2.43.2 + + +From 572ef6889599b58535bd2285d98ac63c7fdf870d Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 22:49:39 -0400 +Subject: [PATCH 09/11] include the getopt() header + +Which isn't getopt.h, though upstream helpfully added one in +https://github.com/HDFGroup/hdf4/commit/9be7f29942d286873d0b4fa125be11b3f79f6916 + +They then went a bit further and stopped using getopt at all: +https://github.com/HDFGroup/hdf4/commit/0b3ad421b3ba8045d078196edd0492067f1ea576 + +Helpful rationale: +> Instead of relying on the system getopt(), HDF4 includes its own + +Intriguing. + +"Fortunately" this is a patch for an old version of hdf4. All we want to +do is get the POSIX prototype which we intend to link to. +--- + mfhdf/hdiff/hdiff_main.c | 1 + + mfhdf/ncdump/ncdump.c | 1 + + mfhdf/ncgen/main.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/mfhdf/hdiff/hdiff_main.c b/mfhdf/hdiff/hdiff_main.c +index 2fb2342..e2987be 100644 +--- a/mfhdf/hdiff/hdiff_main.c ++++ b/mfhdf/hdiff/hdiff_main.c +@@ -12,6 +12,7 @@ + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + ++#include <unistd.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff --git a/mfhdf/ncdump/ncdump.c b/mfhdf/ncdump/ncdump.c +index bdaa120..8697c0a 100644 +--- a/mfhdf/ncdump/ncdump.c ++++ b/mfhdf/ncdump/ncdump.c +@@ -4,6 +4,7 @@ + * $Id$ + *********************************************************************/ + ++#include <unistd.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff --git a/mfhdf/ncgen/main.c b/mfhdf/ncgen/main.c +index 16c0204..7f6e2c0 100644 +--- a/mfhdf/ncgen/main.c ++++ b/mfhdf/ncgen/main.c +@@ -4,6 +4,7 @@ + * $Id$ + *********************************************************************/ + ++#include <unistd.h> + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +-- +2.43.2 + + +From b569c20be9d3c65ba48bd2a81a5daa9ee8a419bc Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 22:57:19 -0400 +Subject: [PATCH 10/11] Remove never-defined macros that prevented including a + crucial header + +Also removed upstream: +https://github.com/HDFGroup/hdf4/commit/3f61fb461d2d19cc1d9da41f29e5cbb2ce0c4365 +--- + mfhdf/ncgen/close.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/mfhdf/ncgen/close.c b/mfhdf/ncgen/close.c +index 036d8f0..3dedbd7 100644 +--- a/mfhdf/ncgen/close.c ++++ b/mfhdf/ncgen/close.c +@@ -6,9 +6,7 @@ + + #include <stdio.h> + #include "ncgen.h" +-#ifdef EIP + #include "genlib.h" +-#endif + + extern void fline(), cline(); + extern int netcdf_flag; +-- +2.43.2 + + +From 9bce6a7a5ea7095f4a51d38bd7e378670c33fb06 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 7 Apr 2024 23:23:16 -0400 +Subject: [PATCH 11/11] fix blatantly missing type + +Upstream applied via: +https://github.com/HDFGroup/hdf4/commit/38e08e0d12d2ee84917111583a007fdcb5ad1aed +--- + mfhdf/hdfimport/gen_sds_floats.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mfhdf/hdfimport/gen_sds_floats.c b/mfhdf/hdfimport/gen_sds_floats.c +index 81f62c5..d08576f 100644 +--- a/mfhdf/hdfimport/gen_sds_floats.c ++++ b/mfhdf/hdfimport/gen_sds_floats.c +@@ -23,7 +23,7 @@ + #define RANK2 2 /* Number of dimensions of the SDS */ + #define RANK3 3 /* Number of dimensions of the SDS */ + +-main() ++int main() + { + /************************* Variable declaration ************************/ + +-- +2.43.2 + diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild b/sci-libs/hdf/hdf-4.2.15-r2.ebuild index c809222acf56..02fc69143873 100644 --- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild +++ b/sci-libs/hdf/hdf-4.2.15-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 FORTRAN_NEEDED=fortran @@ -34,6 +34,12 @@ PATCHES=( # May need to extend these for more arches in future. # bug #664856 "${WORKDIR}"/${PN}-4.2.15-arch-patches/ + + # backport fix for Modern C + "${FILESDIR}"/hdf4-c99.patch + + # These tools were dropped upstream. Get them from netcdf... + "${FILESDIR}"/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch ) src_prepare() { @@ -44,6 +50,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862720 + # + # Do not trust with LTO either, just because of strict-aliasing. + # But also because it does have blatant LTO errors too. + append-flags -fno-strict-aliasing + filter-lto + [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check # GCC 10 workaround # bug #723014 @@ -75,9 +89,4 @@ src_install() { else rm -r share/hdf4_examples || die fi - - mv bin/ncgen{,-hdf} || die - mv bin/ncdump{,-hdf} || die - mv share/man/man1/ncgen{,-hdf}.1 || die - mv share/man/man1/ncdump{,-hdf}.1 || die } diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest index f146f8d34066..f07fe2e1a3ad 100644 --- a/sci-libs/hdf5/Manifest +++ b/sci-libs/hdf5/Manifest @@ -2,3 +2,5 @@ DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2a DIST hdf5-1.12.2.tar.bz2 10494264 BLAKE2B 99ca5b57f6f54fa044c909f0773de62b218c1f0ec3c011f88f3c227536dd719e77ddbe42d562b1214e8843e41d8fc56db499d7f122876fdd36ef31b235229cb7 SHA512 cbb4663570de76b11adb6bf62cfdb754371d31eeab04691479a5764a45207a9c1309665ab80f51c63a4b9b87354f9cbe6835cef506a9fd554d142c6d2bec21e5 DIST hdf5-1.14.1.tar.bz2 16257319 BLAKE2B fbabbe2a61fca3f841d0206e3918390001ec1ec713696b69845eb6390595794a63740db9a7b48fd132814268e216d8fea6288cd23b04b2fa981058b557113e73 SHA512 b4dd3fca88547fdcbb2afcc22cb11bb45b7b15c3c01d9e11b7f06030ffff1a9d5c4995abb6cf27b0c4e748f1a7ca497a7f2d995ba00586f447fcd2fa537e0e16 DIST hdf5-1.14.2.tar.bz2 16070491 BLAKE2B 04acdc5352f7f0455bf6304ef07ddf51b99125bb585984bd3e27a521a784a6ad6723d64aa3b4179e4bd382334b7e68d06650404d7d4617a696d3f64917487dbc SHA512 1e1bfdff50c2e0e172d399c2d5b79b9ad0c7c72b9b30c4849aad7c5656393e8cf2af788cdf62b51fbe596023483fbc7fa23fdebf37bfe3109dae7f0783ea590f +DIST hdf5-1.14.3.tar.bz2 16320137 BLAKE2B 4c58edc04788db739c5c74d6edbfb9277011e2d6776862404fc29b30bb2c06a4314eb317393c230ebd2617a9a362ff78183d39ae80ce08f8963bdf6c02e8a865 SHA512 06d51638a56f387f6d0ef484b72e182509c15ab639315052be9821adeed6ad08551c50d7fe84d2b550b64211f68484cf3022a4660c8004cd0afd90eaa83c1bb1 +DIST hdf5-1.14.4-2.tar.gz 37033062 BLAKE2B cd75e0fec1ccea8622bb93839c4898e07093b298612cd3ba5aaa48178eba33f49e6a6492df779f0cc36ee263a107a3fa3e592caec35576d0e637b9e457da3965 SHA512 f1714b7999468d580b7cae2e575d3d7f31cea2fb81bfa4e37abd248d7223476b2351d1714197ace04eee970b451cf1f6971f5a291fd7426398737b8d7eb26924 diff --git a/sci-libs/hdf5/files/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch b/sci-libs/hdf5/files/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch new file mode 100644 index 000000000000..91ed578ccc14 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch @@ -0,0 +1,28 @@ +From 1a5293a30594afbfd3a24899e055429046a47837 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:25:43 +0000 +Subject: [PATCH 1/3] Make sure that during runtime we'll use the same + libgfortran as during linking + +Bug: https://bugs.gentoo.org/419991 +Bug: https://bugs.gentoo.org/419895 +Signed-off-by: Sam James <sam@gentoo.org> +--- + fortran/src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am +index d42a41d..2b2a316 100644 +--- a/fortran/src/Makefile.am ++++ b/fortran/src/Makefile.am +@@ -96,6 +96,7 @@ if BUILD_PARALLEL_CONDITIONAL + else + H5FC_NAME = h5fc + endif ++H5test_kind_LDFLAGS=-static-libgfortran + + # Rules for automatically detecting which fortran types are present + # and matching them to C types. This is accomplished using helper +-- +2.43.0 + diff --git a/sci-libs/hdf5/files/hdf5-1.14.2-0002-Disable-forced-stripping.patch b/sci-libs/hdf5/files/hdf5-1.14.2-0002-Disable-forced-stripping.patch new file mode 100644 index 000000000000..646950c62167 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.2-0002-Disable-forced-stripping.patch @@ -0,0 +1,31 @@ +From 260c90de63af19ff96fcf735d75d497356747788 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:26:33 +0000 +Subject: [PATCH 2/3] Disable forced stripping + +Bug: https://bugs.gentoo.org/665378 +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index baad732..8c6b6f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2183,9 +2183,9 @@ case "X-$SYMBOLS" in + AC_MSG_RESULT([yes]) + ;; + X-no) +- H5_CFLAGS="$H5_CFLAGS $NO_SYMBOLS_CFLAGS" +- H5_CXXFLAGS="$H5_CXXFLAGS $NO_SYMBOLS_CXXFLAGS" +- H5_FCFLAGS="$H5_FCFLAGS $NO_SYMBOLS_FCFLAGS" ++ H5_CFLAGS="$H5_CFLAGS" ++ H5_CXXFLAGS="$H5_CXXFLAGS" ++ H5_FCFLAGS="$H5_FCFLAGS" + AC_MSG_RESULT([no]) + ;; + *) +-- +2.43.0 + diff --git a/sci-libs/hdf5/files/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch b/sci-libs/hdf5/files/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch new file mode 100644 index 000000000000..fbe69dcadb92 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch @@ -0,0 +1,37 @@ +From 5c87a2125ca2620de633e33a52020d12b7661da8 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:27:18 +0000 +Subject: [PATCH 3/3] Drop broken -Werror stripping + +The stripping is broken and mangles -Werror=x -> -x [0]. + +[0] https://github.com/HDFGroup/hdf5/commit/41526f68f3482f2b3a7aa581288bc86e9c6dcb43#r100076265 + +Bug: https://bugs.gentoo.org/917448 +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8c6b6f4..a66830e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -189,14 +189,6 @@ saved_user_JAVAFLAGS="$JAVAFLAGS" + saved_user_LDFLAGS="$LDFLAGS" + saved_user_CPPFLAGS="$CPPFLAGS" + +-## Strip out -Werror from CFLAGS since that can cause checks to fail when +-## compiling the test program fails due to warnings +-CFLAGS="`echo $CFLAGS | sed -e 's/-Werror//g'`" +-CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-Werror//g'`" +-FCFLAGS="`echo $FCFLAGS | sed -e 's/-Werror//g'`" +-JAVACFLAGS="`echo $JAVACFLAGS | sed -e 's/-Werror//g'`" +-CPPFLAGS="`echo $CPPFLAGS | sed -e 's/-Werror//g'`" +- + ## Support F9X variable to define Fortran compiler if FC variable is + ## not used. This should be deprecated in the future. + if test "x" = "x$FC"; then +-- +2.43.0 + diff --git a/sci-libs/hdf5/files/hdf5-1.14.4-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch b/sci-libs/hdf5/files/hdf5-1.14.4-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch new file mode 100644 index 000000000000..5b3a5f85f2ce --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.4-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch @@ -0,0 +1,28 @@ +From dcfab0f9f0c41cb61a25b11cd61eac7204365693 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:25:43 +0000 +Subject: [PATCH 1/3] Make sure that during runtime we'll use the same + libgfortran as during linking + +Bug: https://bugs.gentoo.org/419991 +Bug: https://bugs.gentoo.org/419895 +Signed-off-by: Sam James <sam@gentoo.org> +--- + fortran/src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am +index 8d8396f..de03df9 100644 +--- a/fortran/src/Makefile.am ++++ b/fortran/src/Makefile.am +@@ -98,6 +98,7 @@ if BUILD_PARALLEL_CONDITIONAL + else + H5FC_NAME = h5fc + endif ++H5test_kind_LDFLAGS=-static-libgfortran + + # Rules for automatically detecting which fortran types are present + # and matching them to C types. This is accomplished using helper +-- +2.44.0 + diff --git a/sci-libs/hdf5/files/hdf5-1.14.4-0002-Disable-forced-stripping.patch b/sci-libs/hdf5/files/hdf5-1.14.4-0002-Disable-forced-stripping.patch new file mode 100644 index 000000000000..25a3088dc031 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.4-0002-Disable-forced-stripping.patch @@ -0,0 +1,31 @@ +From 9bcb00e44ce2442db9dcd173e70f8635d7e22c1d Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:26:33 +0000 +Subject: [PATCH 2/3] Disable forced stripping + +Bug: https://bugs.gentoo.org/665378 +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6a3beee..fc44a39 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2512,9 +2512,9 @@ case "X-$SYMBOLS" in + AC_MSG_RESULT([yes]) + ;; + X-no) +- H5_CFLAGS="$H5_CFLAGS $NO_SYMBOLS_CFLAGS" +- H5_CXXFLAGS="$H5_CXXFLAGS $NO_SYMBOLS_CXXFLAGS" +- H5_FCFLAGS="$H5_FCFLAGS $NO_SYMBOLS_FCFLAGS" ++ H5_CFLAGS="$H5_CFLAGS" ++ H5_CXXFLAGS="$H5_CXXFLAGS" ++ H5_FCFLAGS="$H5_FCFLAGS" + AC_MSG_RESULT([no]) + ;; + *) +-- +2.44.0 + diff --git a/sci-libs/hdf5/files/hdf5-1.14.4-0003-Drop-broken-Werror-stripping.patch b/sci-libs/hdf5/files/hdf5-1.14.4-0003-Drop-broken-Werror-stripping.patch new file mode 100644 index 000000000000..3b8a628b0384 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.14.4-0003-Drop-broken-Werror-stripping.patch @@ -0,0 +1,65 @@ +From 014f4857dc0e5883cb07393d5875412806855d28 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Dec 2023 09:27:18 +0000 +Subject: [PATCH 3/3] Drop broken -Werror stripping + +The stripping is broken and mangles -Werror=x -> -x [0]. + +[0] https://github.com/HDFGroup/hdf5/commit/41526f68f3482f2b3a7aa581288bc86e9c6dcb43#r100076265 + +Bug: https://bugs.gentoo.org/917448 +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac | 36 ------------------------------------ + 1 file changed, 36 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fc44a39..2117303 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -193,42 +193,6 @@ saved_user_JAVAFLAGS="$JAVAFLAGS" + saved_user_LDFLAGS="$LDFLAGS" + saved_user_CPPFLAGS="$CPPFLAGS" + +-## Strip out -Werror from CFLAGS since that can cause checks to fail when +-## compiling test programs fails due to warnings +-## +-## Regex: +-## +-## -Werror Literal -Werror +-## \( Start optional capturing group +-## = Literal equals sign +-## [^[:space:]] Non-space characters +-## \+ 1 or more of the above +-## \) End optional capturing group +-## \? 0 or 1 capturing group matches +-## +-## Note that the outer pair of '[]' ends up getting removed +-WERROR_SED='s/-Werror\(=[[^[:space:]]]\+\)\?//g' +-CFLAGS_SED="`echo $CFLAGS | sed -e $WERROR_SED`" +-if test $? -eq 0; then +- CFLAGS="$CFLAGS_SED" +-fi +-CXXFLAGS_SED="`echo $CXXFLAGS | sed -e $WERROR_SED`" +-if test $? -eq 0; then +- CXXFLAGS="$CXXFLAGS_SED" +-fi +-FCFLAGS_SED="`echo $FCFLAGS | sed -e $WERROR_SED`" +-if test $? -eq 0; then +- FCFLAGS="$FCFLAGS_SED" +-fi +-JAVACFLAGS_SED="`echo $JAVACFLAGS | sed -e $WERROR_SED`" +-if test $? -eq 0; then +- JAVACFLAGS="$JAVACFLAGS_SED" +-fi +-CPPFLAGS_SED="`echo $CPPFLAGS | sed -e $WERROR_SED`" +-if test $? -eq 0; then +- CPPFLAGS="$CPPFLAGS_SED" +-fi +- + ## Support F9X variable to define Fortran compiler if FC variable is + ## not used. This should be deprecated in the future. + if test "x" = "x$FC"; then +-- +2.44.0 + diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild index aa45759413ec..bd0d0095ae1a 100644 --- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild +++ b/sci-libs/hdf5/hdf5-1.10.5-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="7" @@ -30,8 +30,8 @@ RDEPEND=" zlib? ( sys-libs/zlib:0= ) " DEPEND="${RDEPEND} - sys-devel/libtool:2 - >=sys-devel/autoconf-2.69 + dev-build/libtool:2 + >=dev-build/autoconf-2.69 " S="${WORKDIR}/${MY_P}" diff --git a/sci-libs/hdf5/hdf5-1.14.2.ebuild b/sci-libs/hdf5/hdf5-1.14.2.ebuild index 3edb5153287a..874a59f5ed76 100644 --- a/sci-libs/hdf5/hdf5-1.14.2.ebuild +++ b/sci-libs/hdf5/hdf5-1.14.2.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="NCSA-HDF" SLOT="0/${PV%%_p*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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=" @@ -37,8 +37,9 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch - "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch + "${FILESDIR}"/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch + "${FILESDIR}"/hdf5-1.14.2-0002-Disable-forced-stripping.patch + "${FILESDIR}"/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch ) pkg_setup() { diff --git a/sci-libs/hdf5/hdf5-1.14.3-r1.ebuild b/sci-libs/hdf5/hdf5-1.14.3-r1.ebuild new file mode 100644 index 000000000000..a5ec57304de1 --- /dev/null +++ b/sci-libs/hdf5/hdf5-1.14.3-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +# We've reverted *back* to autotools from CMake because of +# https://github.com/HDFGroup/hdf5/issues/1814. +inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix + +MY_P=${PN}-${PV/_p/-patch} +MAJOR_P=${PN}-$(ver_cut 1-2) + +DESCRIPTION="General purpose library and file format for storing scientific data" +HOMEPAGE="https://www.hdfgroup.org/HDF5/" +SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="NCSA-HDF" +SLOT="0/${PV%%_p*}" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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=" + !unsupported? ( + cxx? ( !mpi ) mpi? ( !cxx ) + threads? ( !cxx !mpi !fortran !hl ) + ) +" + +RDEPEND=" + mpi? ( virtual/mpi[romio] ) + szip? ( virtual/szip ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch + "${FILESDIR}"/hdf5-1.14.2-0002-Disable-forced-stripping.patch + "${FILESDIR}"/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch +) + +pkg_setup() { + # Workaround for bug 285148 + tc-export CXX CC AR + + use fortran && fortran-2_pkg_setup + + if use mpi; then + if has_version 'sci-libs/hdf5[-mpi]'; then + ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." + ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." + fi + + export CC=mpicc + use fortran && export FC=mpif90 + elif has_version 'sci-libs/hdf5[mpi]'; then + ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." + ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." + fi +} + +src_prepare() { + default + + sed \ + -e '/docdir/d' \ + -i config/commence.am || die + + if ! use examples; then + # bug #409091 + sed -e '/^install:/ s/install-examples//' \ + -i Makefile.am || die + fi + + # Enable shared libs by default for h5cc config utility + sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die + hprefixify m4/libtool.m4 + + eautoreconf +} + +src_configure() { + # bug #686620 + use sparc && tc-is-gcc && append-flags -fno-tree-ccp + # bug #922800, LTO failures: + filter-lto + + local myeconfargs=( + --disable-static + --disable-doxygen-errors + --enable-deprecated-symbols + --enable-build-mode=$(usex debug debug production) + --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" + --with-examplesdir="\${datarootdir}/doc/${PF}/examples" \ + $(use_enable cxx) + $(use_enable debug codestack) + $(use_enable fortran) + $(use_enable hl) + $(use_enable mpi parallel) + $(use_enable test tests) + $(use_enable threads threadsafe) + $(use_enable unsupported) + $(use_with szip szlib) + $(use_with threads pthread) + $(use_with zlib) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install + + # No static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/hdf5/hdf5-1.14.4_p2.ebuild b/sci-libs/hdf5/hdf5-1.14.4_p2.ebuild new file mode 100644 index 000000000000..e0e67c452ed5 --- /dev/null +++ b/sci-libs/hdf5/hdf5-1.14.4_p2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +# We've reverted *back* to autotools from CMake because of +# https://github.com/HDFGroup/hdf5/issues/1814. +inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix + +MY_PV=${PV/_p/-} +MY_P=${PN}-${MY_PV} +MAJOR_P=${PN}-$(ver_cut 1-2) + +DESCRIPTION="General purpose library and file format for storing scientific data" +HOMEPAGE="https://www.hdfgroup.org/HDF5/" +SRC_URI="https://github.com/HDFGroup/hdf5/releases/download/${PN}_${MY_PV/-/.}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="NCSA-HDF" +# Upstream make SONAME changes all the time even within stable releases. +SLOT="0/${PV%%_p*}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=" + !unsupported? ( + cxx? ( !mpi ) mpi? ( !cxx ) + threads? ( !cxx !mpi !fortran !hl ) + ) +" + +RDEPEND=" + mpi? ( virtual/mpi[romio] ) + szip? ( virtual/szip ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/hdf5-1.14.4-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch + "${FILESDIR}"/hdf5-1.14.4-0002-Disable-forced-stripping.patch + "${FILESDIR}"/hdf5-1.14.4-0003-Drop-broken-Werror-stripping.patch +) + +pkg_setup() { + # Workaround for bug 285148 + tc-export CXX CC AR + + use fortran && fortran-2_pkg_setup + + if use mpi; then + if has_version 'sci-libs/hdf5[-mpi]'; then + ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." + ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." + fi + + export CC=mpicc + use fortran && export FC=mpif90 + elif has_version 'sci-libs/hdf5[mpi]'; then + ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." + ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." + fi +} + +src_prepare() { + default + + sed \ + -e '/docdir/d' \ + -i config/commence.am || die + + if ! use examples; then + # bug #409091 + sed -e '/^install:/ s/install-examples//' \ + -i Makefile.am || die + fi + + # Enable shared libs by default for h5cc config utility + sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die + hprefixify m4/libtool.m4 + + eautoreconf +} + +src_configure() { + # bug #686620 + use sparc && tc-is-gcc && append-flags -fno-tree-ccp + + local myeconfargs=( + --disable-static + --disable-doxygen-errors + --enable-deprecated-symbols + --enable-build-mode=$(usex debug debug production) + --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" + --with-examplesdir="\${datarootdir}/doc/${PF}/examples" \ + $(use_enable cxx) + $(use_enable debug codestack) + $(use_enable fortran) + $(use_enable hl) + $(use_enable mpi parallel) + $(use_enable test tests) + $(use_enable threads threadsafe) + $(use_enable unsupported) + $(use_with szip szlib) + $(use_with threads pthread) + $(use_with zlib) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install + + # No static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest index 6dcf1b1dd925..2e8dfa39138c 100644 --- a/sci-libs/hipBLAS/Manifest +++ b/sci-libs/hipBLAS/Manifest @@ -1,2 +1,4 @@ DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707 DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8 +DIST hipBLAS-5.7.1.tar.gz 669163 BLAKE2B e065f77eba0bb99d347f71920e733d30b7693f9eaf0c1f2a87a169360ccff23b8294e367eebfd6489440308b9bb1ae662c39617c5bb94275bf9b0ed60d555f85 SHA512 24c074f07865e1a3dfb0aca0b1d494e340a584ecb408813bb5b053f8282437cfd3644d730163f4faf1b93da306626ba68904141f9c3730a29749537fb7fd1a63 +DIST hipBLAS-6.1.1.tar.gz 835570 BLAKE2B dc8a54f3b6c780f63e57f208d67b15e965d3a7c98e20766ef22ecfd41e8780a6b9464e31efad8003b52562222ec7ad06801d93a502ff99f8456f415db09e5ace SHA512 390b9a9bf0238a5c72d51d034c0053ec8c6b007547b1ec9561064828c24335e099ddb0402ad76e60018ec96742d5acfbb29b9d218a613e1c6d54e4b8b05ceca7 diff --git a/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild b/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild new file mode 100644 index 000000000000..f979363cda25 --- /dev/null +++ b/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm +DESCRIPTION="ROCm BLAS marshalling library" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipBLAS" +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/hipBLAS-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here + -DBUILD_CLIENTS_TESTS=OFF + -DBUILD_CLIENTS_BENCHMARKS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild new file mode 100644 index 000000000000..439a778540e9 --- /dev/null +++ b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm +DESCRIPTION="ROCm BLAS marshalling library" +HOMEPAGE="https://github.com/ROCm/hipBLAS" +SRC_URI="https://github.com/ROCm/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/hipBLAS-rocm-${PV}" + +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here + -DBUILD_CLIENTS_TESTS=OFF + -DBUILD_CLIENTS_BENCHMARKS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + cmake_src_configure +} diff --git a/sci-libs/hipBLAS/metadata.xml b/sci-libs/hipBLAS/metadata.xml index e74d41fd607c..128eeacea7f9 100644 --- a/sci-libs/hipBLAS/metadata.xml +++ b/sci-libs/hipBLAS/metadata.xml @@ -12,4 +12,11 @@ <email>xgreenlandforwyy@gmail.com</email> <name>Yiyang Wu</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> + <upstream> + <remote-id type="github">ROCm/hipBLAS</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/hipBLASLt/Manifest b/sci-libs/hipBLASLt/Manifest new file mode 100644 index 000000000000..83717bb68f79 --- /dev/null +++ b/sci-libs/hipBLASLt/Manifest @@ -0,0 +1 @@ +DIST hipBLASLt-6.1.1.tar.gz 78448557 BLAKE2B 08ac9ce45d7d1e4384a36939af22f65589ed87e25b4db77f5f7ff5fbe65b8070e9c55fbb09db3b7bd49be98981dc8bf939e646ea27571bf1d1ccfa52a50b0f92 SHA512 1aa3a1cb8e9c7f653db66909b38be065b7386b97d4bd6b52ecc6c2bf72c6cdfabde6f12ebc6016b5fa195f979359af875eda8d54ea6772329312cb357bc2ebc5 diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch new file mode 100644 index 000000000000..5d082cc704b6 --- /dev/null +++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch @@ -0,0 +1,11 @@ +Clang 19 is so smart, it can analyze templates before instantiation +--- a/tensilelite/Tensile/Source/lib/include/Tensile/MasterSolutionLibrary.hpp ++++ b/tensilelite/Tensile/Source/lib/include/Tensile/MasterSolutionLibrary.hpp +@@ -36,6 +36,7 @@ + + namespace Tensile + { ++ enum class LazyLoadingInit; + + /** + * \ingroup SolutionLibrary diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch new file mode 100644 index 000000000000..ef0b8395c527 --- /dev/null +++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch @@ -0,0 +1,29 @@ +Gentoo uses "msgpack-cxx" as library name and adds important +MSGPACK_NO_BOOST compile definition when msgpack-cxx us installed with USE=-boost +--- a/tensilelite/Tensile/Source/lib/CMakeLists.txt ++++ b/tensilelite/Tensile/Source/lib/CMakeLists.txt +@@ -102,22 +102,9 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK) + endif() + + if(TENSILE_USE_MSGPACK) +- find_package(msgpack REQUIRED) ++ find_package(msgpack-cxx REQUIRED) + target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1) +- +- if(TARGET msgpackc-cxx) +- get_target_property(msgpack_inc msgpackc-cxx INTERFACE_INCLUDE_DIRECTORIES) +- elseif(TARGET msgpackc) +- get_target_property(msgpack_inc msgpackc INTERFACE_INCLUDE_DIRECTORIES) +- endif() +- +- if(DEFINED msgpack_inc) +- # include C++ headers manually +- # External header includes included as system files +- target_include_directories(TensileHost +- SYSTEM PRIVATE $<BUILD_INTERFACE:${msgpack_inc}> +- ) +- endif() ++ target_link_libraries(TensileHost PRIVATE msgpack-cxx) + endif() + + if(TENSILE_USE_LLVM) diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch new file mode 100644 index 000000000000..17c5d9c534c0 --- /dev/null +++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch @@ -0,0 +1,24 @@ +--- a/tensilelite/Tensile/Ops/gen_assembly.sh ++++ b/tensilelite/Tensile/Ops/gen_assembly.sh +@@ -32,7 +32,7 @@ if ! [ -z ${ROCM_PATH+x} ]; then + rocm_path=${ROCM_PATH} + fi + +-toolchain=${rocm_path}/llvm/bin/clang++ ++toolchain=@LLVM_PATH@/bin/clang++ + + . ${venv}/bin/activate + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,10 +97,6 @@ endif() + # hipBLASLt project + project(hipblaslt LANGUAGES CXX) + +-# Force library install path to lib (CentOS 7 defaults to lib64) +-set(CMAKE_INSTALL_LIBDIR "lib" CACHE INTERNAL "Installation directory for libraries" FORCE) +- +- + # Build options + option(BUILD_SHARED_LIBS "Build hipBLASLt as a shared library" ON) + option(BUILD_CLIENTS_TESTS "Build tests (requires googletest)" OFF) diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch new file mode 100644 index 000000000000..6bd608c94d0e --- /dev/null +++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch @@ -0,0 +1,56 @@ +Add ability to build without specitying any arch. +This produces dummy library, which can be linked to other project (like caffe2 in pytorch). + +Related upstream bug: https://github.com/ROCm/hipBLASLt/issues/535 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -220,6 +220,10 @@ else() + else() + find_package(Tensile 4.33.0 EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}") + endif() ++ else() # link to Tensile (required), but don't generate libraries ++ cmake_policy(SET CMP0074 NEW) ++ set(Tensile_ROOT "${CMAKE_SOURCE_DIR}/tensilelite/Tensile") ++ find_package(Tensile REQUIRED HIP LLVM OpenMP) + endif() + + # setup hipblaslt defines used for both the library and clients +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -75,7 +75,7 @@ add_library(roc::hipblaslt ALIAS hipblaslt) + + # Target compile definitions + if(NOT BUILD_CUDA) +-if( BUILD_WITH_TENSILE ) ++if( TRUE ) # link with Tensile is always reqiured + + if( BUILD_SHARED_LIBS ) + target_link_libraries( hipblaslt PRIVATE TensileHost ) +@@ -194,7 +194,7 @@ rocm_install_targets(TARGETS hipblaslt + ${CMAKE_BINARY_DIR}/include + ) + +-if ( NOT BUILD_CUDA ) ++if ( NOT BUILD_CUDA AND BUILD_WITH_TENSILE ) + if (WIN32) + set( HIPBLASLT_TENSILE_LIBRARY_DIR "\${CPACK_PACKAGING_INSTALL_PREFIX}hipblaslt/bin" CACHE PATH "path to tensile library" ) + else() +--- a/library/src/amd_detail/rocblaslt/src/CMakeLists.txt ++++ b/library/src/amd_detail/rocblaslt/src/CMakeLists.txt +@@ -100,7 +100,16 @@ if( BUILD_WITH_TENSILE ) + set( Tensile_INC + ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/Tensile + ) ++else() ++ set_target_properties( TensileHost PROPERTIES POSITION_INDEPENDENT_CODE ON ) + ++ set( Tensile_SRC ++ src/amd_detail/rocblaslt/src/tensile_host.cpp ++ ) ++ ++ set( Tensile_INC ++ ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/Tensile ++ ) + endif( ) # BUILD_WITH_TENSILE + + set(DL_LIB dl)
\ No newline at end of file diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch new file mode 100644 index 000000000000..55c26680673f --- /dev/null +++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch @@ -0,0 +1,13 @@ +Git is not used +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -23,9 +23,6 @@ + + # Dependencies + +-# Git +-find_package(Git REQUIRED) +- + # Workaround until hcc & hip cmake modules fixes symlink logic in their config files. + # (Thanks to rocBLAS devs for finding workaround for this problem!) + list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm) diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild new file mode 100644 index 000000000000..cf2ad2ac5382 --- /dev/null +++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_SKIP_GLOBALS=1 +PYTHON_COMPAT=( python3_{10..13} ) + +# gfx941 and gfx942 assembly uses directives of LLVM >= 18.1.0 +LLVM_COMPAT=( 18 ) + +inherit cmake python-any-r1 llvm-r1 prefix rocm +DESCRIPTION="General matrix-matrix operations library for AMD Instinct accelerators" +HOMEPAGE="https://github.com/ROCm/hipBLASLt" +SRC_URI="https://github.com/ROCm/hipBLASLt/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/hipBLASLt-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +SUPPORTED_GPUS=( gfx90a gfx940 gfx941 gfx942 ) +IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" ) +IUSE="${IUSE_TARGETS[@]/#/+} test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/hip + dev-cpp/msgpack-cxx + sci-libs/hipBLAS:${SLOT} +" + +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/rocm-cmake + $(python_gen_any_dep ' + dev-python/msgpack[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/joblib[${PYTHON_USEDEP}] + ') + $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') + test? ( + dev-cpp/gtest + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch + "${FILESDIR}"/${PN}-6.1.1-no-arch.patch + "${FILESDIR}"/${PN}-6.1.1-no-git.patch + "${FILESDIR}"/${PN}-6.1.1-clang-19.patch +) + +python_check_deps() { + python_has_version "dev-python/msgpack[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" && + python_has_version "dev-python/joblib[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +pkg_pretend() { + if [[ "${AMDGPU_TARGETS[@]}" = "" ]]; then + ewarn "hipBLASLt supports only few GPUs: ${SUPPORTED_GPUS[@]}," + ewarn "but none of them were defined in AMDGPU_TARGETS USE_EXPAND variable." + ewarn + ewarn "Library will continue to be built in \"dummy\" mode," + ewarn "serving as a non-functional placeholder for end-user applications." + fi +} + +src_prepare() { + sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \ + "${FILESDIR}"/${PN}-6.1.1-gentoopath.patch > "${S}"/gentoopath.patch || die + eapply $(prefixify_ro "${S}"/gentoopath.patch) + + local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die)) + python_fix_shebang -q ${shebangs[*]} + + cmake_src_prepare +} + +src_configure() { + local targets="$(get_amdgpu_flags)" + local build_with_tensile=$([ "${AMDGPU_TARGETS[@]}" = "" ] && echo OFF || echo ON ) + + local mycmakeargs=( + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_WITH_TENSILE="${build_with_tensile}" + -DAMDGPU_TARGETS="${targets}" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + ) + + use test && mycmakeargs+=( -DBUILD_FORTRAN_CLIENTS=ON ) + + CXX=hipcc cmake_src_configure +} + +src_compile() { + local -x ROCM_PATH="${EPREFIX}/usr" + # set PYTHONPATH to load Tensile from virtualenv, not the system-wide one + local -x PYTHONPATH="${S}_build/virtualenv/lib/${EPYTHON}/site-packages" + local -x TENSILE_ROCM_ASSEMBLER_PATH="$(get_llvm_prefix)/bin/clang++" + cmake_src_compile +} + +src_install() { + cmake_src_install + + # Stop llvm-strip from removing .strtab section from *.hsaco files, + # otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes + dostrip -x /usr/$(get_libdir)/hipblaslt/library/ +} + +src_test() { + check_amdgpu + cmake_src_test -j1 +} diff --git a/sci-libs/hipBLASLt/metadata.xml b/sci-libs/hipBLASLt/metadata.xml new file mode 100644 index 000000000000..da84ad53885c --- /dev/null +++ b/sci-libs/hipBLASLt/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> + <upstream> + <remote-id type="github">ROCm/hipBLASLt</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest index bca0363ed4ca..834a95c038cf 100644 --- a/sci-libs/hipCUB/Manifest +++ b/sci-libs/hipCUB/Manifest @@ -1 +1,3 @@ DIST hipCUB-5.1.3.tar.gz 278021 BLAKE2B f30e567370fea80ef63a455c2c27b3f4ff241e7e405688fa4dc33d1e0ce3dffb016a1a1523b20613a7963bff061758eac0c0d110243a9a6cedbc100bb087d7d4 SHA512 dd3ca341b78cf6985ba723feeeb560c0503ab283b63067e9a5e68d12ad42f752a7f56fd60f0f0c26c2853538853e09a102cfc6006c18c31c3162fa7b536ffb9f +DIST hipCUB-5.7.1.tar.gz 322980 BLAKE2B a9b2a69b47661532858f18e7296ef37be41da814bb4886f7b8b444829e6ad1374d1c3117b57e7599095253ed56ea2403c895bb820dbde9cec77c28a041af3898 SHA512 7cf7dc819a3d8bac2cf70aa077616e65d785d76bae3ad3991db7b940a061f694ac82b1e4219aa16476351f1329e3f0d09a818b0ff0b9c5ad261937879c21dca8 +DIST hipCUB-6.1.1.tar.gz 343181 BLAKE2B 3943278597c5e9d41c225ad86c3cdcc113f35cf1bf218ba357a112c25ae14df8d0e3f385aacd82ab4c694ae2382012aea06c02d40d982d00929d03d0d3908b55 SHA512 37297f6791146cc9db11d3d494555672c021dea06bec1e8a780ca926df1e5de140c8ee560657668df6221279a0418af9e34a235b3b52df3df2a66adabea7ca6f diff --git a/sci-libs/hipCUB/hipCUB-5.7.1-r1.ebuild b/sci-libs/hipCUB/hipCUB-5.7.1-r1.ebuild new file mode 100644 index 000000000000..8ff00b145b09 --- /dev/null +++ b/sci-libs/hipCUB/hipCUB-5.7.1-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipCUB" +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/hip + sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/hipCUB-rocm-${PV}" + +src_prepare() { + sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" \ + -i cmake/ROCMExportTargetsHeaderOnly.cmake || die + + cmake_src_prepare +} + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + # uses HMM to fit tests to default <512M iGPU VRAM + MAKEOPTS="-j1" HIPCUB_USE_HMM="1" cmake_src_test +} diff --git a/sci-libs/hipCUB/hipCUB-6.1.1.ebuild b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild new file mode 100644 index 000000000000..8a38588c8d4c --- /dev/null +++ b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives" +HOMEPAGE="https://github.com/ROCm/hipCUB" +SRC_URI="https://github.com/ROCm/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz" +S="${WORKDIR}/hipCUB-rocm-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE=" + benchmark? ( ${ROCM_REQUIRED_USE} ) + test? ( ${ROCM_REQUIRED_USE} ) +" +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/hip + sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" \ + -i cmake/ROCMExportTargetsHeaderOnly.cmake || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + # uses HMM to fit tests to default <512M iGPU VRAM + HIPCUB_USE_HMM="1" cmake_src_test -j1 +} diff --git a/sci-libs/hipCUB/metadata.xml b/sci-libs/hipCUB/metadata.xml index 5e18b914d070..64944bcdc745 100644 --- a/sci-libs/hipCUB/metadata.xml +++ b/sci-libs/hipCUB/metadata.xml @@ -12,8 +12,12 @@ <email>gentoo@holzke.net</email> <name>Wilfried Holzke</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">ROCm-Developer-Tools/hipCUB</remote-id> + <remote-id type="github">ROCm/hipCUB</remote-id> </upstream> <use> <flag name="benchmark">Build and install benchmark binaries.</flag> diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest index 7ef5713343b5..ace4000e72e3 100644 --- a/sci-libs/hipFFT/Manifest +++ b/sci-libs/hipFFT/Manifest @@ -1 +1,3 @@ DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706 +DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B ee8d6dcb7924c8989987b02533126c4e4419d8dc83067a816f2253efe4537e094f1665d95699d4bf27f30cd13f3fc5df7d3b0062c267ecbdcbb3aad961fab6f6 SHA512 4bfd812fa1e949574b4170833755a435f47e893f0615b65d8d273af6e8f89ea4d28632a208de20321e834c8bc237b11816e2af0363b60adca9af736b9bc87465 +DIST hipFFT-rocm-6.1.1.tar.gz 170796 BLAKE2B 8c957db8e7e2548918539c94262d912c2f33b70d8482b727c78c13323bdb6822c3e95439854b8ab4fed970d21ed0c6fd2ab8c2805db59d3a3606d73e7eb47468 SHA512 531be32b12ed5f0f2352e3e0a893ca988a4c8492e66fc9347b6754ae4e769549d6f638a760de35cb15ef2d301ab4200a76c832d769ecb0cd55e9e42f839a1876 diff --git a/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch b/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch new file mode 100644 index 000000000000..71d75417c0d3 --- /dev/null +++ b/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch @@ -0,0 +1,40 @@ +From c2b06a3b49257b3f89cf203895cf370e64e47b27 Mon Sep 17 00:00:00 2001 +From: trixirt <trix@redhat.com> +Date: Mon, 31 Jul 2023 09:50:19 -0700 +Subject: [PATCH] Simplify finding the hip package + +On Fedora, where hip is installed as an rpm, its cmake files can +not be found and are reported as an error. + +CMake Error at cmake/dependencies.cmake:44 (find_package): + No "FindHIP.cmake" found in CMAKE_MODULE_PATH. + +This change treats hip as a normal package. + +Signed-off-by: Tom Rix <trix@redhat.com> +--- + cmake/dependencies.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index 262478d..5810e37 100644 +--- a/cmake/dependencies.cmake ++++ b/cmake/dependencies.cmake +@@ -30,7 +30,7 @@ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( WIN32 ) + find_package( HIP CONFIG REQUIRED ) + else() +- find_package( HIP MODULE REQUIRED ) ++ find_package( HIP REQUIRED ) + endif() + list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" ) + endif() +@@ -41,7 +41,7 @@ else() + if( WIN32 ) + find_package( HIP CONFIG REQUIRED ) + else() +- find_package( HIP MODULE REQUIRED ) ++ find_package( HIP REQUIRED ) + endif() + endif() + endif() diff --git a/sci-libs/hipFFT/hipFFT-5.7.1-r1.ebuild b/sci-libs/hipFFT/hipFFT-5.7.1-r1.ebuild new file mode 100644 index 000000000000..aefdf2660b42 --- /dev/null +++ b/sci-libs/hipFFT/hipFFT-5.7.1-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic hip FFT implementation" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipFFT" +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/hipFFT-rocm-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch" + "${FILESDIR}/${PN}-4.3.0-add-complex-header.patch" + "${FILESDIR}/${PN}-5.7.1_hip-config.patch" +) + +src_configure() { + local mycmakeargs=( + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_TESTS=OFF + -DBUILD_CLIENTS_RIDER=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipFFT/hipFFT-6.1.1.ebuild b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild new file mode 100644 index 000000000000..d9700529cd24 --- /dev/null +++ b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic hip FFT implementation" +HOMEPAGE="https://github.com/ROCm/hipFFT" +SRC_URI="https://github.com/ROCm/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +S="${WORKDIR}/hipFFT-rocm-${PV}" + +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_TESTS=OFF + -DBUILD_CLIENTS_RIDER=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + cmake_src_configure +} diff --git a/sci-libs/hipFFT/metadata.xml b/sci-libs/hipFFT/metadata.xml index 54e78eb20141..1e3fd1c52d20 100644 --- a/sci-libs/hipFFT/metadata.xml +++ b/sci-libs/hipFFT/metadata.xml @@ -13,7 +13,11 @@ <email>xgreenlandforwyy@gmail.com</email> <name>Yiyang Wu</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/hipFFT</remote-id> + <remote-id type="github">ROCm/hipFFT</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest index bdb2c56b0452..0459d75805d5 100644 --- a/sci-libs/hipRAND/Manifest +++ b/sci-libs/hipRAND/Manifest @@ -1 +1,3 @@ -DIST hipFFT-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2 +DIST hipRAND-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2 +DIST hipRAND-rocm-5.7.1.tar.gz 478352 BLAKE2B 5f435cf53d213b1d95ee8b766df2c9bc4b4d590ccf63fe867bd033eeb4b7fef67e2bde22242525686a8dee59fd811363857312481e9cb3575357c612ab519a41 SHA512 b3c51728c1d7cc37760f49f36ab7765c166f105bc5b1b6ce65ac4a1de9bb70f8e2c10f5c41f89040288b09c9257d913d745a416bd4785b71f170a4f57e1f95e2 +DIST hipRAND-rocm-6.1.1.tar.gz 119063 BLAKE2B dc314d8b09c15351075594335d14f65024be54597e7cbdfb7671ebea29fa208c9a33530a2d406a8a2a9d8738f0aae7e9fc25d8c39304ef2ef27aaf8b327b5975 SHA512 4c350c8a75e6b4064e22cd73679f66e5caf28f7922fc47ef9670c1023b58b36bf3a2a35580463ee7c89e26ed924aaaa68166a11f64823b99f2f8302f80d6e87a diff --git a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild index d0bd5ace71e4..1674ad72718f 100644 --- a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild +++ b/sci-libs/hipRAND/hipRAND-5.6.0-r1.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 @@ inherit cmake rocm DESCRIPTION="CU / ROCM agnostic hip RAND implementation" HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipRAND" -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz" REQUIRED_USE="${ROCM_REQUIRED_USE}" LICENSE="MIT" @@ -21,7 +21,6 @@ RESTRICT="test" RDEPEND="dev-util/hip sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]" DEPEND="${RDEPEND}" -BDEPEND="" S="${WORKDIR}/hipRAND-rocm-${PV}" diff --git a/sci-libs/hipRAND/hipRAND-5.7.1.ebuild b/sci-libs/hipRAND/hipRAND-5.7.1.ebuild new file mode 100644 index 000000000000..1674ad72718f --- /dev/null +++ b/sci-libs/hipRAND/hipRAND-5.7.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic hip RAND implementation" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipRAND" +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/hipRAND-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipRAND/hipRAND-6.1.1.ebuild b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild new file mode 100644 index 000000000000..2a123df19544 --- /dev/null +++ b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic hip RAND implementation" +HOMEPAGE="https://github.com/ROCm/hipRAND" +SRC_URI="https://github.com/ROCm/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz" +S="${WORKDIR}/hipRAND-rocm-${PV}" + +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipRAND/metadata.xml b/sci-libs/hipRAND/metadata.xml index 27c8916b67d4..c47caac8ebdf 100644 --- a/sci-libs/hipRAND/metadata.xml +++ b/sci-libs/hipRAND/metadata.xml @@ -9,7 +9,11 @@ <email>xgreenlandforwyy@gmail.com</email> <name>Yiyang Wu</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/hipRAND</remote-id> + <remote-id type="github">ROCm/hipRAND</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/hipSOLVER/Manifest b/sci-libs/hipSOLVER/Manifest new file mode 100644 index 000000000000..bb01207f1e20 --- /dev/null +++ b/sci-libs/hipSOLVER/Manifest @@ -0,0 +1,2 @@ +DIST hipSOLVER-rocm-5.7.1.tar.gz 1516012 BLAKE2B 8d0966d34877978784b9872150283719602465c85036c3a74a72a2fe7c516b6029af3f4aefbc022088b2cf37bb1e0a450c0221aef0ac3227018020de340adfcd SHA512 f9c14b51ea582f17d1b323c7d066d9c0c95f4250f08515768d7a11067774fd2841fa3dec7354d3c98e56bd8dd53cff3b993c68b1d7df4b24f562b3afe9c4625e +DIST hipSOLVER-rocm-6.1.1.tar.gz 2553462 BLAKE2B 77731b876a7fe5f80f79e5af5128a84d8a5d4dee6d511f3e1cf4964845b636380f7f1e19f07e84ed24b98e99c3bdfbba623b97b48cf4ea1bc09a4c1bd3dccaed SHA512 4f28ecd807717013318f293df8c48d7674f64fd3a538c2b827f4188a00a36165f48277d5ac50e806461d52a8a3b6d626cab91ff7c6687b17fea2580461e08de9 diff --git a/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch b/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch new file mode 100644 index 000000000000..da43f4ff116b --- /dev/null +++ b/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch @@ -0,0 +1,29 @@ +cholmod.h is in /usr/include in Gentoo, use pkg-config to find it +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -221,11 +221,9 @@ if( NOT USE_CUDA ) + if( BUILD_WITH_SPARSE ) + list(APPEND hipsolver_pkgdeps "rocsparse >= 2.3.0") + +- if( SYSTEM_OS STREQUAL "centos" OR SYSTEM_OS STREQUAL "rhel" ) +- list(APPEND hipsolver_pkgdeps "suitesparse") +- else() +- list(APPEND hipsolver_pkgdeps "libcholmod3" "libsuitesparseconfig5") +- endif() ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(CHOLMOD REQUIRED IMPORTED_TARGET cholmod) ++ target_link_libraries(hipsolver-common INTERFACE PkgConfig::CHOLMOD) + endif( ) + + rocm_package_add_dependencies(DEPENDS ${hipsolver_pkgdeps}) +--- a/library/src/amd_detail/hipsolver_sparse.cpp ++++ b/library/src/amd_detail/hipsolver_sparse.cpp +@@ -45,7 +45,7 @@ + + #ifdef HAVE_ROCSPARSE + #include <rocsparse/rocsparse.h> +-#include <suitesparse/cholmod.h> ++#include <cholmod.h> + #endif + + #undef TRUE diff --git a/sci-libs/hipSOLVER/hipSOLVER-5.7.1.ebuild b/sci-libs/hipSOLVER/hipSOLVER-5.7.1.ebuild new file mode 100644 index 000000000000..fc195db69e10 --- /dev/null +++ b/sci-libs/hipSOLVER/hipSOLVER-5.7.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic marshalling library for LAPACK routines on the GPU" +HOMEPAGE="https://github.com/ROCm/hipSOLVER" +SRC_URI="https://github.com/ROCm/hipSOLVER/archive/refs/tags/rocm-${PV}.tar.gz -> hipSOLVER-rocm-${PV}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/hipSOLVER-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild new file mode 100644 index 000000000000..be450babaed3 --- /dev/null +++ b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic marshalling library for LAPACK routines on the GPU" +HOMEPAGE="https://github.com/ROCm/hipSOLVER" +SRC_URI="https://github.com/ROCm/hipSOLVER/archive/refs/tags/rocm-${PV}.tar.gz -> hipSOLVER-rocm-${PV}.tar.gz" +S="${WORKDIR}/hipSOLVER-rocm-${PV}" + +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="sparse" + +RESTRICT="test" + +RDEPEND=" + dev-util/hip + sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}] + sparse? ( + sci-libs/suitesparseconfig + sci-libs/cholmod + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-find-cholmod.patch +) + +src_configure() { + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_WITH_SPARSE=$(usex sparse ON OFF) + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipSOLVER/metadata.xml b/sci-libs/hipSOLVER/metadata.xml new file mode 100644 index 000000000000..9aa1438b519c --- /dev/null +++ b/sci-libs/hipSOLVER/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>xgreenlandforwyy@gmail.com</email> + <name>Yiyang Wu</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> + <upstream> + <remote-id type="github">ROCmSoftwarePlatform/hipSOLVER</remote-id> + </upstream> + <use> + <flag name="sparse">Build hipSOLVER with sparse functionality (sci-libs/cholmod)</flag> + </use> +</pkgmetadata> diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest index 6f6118e92831..c38dc6c9f99c 100644 --- a/sci-libs/hipSPARSE/Manifest +++ b/sci-libs/hipSPARSE/Manifest @@ -1,4 +1,6 @@ DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64 +DIST hipSPARSE-5.7.tar.gz 458521 BLAKE2B 94695ef3cf4294f571723e31ab5d4295b5aaa24528e90838375ee8477cf0957b297663d80e5fe3406762b475b6ef4741f9ccfb4dfb1448ce71ea4014da14b46e SHA512 bb28cd81b7ec298eb2e6462a8588ed93eee7b4892923b11087a91d1c32341f29f488fd4e6797debe51a989f463db31030eae02d07be6512d6b755367ba221aac +DIST hipSPARSE-6.1.tar.gz 471148 BLAKE2B 18119ac355e180adb5ce38561f44e39119226d209a970ae8cac6b85575bad1ab2a690a3bb72de1c179c1190aa2c29d691e6ce02855f3df89a58f634d42e54103 SHA512 09f9e94c5f976e6f17c07f9be2fde31c2e740871215a6b77b49675644b883bd9994fcaacb19864ace3883bb5aea7a7dc589ddbaf9b6aaf3d9f411c7e452a0b78 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0 DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild index 21030abf26a0..d0d519b18ce6 100644 --- a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild +++ b/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.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 @@ -45,8 +45,8 @@ RDEPEND="dev-util/rocminfo dev-util/hip sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]" DEPEND="${RDEPEND}" -BDEPEND="dev-util/rocm-cmake - >=dev-util/cmake-3.22 +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22 test? ( dev-cpp/gtest )" S="${WORKDIR}/hipSPARSE-rocm-${PV}" diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild new file mode 100644 index 000000000000..b3aa027c2624 --- /dev/null +++ b/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake edo rocm toolchain-funcs + +DESCRIPTION="ROCm SPARSE marshalling library" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE" +# share some test datasets with rocSPARSE +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz +test? ( +https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz +https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz +https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz +https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz +https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz +https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz +https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz +https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz +https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz +https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz +https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz +https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz +https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz +https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz +https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz +https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz +https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz +https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz +https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz +)" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0"/$(ver_cut 1-2) +IUSE="test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/rocminfo + dev-util/hip + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22 + test? ( dev-cpp/gtest )" + +S="${WORKDIR}/hipSPARSE-rocm-${PV}" + +src_prepare() { + sed -e "s/PREFIX hipsparse//" \ + -e "/<INSTALL_INTERFACE/s,include,include/hipsparse," \ + -e "s:rocm_install_symlink_subdir(hipsparse):#rocm_install_symlink_subdir(hipsparse):" \ + -i library/CMakeLists.txt || die + + cmake_src_prepare + + # remove GIT dependency + sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die + + # Fix install path + sed -i -e "s.set(CMAKE_INSTALL_LIBDIR.#set(CMAKE_INSTALL_LIBDIR." CMakeLists.txt || die + + if use test; then + mkdir -p "${BUILD_DIR}"/clients/matrices + # compile and use the mtx2bin converter. Do not use any optimization flags! + edo $(tc-getCXX) deps/convert.cpp -o deps/convert + find "${WORKDIR}" -maxdepth 2 -regextype grep -E -regex ".*/(.*)/\1\.mtx" -print0 | + while IFS= read -r -d '' mtxfile; do + destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin + ebegin "Converting ${mtxfile} to ${destination}" + deps/convert ${mtxfile} ${destination} + eend $? + done + fi +} + +src_configure() { + local mycmakeargs=( + -DHIP_RUNTIME="ROCclr" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_SAMPLES=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + edob ./${PN,,}-test +} diff --git a/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild new file mode 100644 index 000000000000..46d70c4b6625 --- /dev/null +++ b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake edo rocm toolchain-funcs + +DESCRIPTION="ROCm SPARSE marshalling library" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE" +# share some test datasets with rocSPARSE +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz +test? ( +https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz +https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz +https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz +https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz +https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz +https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz +https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz +https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz +https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz +https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz +https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz +https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz +https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz +https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz +https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz +https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz +https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz +https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz +https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz +)" +S="${WORKDIR}/hipSPARSE-rocm-${PV}" + +LICENSE="MIT" +SLOT="0"/$(ver_cut 1-2) +KEYWORDS="~amd64" +IUSE="test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/rocminfo + dev-util/hip + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22 + test? ( dev-cpp/gtest )" + +src_prepare() { + cmake_src_prepare + + if use test; then + mkdir -p "${BUILD_DIR}"/clients/matrices + # compile and use the mtx2bin converter. Do not use any optimization flags! + edo $(tc-getCXX) deps/convert.cpp -o deps/convert + find "${WORKDIR}" -maxdepth 2 -regextype grep -E -regex ".*/(.*)/\1\.mtx" -print0 | + while IFS= read -r -d '' mtxfile; do + destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin + ebegin "Converting ${mtxfile} to ${destination}" + deps/convert ${mtxfile} ${destination} + eend $? + done + fi +} + +src_configure() { + local mycmakeargs=( + -DHIP_RUNTIME="ROCclr" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_SAMPLES=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + edob ./${PN,,}-test +} diff --git a/sci-libs/hipSPARSE/metadata.xml b/sci-libs/hipSPARSE/metadata.xml index 693bc03ef766..db85e1426e8f 100644 --- a/sci-libs/hipSPARSE/metadata.xml +++ b/sci-libs/hipSPARSE/metadata.xml @@ -13,6 +13,10 @@ <email>gentoo@holzke.net</email> <name>Wilfried Holzke</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> <remote-id type="github">ROCmSoftwarePlatform/hipSPARSE</remote-id> </upstream> diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest index 38e157095820..0110e7bb188d 100644 --- a/sci-libs/htslib/Manifest +++ b/sci-libs/htslib/Manifest @@ -1 +1,2 @@ -DIST htslib-1.17.tar.bz2 4619884 BLAKE2B c45591b3f1da4f6ddfdf5e1a20864583d57de2a460d42049715335fce7dafe1f5cd14403e6033fee4f9d0bfc75f8777b5835d2d01bf2cadff0155d9fc92b97d9 SHA512 624ab449d57713dab2d34399926c065f8cff8a45e6fbe68e0bb518c601421f587b613caeb095f8639b1d67cdb4a65d658c85f942173bcaa48da026fe15def5d3 +DIST htslib-1.19.1.tar.bz2 4775086 BLAKE2B 3af6770ade9505a3c71f6d522c0971eb77ea2549670043a539a2a4681e583554dc154b9b9fb33f1faa94be336a09945a28c57aa4bcfe0f39b03dd7585c49269a SHA512 a40de47ecae68756c158c1c7b578fa2a5c13bf6f98626e863af31a20d7880ffd415d966280c00bfe726f496d913eb0fcf014dd4beb8c1dbe36ed9735a48bd01e +DIST htslib-1.20.tar.bz2 4779028 BLAKE2B def7a135f37a4c7a167ada554b92b0e0107ab3dcbdab69abdea387035159f40fb183477275c137b0d786fdfc7264303898f98c54acb1714f9b7cb21e22612143 SHA512 a156f5c895fdae77f976f463a2d4d1111dc056893ef45b7e9cf62e9115898bc8cb47465bb1779e534c26943df478892385d44646e97bd0fa67fceb83ef7a649b diff --git a/sci-libs/htslib/htslib-1.17.ebuild b/sci-libs/htslib/htslib-1.19.1.ebuild index 6f690363326b..2a38fa8634c8 100644 --- a/sci-libs/htslib/htslib-1.17.ebuild +++ b/sci-libs/htslib/htslib-1.19.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 diff --git a/sci-libs/htslib/htslib-1.20.ebuild b/sci-libs/htslib/htslib-1.20.ebuild new file mode 100644 index 000000000000..2a38fa8634c8 --- /dev/null +++ b/sci-libs/htslib/htslib-1.20.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="C library for high-throughput sequencing data formats" +HOMEPAGE="http://www.htslib.org/" +SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0/3" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+bzip2 curl +lzma" + +RDEPEND=" + sys-libs/zlib + bzip2? ( app-arch/bzip2 ) + curl? ( net-misc/curl ) + lzma? ( app-arch/xz-utils )" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # upstream injects LDFLAGS into the .pc file, + # which is a big nono for QA + sed -e '/^\(static_l\|Libs.private\|Requires.private\)/d' \ + -i htslib.pc.in || die +} + +src_configure() { + econf \ + --disable-gcs \ + --disable-plugins \ + --disable-s3 \ + $(use_enable bzip2 bz2) \ + $(use_enable curl libcurl) \ + $(use_enable lzma) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + + # doesn't use libtool, can't disable static libraries + find "${ED}" -name '*.a' -delete || die +} diff --git a/sci-libs/huggingface_hub/Manifest b/sci-libs/huggingface_hub/Manifest index f19f1cb56a32..3c604dceedeb 100644 --- a/sci-libs/huggingface_hub/Manifest +++ b/sci-libs/huggingface_hub/Manifest @@ -1,4 +1,2 @@ -DIST huggingface_hub-0.13.4.gh.tar.gz 325227 BLAKE2B 56ad70072ddd7f9878de4db45fffeb200032d71ba36fa2dc0e81d50a079a5ffa9ad80b3a71773a5fe466ac4522db7061fc7974149092d212278b8159d30e212b SHA512 6c07c1dc1a0c327ca463b7f366c265dfc7e55ed69592df5ad10f6d77956ac1dfe3e1f827a2df200f943da2f34a96ba4de1c395944b542e3d7142d925f60ad274 -DIST huggingface_hub-0.14.1.gh.tar.gz 359222 BLAKE2B 379cc49230f2e8f5f57d0dac5cfab60f9d0a7d04bab36af8ba0a77846fdf6eea412f9d473bd2f554a912a862747156fe29d36913691b6df8c3cf769389d86b3f SHA512 8d1e9c3e77a8ddb4a6b1827751fad95baad7504a1ad2cdf443f1cf64cff10e1cea9148f2076e0fd462c7f1ce860230e919059e61807260368727a6bd5e9efeb3 -DIST huggingface_hub-0.15.1.gh.tar.gz 1222091 BLAKE2B f9b452f7ffe54d6edfe87e288cd52ee2ec35450ffe052d59442859918b4e1baf93d2d807dc54799ea3346bf00f52ad75bbb9dab69f36771ba8bf8702d54bbe7e SHA512 70d3a47383aa6a0c3cc1b13f1bf3e69326c3432eca8e68ea08f991aa2c5a212f1e4fe262840129bb64dc9ccb3f958371ea7a38ff5246f14585783bafa3d81585 -DIST huggingface_hub-0.16.4.gh.tar.gz 1481723 BLAKE2B 28e704be8087e1d20358eff07d70a93bd4e246b8bb40ad58dfb240029b0945ada672414cabb5be6a8ed145ed437a0c86a6f4bd0a7b562c9b8ca85ee97a99307b SHA512 1412b5210b0b88c2ccac35ddd1ac970abfdd5449600163968a54a7b2f5575ecd1e357d1a98d961387a8edff38a205c9f38e9dca7c23a24e36b0fe47d1a9daa1c +DIST huggingface_hub-0.20.3.gh.tar.gz 3276706 BLAKE2B 2dd9fe557db4e88481bcc675dd1d6d35ec26244b723ea6bed01555e20fcba1dfa269ab3a1de9c8afa21d25b57550f822ca05bfd9d54db7e7b4740116c5ea3469 SHA512 b6eb9875da4d3c0b7190e61beee14ba913fb0f967967a70a6a65e5d42881e06710fb132e471c6e9b0ea1cd0987b2ebd31754d90aded3a84f4ddcfb0a0efe2f21 +DIST huggingface_hub-0.21.4.gh.tar.gz 3565936 BLAKE2B 8aac3ca36369040fe8f7b628cc07a5d890b845d3bfec0dcf6cf7fc477c5c30d680c2dc0531d92c5e814d86f098fad87c80113f37719b41a1eac696f6abd82372 SHA512 886e553c474b59a47d1c5e04c7429ca5c1eb6bcb88a0f7ed6f1396d43c3195bb1f376093384f40497f18fb2220e3e0d9c4b7787c009b84d1d38b6d706307f67f diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.13.4-r1.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.13.4-r1.ebuild deleted file mode 100644 index 7c519b339f79..000000000000 --- a/sci-libs/huggingface_hub/huggingface_hub-0.13.4-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="a client library to interact with the Hugging Face Hub" -HOMEPAGE=" - https://pypi.org/project/huggingface_hub/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" #Several modules not yet packaged - -RDEPEND=" - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.14.1.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.14.1.ebuild deleted file mode 100644 index 7c519b339f79..000000000000 --- a/sci-libs/huggingface_hub/huggingface_hub-0.14.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="a client library to interact with the Hugging Face Hub" -HOMEPAGE=" - https://pypi.org/project/huggingface_hub/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" #Several modules not yet packaged - -RDEPEND=" - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.16.4.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.20.3.ebuild index 7c519b339f79..c033a2a89d94 100644 --- a/sci-libs/huggingface_hub/huggingface_hub-0.16.4.ebuild +++ b/sci-libs/huggingface_hub/huggingface_hub-0.20.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="a client library to interact with the Hugging Face Hub" diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.15.1.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.21.4.ebuild index 7c519b339f79..c033a2a89d94 100644 --- a/sci-libs/huggingface_hub/huggingface_hub-0.15.1.ebuild +++ b/sci-libs/huggingface_hub/huggingface_hub-0.21.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="a client library to interact with the Hugging Face Hub" diff --git a/sci-libs/ideep/Manifest b/sci-libs/ideep/Manifest new file mode 100644 index 000000000000..9def4f3ea3e9 --- /dev/null +++ b/sci-libs/ideep/Manifest @@ -0,0 +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 diff --git a/sci-libs/ideep/files/ideep-3.1.1-20230825.patch b/sci-libs/ideep/files/ideep-3.1.1-20230825.patch new file mode 100644 index 000000000000..a8625e758b00 --- /dev/null +++ b/sci-libs/ideep/files/ideep-3.1.1-20230825.patch @@ -0,0 +1,36 @@ +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.1.1.ebuild b/sci-libs/ideep/ideep-3.1.1.ebuild new file mode 100644 index 000000000000..8f892eea0ed5 --- /dev/null +++ b/sci-libs/ideep/ideep-3.1.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MYP=pytorch-rls-v${PV} +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" + +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/ideep/ideep-3.3.2.ebuild b/sci-libs/ideep/ideep-3.3.2.ebuild new file mode 100644 index 000000000000..58a69716df8e --- /dev/null +++ b/sci-libs/ideep/ideep-3.3.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MYP=pytorch-rls-v${PV} +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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +S="${WORKDIR}"/ideep-${MYP} + +src_install() { + doheader -r include/* +} diff --git a/sci-libs/ideep/metadata.xml b/sci-libs/ideep/metadata.xml new file mode 100644 index 000000000000..953b04a60d15 --- /dev/null +++ b/sci-libs/ideep/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <upstream> + <remote-id type="github">intel/ideep</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/idlcoyote/idlcoyote-20161220.ebuild b/sci-libs/idlcoyote/idlcoyote-20161220-r1.ebuild index f779b30ce0ed..53cc4aff4637 100644 --- a/sci-libs/idlcoyote/idlcoyote-20161220.ebuild +++ b/sci-libs/idlcoyote/idlcoyote-20161220-r1.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 if [[ ${PV} != 99999999 ]]; then SRC_URI="http://www.idlcoyote.com/programs/zip_files/coyoteprograms.zip -> ${P}.zip" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/coyote" - DEPEND="app-arch/unzip" + BDEPEND="app-arch/unzip" else inherit git-r3 - GIT_ECLASS="git-r3" EGIT_REPO_URI="https://github.com/idl-coyote/coyote.git" fi @@ -19,7 +18,6 @@ HOMEPAGE="http://www.idlcoyote.com/" LICENSE="BSD GPL-2" SLOT="0" -IUSE="" RDEPEND="dev-lang/gdl" diff --git a/sci-libs/idlcoyote/idlcoyote-99999999.ebuild b/sci-libs/idlcoyote/idlcoyote-99999999.ebuild index f779b30ce0ed..53cc4aff4637 100644 --- a/sci-libs/idlcoyote/idlcoyote-99999999.ebuild +++ b/sci-libs/idlcoyote/idlcoyote-99999999.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 if [[ ${PV} != 99999999 ]]; then SRC_URI="http://www.idlcoyote.com/programs/zip_files/coyoteprograms.zip -> ${P}.zip" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/coyote" - DEPEND="app-arch/unzip" + BDEPEND="app-arch/unzip" else inherit git-r3 - GIT_ECLASS="git-r3" EGIT_REPO_URI="https://github.com/idl-coyote/coyote.git" fi @@ -19,7 +18,6 @@ HOMEPAGE="http://www.idlcoyote.com/" LICENSE="BSD GPL-2" SLOT="0" -IUSE="" RDEPEND="dev-lang/gdl" diff --git a/sci-libs/ignition-common/Manifest b/sci-libs/ignition-common/Manifest index 0ad18655d346..9e65f0ac5d6c 100644 --- a/sci-libs/ignition-common/Manifest +++ b/sci-libs/ignition-common/Manifest @@ -1 +1,2 @@ DIST ignition-common3_3.14.2.tar.gz 7174986 BLAKE2B 38e42f139321aba5ab42c71d874b516bdf7a32edf3d1b0649991e27957d85e1b416d0206cadbeeea12957f7563920952982e4efb813ce8f33520c06e651553cc SHA512 fdc9dfdc8f69ff72e4381af61b3a6e120f361ab21417792db17f85e0ba2d60c4e32df0b72a45101ed72f65ea16a82c95d29e410962e9ecb40c2427a88593bc15 +DIST ignition-common3_3.17.0.tar.gz 8037300 BLAKE2B edebfa767c5640b2be5ca4cbe41687f7fb646dd3074789b4f4fb35242d6d2393f3ab2398945cf47cbe032a25f30284beb23a0b8d4ca72931f343a7be431efc5c SHA512 282024e5a99ae5f0879f1d11ed7ad4db0920b02e41051f76142b9de74ed296af365723e769ed3b0bd85a9f77a32d7735c85f2f7ef747ea83c5398697598473b1 diff --git a/sci-libs/ignition-common/ignition-common-3.14.2.ebuild b/sci-libs/ignition-common/ignition-common-3.14.2.ebuild index 122afd62eb9c..04e87b079f9e 100644 --- a/sci-libs/ignition-common/ignition-common-3.14.2.ebuild +++ b/sci-libs/ignition-common/ignition-common-3.14.2.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=7 @@ -29,9 +29,9 @@ RDEPEND=" media-video/ffmpeg:0= " DEPEND="${RDEPEND} - dev-util/ignition-cmake:2" + dev-build/ignition-cmake:2" BDEPEND=" - dev-util/ignition-cmake:2" + dev-build/ignition-cmake:2" S="${WORKDIR}/gz-common-ignition-common${IGN_MAJOR}_${PV}" PATCHES=( diff --git a/sci-libs/ignition-common/ignition-common-3.17.0.ebuild b/sci-libs/ignition-common/ignition-common-3.17.0.ebuild new file mode 100644 index 000000000000..04e87b079f9e --- /dev/null +++ b/sci-libs/ignition-common/ignition-common-3.17.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_BUILD_TYPE=RelWithDebInfo +inherit cmake + +IGN_MAJOR=3 + +DESCRIPTION="Set of libraries designed to rapidly develop robot applications" +HOMEPAGE="https://github.com/ignitionrobotics/ign-common" +SRC_URI="https://github.com/ignitionrobotics/ign-common/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="${IGN_MAJOR}" +KEYWORDS="~amd64" +IUSE="test" +#RESTRICT="!test? ( test )" +# tests dont even build +RESTRICT="test" + +RDEPEND=" + dev-libs/tinyxml2:= + sci-libs/ignition-math:6= + sys-apps/util-linux + media-libs/freeimage:= + sci-libs/gts:= + media-video/ffmpeg:0= +" +DEPEND="${RDEPEND} + dev-build/ignition-cmake:2" +BDEPEND=" + dev-build/ignition-cmake:2" + +S="${WORKDIR}/gz-common-ignition-common${IGN_MAJOR}_${PV}" +PATCHES=( + "${FILESDIR}/ffmpeg5.patch" + "${FILESDIR}/ffmpeg6.patch" +) + +src_configure() { + local mycmakeargs=( + "-DBUILD_TESTING=$(usex test)" + ) + cmake_src_configure +} diff --git a/sci-libs/ignition-fuel-tools/Manifest b/sci-libs/ignition-fuel-tools/Manifest index 0228fe7c0062..7943220dd7b5 100644 --- a/sci-libs/ignition-fuel-tools/Manifest +++ b/sci-libs/ignition-fuel-tools/Manifest @@ -1 +1 @@ -DIST ignition-fuel-tools4_4.4.0.tar.gz 403685 BLAKE2B d363eb6e0287024883322b39eaf92ab29e6b253f85b59c65a5196d3a9ad3327728d00fdbeda3bebee7ae7871684ad85ab13a973fc9bdddf9d0e2a5333c8f8e4f SHA512 975c0f77167d6d05e3eb90cb9747e0575e7b0c7b7adfb17a72e68244cf1e656a08f52b3101cfa203435d6ad44ba1483fa20ab66a597c1a1678bf1fdd08599cb6 +DIST ignition-fuel-tools4_4.9.1.tar.gz 352667 BLAKE2B e4cf7c90961b9513b442e98d8683740ba6f9d2291caec89e8efd9a38d699c5cc44007e5f6ebc2bffff5d643841fba3572dd6507282f04f62d0cb2aceade54e3e SHA512 037d590930a6d672e9286ee27b003b497108c8a961b5a7159141c7997f0c690218ed111fb35815f25f1f388e2a630a16386ff4a63d7306d312f27ba8fba84ab9 diff --git a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.4.0.ebuild b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.9.1.ebuild index 366864363d53..d42fabf96ff1 100644 --- a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.4.0.ebuild +++ b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.9.1.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=7 @@ -30,11 +30,11 @@ RDEPEND=" " #igncurl DEPEND="${RDEPEND} - dev-util/ignition-cmake:2" + dev-build/ignition-cmake:2" BDEPEND=" - dev-util/ignition-cmake:2" + dev-build/ignition-cmake:2" -S="${WORKDIR}/ign-fuel-tools-${PN}${IGN_MAJOR}_${PV}" +S="${WORKDIR}/gz-fuel-tools-${PN}${IGN_MAJOR}_${PV}" src_configure() { local mycmakeargs=( diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest index 20d1cc64788d..0a8a2d604550 100644 --- a/sci-libs/ignition-math/Manifest +++ b/sci-libs/ignition-math/Manifest @@ -1 +1,2 @@ DIST ignition-math6_6.14.0.tar.gz 628564 BLAKE2B 6206f1f35472bf51a8a3bdb8fae26d9879044ea856abd8bcce2cfb5bf16d2638816b3fff7e451c165fec8b2ba82db083d78306d5441c4db3def14b08ddad7556 SHA512 ad95160cc1cd137779b9da589c47994d04f829af10865071e9ead4d55c4399d04d5398287d3b294e3f67230205656e1fe243129673e1f8e73f62f3933c314802 +DIST ignition-math6_6.15.1.tar.gz 632975 BLAKE2B 94a300b56a74a0c44da9ec74861fce7946e50d5a16bd56b383bfbd63e9d6f285bd803da6528d899711b74002cce1a8c95cc7c82580aa391794dd0d9fd63ae96f SHA512 569fb37be4b42f170189de680beb71c6274e2a48d02f77d6a9d675ca9901be32df7af6b86f69916ff96b4f7065f8f1d4a9fb3ef81c2b7f5fc3f325e17279edba diff --git a/sci-libs/ignition-math/ignition-math-6.14.0.ebuild b/sci-libs/ignition-math/ignition-math-6.14.0.ebuild index d26ecb92b0fc..eb0f9750bfd7 100644 --- a/sci-libs/ignition-math/ignition-math-6.14.0.ebuild +++ b/sci-libs/ignition-math/ignition-math-6.14.0.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=7 @@ -18,8 +18,8 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} dev-cpp/eigen:3 - dev-util/ignition-cmake:2" + dev-build/ignition-cmake:2" BDEPEND=" - dev-util/ignition-cmake:2" + dev-build/ignition-cmake:2" S="${WORKDIR}/${PN}6_${PV}" diff --git a/sci-libs/ignition-math/ignition-math-6.15.1.ebuild b/sci-libs/ignition-math/ignition-math-6.15.1.ebuild new file mode 100644 index 000000000000..eb0f9750bfd7 --- /dev/null +++ b/sci-libs/ignition-math/ignition-math-6.15.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_BUILD_TYPE=RelWithDebInfo +inherit cmake vcs-snapshot + +DESCRIPTION="A small, fast, and high performance math library for robot applications" +HOMEPAGE="https://github.com/ignitionrobotics/ign-math" +SRC_URI="https://github.com/ignitionrobotics/ign-math/archive/${PN}6_${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="6/6" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-cpp/eigen:3 + dev-build/ignition-cmake:2" +BDEPEND=" + dev-build/ignition-cmake:2" + +S="${WORKDIR}/${PN}6_${PV}" diff --git a/sci-libs/iml/iml-1.0.5.ebuild b/sci-libs/iml/iml-1.0.5.ebuild index e87b1e50a002..41bcf98488dd 100644 --- a/sci-libs/iml/iml-1.0.5.ebuild +++ b/sci-libs/iml/iml-1.0.5.ebuild @@ -9,7 +9,8 @@ DESCRIPTION="Integer Matrix Library" HOMEPAGE="https://www.cs.uwaterloo.ca/~astorjoh/iml.html" SRC_URI="https://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2" -LICENSE="GPL-2" +# COPYING is GPL-2, but the files under src/ all have a BSD header +LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index ce0c8c2c2354..80d24a500f49 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1 +1 @@ -DIST indilib-2.0.3.tar.gz 2713456 BLAKE2B b74f3319c744227b533616ec369cb6f379253928c1d73ef8336d122152fcb866403efe8c7aa6f65c99ba10149b0b2b43c4a86a87f82353ce045602b261b75618 SHA512 323e694f90d71cf26da8b05d60d136f2422dc12e31ec88012250faf795e67bb95da2fd729cacc5bfa7cb74cc8fe1e12a0512cb57e694c87f362a4828228db0b7 +DIST indilib-2.0.8.tar.gz 2851129 BLAKE2B 061ed06bbb122e5579d881ff76d84e6629045eb9972da68fb0c66554f453e7a0660c0017858b8626af70a114bf099c3f7397c6789f41ed99335bde0de767fb95 SHA512 a9b4c5efe9841c024a7ccc271b2de6626ee442d3543f621822522950cc7549def9de111e66e6d183e0a63bead6d1e211fa6025463f9ca4bad30b7a457c5f66b9 diff --git a/sci-libs/indilib/indilib-2.0.3.ebuild b/sci-libs/indilib/indilib-2.0.8.ebuild index 9f35ab2702f0..0cfc49a84aa4 100644 --- a/sci-libs/indilib/indilib-2.0.3.ebuild +++ b/sci-libs/indilib/indilib-2.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 @@ -12,12 +12,14 @@ 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 )" RDEPEND=" + dev-cpp/cpp-httplib:= + dev-cpp/nlohmann_json dev-libs/libev media-libs/libjpeg-turbo:= net-misc/curl @@ -42,6 +44,8 @@ DEPEND="${RDEPEND} 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 diff --git a/sci-libs/itpp/itpp-4.3.1-r2.ebuild b/sci-libs/itpp/itpp-4.3.1-r2.ebuild index 6bb89700ac6d..0c03676c5c08 100644 --- a/sci-libs/itpp/itpp-4.3.1-r2.ebuild +++ b/sci-libs/itpp/itpp-4.3.1-r2.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 @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="C++ library of mathematical, signal processing and communication" HOMEPAGE="https://itpp.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" @@ -20,7 +20,7 @@ RDEPEND="sci-libs/fftw:3.0= DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig doc? ( - app-doc/doxygen + app-text/doxygen virtual/latex-base )" diff --git a/sci-libs/jama/jama-1.2.5.ebuild b/sci-libs/jama/jama-1.2.5-r1.ebuild index 7d96ea39577f..f2dafa318d92 100644 --- a/sci-libs/jama/jama-1.2.5.ebuild +++ b/sci-libs/jama/jama-1.2.5-r1.ebuild @@ -1,27 +1,21 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit versionator - -MYP="${PN}$(replace_all_version_separators '')" -DOCPV=102 +EAPI=8 DESCRIPTION="Java-like matrix C++ templates" HOMEPAGE="https://math.nist.gov/tnt/" -SRC_URI="https://math.nist.gov/tnt/${MYP}.zip - doc? ( https://math.nist.gov/tnt/${PN}${DOCPV}doc.zip )" +SRC_URI="https://math.nist.gov/tnt/${PN}${PV//./}.zip + doc? ( https://math.nist.gov/tnt/${PN}102doc.zip )" +S="${WORKDIR}" LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" -DEPEND="app-arch/unzip" RDEPEND="sci-libs/tnt" - -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_install() { doheader *.h diff --git a/sci-libs/jiwer/Manifest b/sci-libs/jiwer/Manifest index 00c0c8913dfa..5046f9483225 100644 --- a/sci-libs/jiwer/Manifest +++ b/sci-libs/jiwer/Manifest @@ -1 +1 @@ -DIST jiwer-3.0.1.gh.tar.gz 24015 BLAKE2B 634b1c7613a29ee492a108c09d3adeeec6ce975e3663505db5f02258f37f53933f0c6e12c9f0ab48274798bdc130e8ceb5d201b3090af3b9fcbba3ccf66a261e SHA512 9a455ec8687947531dc18f89aa898d7906e1e94f803fa05f3e4689b074e05a13b3b653cbc621c723c8d9776c0c787d7a4978eca3efb90c4abded7e7f6b13ca9e +DIST jiwer-3.0.3.gh.tar.gz 24092 BLAKE2B 593170953a8f56d654b7a749fd7b8a636065c1a3b1e51b810b1768b8acd817474010025d758a3af984bbe9d4d834411d8a5df446174e87b839be1325fbd1085f SHA512 fbd9d7a5d8c2056e99f47cf55ef8661fcf96ccd16bafe28f40036477def6e7ff433bd372169fdc92c5b727e106e90353468205d2d8238726ea501c3cbab8d156 diff --git a/sci-libs/jiwer/jiwer-3.0.1-r1.ebuild b/sci-libs/jiwer/jiwer-3.0.3.ebuild index c3b6585071d4..dd694082ecbe 100644 --- a/sci-libs/jiwer/jiwer-3.0.1-r1.ebuild +++ b/sci-libs/jiwer/jiwer-3.0.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 DESCRIPTION="Evaluate an automatic speech recognition system" @@ -24,4 +24,4 @@ RDEPEND=" distutils_enable_tests pytest -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) +PATCHES=( "${FILESDIR}"/${PN}-3.0.1-tests.patch ) diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest deleted file mode 100644 index ab10fe6c757d..000000000000 --- a/sci-libs/keras-applications/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6 diff --git a/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild deleted file mode 100644 index 16e901fdb80a..000000000000 --- a/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="Keras deep learning library reference implementations of deep learning models" -HOMEPAGE="https://keras.io/applications/" -SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" - -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" diff --git a/sci-libs/keras-applications/metadata.xml b/sci-libs/keras-applications/metadata.xml deleted file mode 100644 index 00ca801f5326..000000000000 --- a/sci-libs/keras-applications/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <longdescription lang="en"> - Keras Applications is the applications module of the Keras deep learning library. It provides model definitions and pre-trained weights for a number of popular archictures, such as VGG16, ResNet50, Xception, MobileNet, and more. - </longdescription> - <upstream> - <remote-id type="github">keras-team/keras-applications</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest deleted file mode 100644 index 15b2d81619e5..000000000000 --- a/sci-libs/keras-preprocessing/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c99e1180c8c06d8fab4d6707890b1f24466d287f6da54d66b395e5e50c7aac67cc0abc8153fbfbeb4ffb0e79561bca528a6b81b SHA512 aae4d52accdfb9df260070336b1c5a628e57563978f7cb299aa67a6265f26eb44deb803cef795616a5e94cd8bcd2b9aa067570258fff96642b88cc0c701c3cec diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild deleted file mode 100644 index 120e85768ffc..000000000000 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYPI_PN="Keras_Preprocessing" -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models" -HOMEPAGE="https://keras.io/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" diff --git a/sci-libs/keras-preprocessing/metadata.xml b/sci-libs/keras-preprocessing/metadata.xml deleted file mode 100644 index 89bac5c2363d..000000000000 --- a/sci-libs/keras-preprocessing/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <longdescription lang="en"> - Keras Preprocessing is the data preprocessing and data augmentation module of the Keras deep learning library. It provides utilities for working with image data, text data, and sequence data. - </longdescription> - <upstream> - <remote-id type="github">keras-team/keras-preprocessing</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/keras/Manifest b/sci-libs/keras/Manifest deleted file mode 100644 index d5c590e7cbd2..000000000000 --- a/sci-libs/keras/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f -DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c -DIST keras-2.10.0.tar.gz 2250425 BLAKE2B eb05537739cdc81e279b5c400e2e2b77d46f4085e8530fef565bde12414ddccedb44c0b13265106a3353e67c367106e1d341412dc25b32e2221f144a31d76079 SHA512 8682110495a045c2ebc61f31a98d646b88fd9608d5169be78701cf528457ff0d2e39669d885854c14c1e6bebb380b14968957f2a8a34a8a023f8860efc7aeecd -DIST keras-2.11.0.tar.gz 2260857 BLAKE2B 9c85e0f64176848886509fbf269b85732f8ad98e7be3ec186e71870e453454b9b81516ef2ca4e67fb8906bc0ca1241d61ae94db6b58c7483527d33519f7c38fb SHA512 17c773e1f9c592676d56a8b3eed707d52240800b33e85dccccb80f206e8459c8c18485f0bcb6d5775ce1ef0625dc5ebe699574b8599dd98dbb73620da4301968 -DIST keras-2.12.0.tar.gz 2319287 BLAKE2B 332b2b02eecac2da7c87c1f051c56d495027630e2e0254d543897e462f7f44a282bff6cf3cbe2602663cae2e2c76ab45c9b3b53cadbc3317b3e2dd366bdf7ace SHA512 10d034abc9b159a0945610dcfb2fc58d8143267629b8f59496b4e5f097b1220bdb02a269f135f05b8abed56c2d5237b3e0c2b74882cd3f321850fc7f47694dbb diff --git a/sci-libs/keras/files/keras-2.10.0-0001-bazel-Use-system-protobuf.patch b/sci-libs/keras/files/keras-2.10.0-0001-bazel-Use-system-protobuf.patch deleted file mode 100644 index d7cb39f70e8c..000000000000 --- a/sci-libs/keras/files/keras-2.10.0-0001-bazel-Use-system-protobuf.patch +++ /dev/null @@ -1,327 +0,0 @@ -From bbb2bd19534d6d5aef466dc8707f7c8ad3bab9d8 Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Sun, 14 Nov 2021 17:59:39 -0800 -Subject: [PATCH] bazel: Use system protobuf - ---- - WORKSPACE | 49 --------- - keras/protobuf/BUILD | 2 +- - third_party/BUILD | 8 +- - third_party/protobuf.bzl | 216 +++++++++++++++++++++++++++++++++++++++ - 4 files changed, 224 insertions(+), 51 deletions(-) - create mode 100644 third_party/protobuf.bzl - -diff --git a/WORKSPACE b/WORKSPACE -index 898b5b6d..61282aea 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -1,50 +1 @@ - workspace(name = "org_keras") -- --load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -- --# Needed by protobuf --load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") --http_archive( -- name = "bazel_skylib", -- url = "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.1/bazel-skylib-1.0.1.tar.gz", -- sha256 = "f1c8360c01fcf276778d3519394805dc2a71a64274a3a0908bc9edff7b5aebc8", --) --load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") --bazel_skylib_workspace() -- --# Needed by protobuf --http_archive( -- name = "six_archive", -- build_file = "//third_party:six.BUILD", -- sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", -- strip_prefix = "six-1.12.0", -- urls = [ -- "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz", -- "https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz", # 2018-12-10 -- ], --) -- --bind( -- name = "six", -- actual = "@six_archive//:six", --) -- --http_archive( -- name = "com_google_protobuf", -- sha256 = "1fbf1c2962af287607232b2eddeaec9b4f4a7a6f5934e1a9276e9af76952f7e0", -- strip_prefix = "protobuf-3.9.2", -- urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.2.tar.gz"], --) -- --# ZLIB. Need by com_google_protobuf. --http_archive( -- name = "zlib", -- build_file = "@com_google_protobuf//:third_party/zlib.BUILD", -- sha256 = "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9", -- strip_prefix = "zlib-1.2.12", -- urls = ["https://zlib.net/zlib-1.2.12.tar.gz"], --) -- -- --load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") --protobuf_deps() -diff --git a/keras/protobuf/BUILD b/keras/protobuf/BUILD -index 413dcb74..80133c06 100644 ---- a/keras/protobuf/BUILD -+++ b/keras/protobuf/BUILD -@@ -1,7 +1,7 @@ - # Description: - # Contains Keras protobufs - --load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") -+load("//third_party:protobuf.bzl", "py_proto_library") - - package( - default_visibility = [ -diff --git a/third_party/BUILD b/third_party/BUILD -index 9be54076..9399232f 100644 ---- a/third_party/BUILD -+++ b/third_party/BUILD -@@ -1,4 +1,5 @@ - package( -+ default_visibility = ["//visibility:public"], - licenses = ["notice"], # Apache 2.0 - ) - -@@ -7,4 +8,9 @@ exports_files([ - "six.BUILD", - ]) - --package(default_visibility = ["//visibility:public"]) -+genrule( -+ name = "protoc", -+ outs = ["protoc.bin"], -+ cmd = "ln -s $$(which protoc) $@", -+ executable = 1, -+) -diff --git a/third_party/protobuf.bzl b/third_party/protobuf.bzl -new file mode 100644 -index 00000000..3a7ef0a2 ---- /dev/null -+++ b/third_party/protobuf.bzl -@@ -0,0 +1,216 @@ -+def _GetPath(ctx, path): -+ if ctx.label.workspace_root: -+ return ctx.label.workspace_root + "/" + path -+ else: -+ return path -+ -+def _IsNewExternal(ctx): -+ # Bazel 0.4.4 and older have genfiles paths that look like: -+ # bazel-out/local-fastbuild/genfiles/external/repo/foo -+ # After the exec root rearrangement, they look like: -+ # ../repo/bazel-out/local-fastbuild/genfiles/foo -+ return ctx.label.workspace_root.startswith("../") -+ -+def _GenDir(ctx): -+ if _IsNewExternal(ctx): -+ # We are using the fact that Bazel 0.4.4+ provides repository-relative paths -+ # for ctx.genfiles_dir. -+ return ctx.genfiles_dir.path + ( -+ "/" + ctx.attr.includes[0] if ctx.attr.includes and ctx.attr.includes[0] else "" -+ ) -+ -+ # This means that we're either in the old version OR the new version in the local repo. -+ # Either way, appending the source path to the genfiles dir works. -+ return ctx.var["GENDIR"] + "/" + _SourceDir(ctx) -+ -+def _SourceDir(ctx): -+ if not ctx.attr.includes: -+ return ctx.label.workspace_root -+ if not ctx.attr.includes[0]: -+ return _GetPath(ctx, ctx.label.package) -+ if not ctx.label.package: -+ return _GetPath(ctx, ctx.attr.includes[0]) -+ return _GetPath(ctx, ctx.label.package + "/" + ctx.attr.includes[0]) -+ -+def _PyOuts(srcs, use_grpc_plugin = False): -+ ret = [s[:-len(".proto")] + "_pb2.py" for s in srcs] -+ if use_grpc_plugin: -+ ret += [s[:-len(".proto")] + "_pb2_grpc.py" for s in srcs] -+ return ret -+ -+def _proto_gen_impl(ctx): -+ """General implementation for generating protos""" -+ srcs = ctx.files.srcs -+ deps = [] -+ deps += ctx.files.srcs -+ source_dir = _SourceDir(ctx) -+ gen_dir = _GenDir(ctx) -+ if source_dir: -+ import_flags = ["-I" + source_dir, "-I" + gen_dir] -+ else: -+ import_flags = ["-I."] -+ -+ for dep in ctx.attr.deps: -+ import_flags += dep.proto.import_flags -+ deps += dep.proto.deps -+ import_flags = depset(import_flags).to_list() -+ deps = depset(deps).to_list() -+ -+ args = [] -+ if ctx.attr.gen_cc: -+ args += ["--cpp_out=" + gen_dir] -+ if ctx.attr.gen_py: -+ args += ["--python_out=" + gen_dir] -+ -+ inputs = srcs + deps -+ tools = [ctx.executable.protoc] -+ if ctx.executable.plugin: -+ plugin = ctx.executable.plugin -+ lang = ctx.attr.plugin_language -+ if not lang and plugin.basename.startswith("protoc-gen-"): -+ lang = plugin.basename[len("protoc-gen-"):] -+ if not lang: -+ fail("cannot infer the target language of plugin", "plugin_language") -+ -+ outdir = gen_dir -+ if ctx.attr.plugin_options: -+ outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir -+ args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)] -+ args += ["--%s_out=%s" % (lang, outdir)] -+ tools.append(plugin) -+ -+ if args: -+ ctx.actions.run( -+ inputs = inputs, -+ outputs = ctx.outputs.outs, -+ arguments = args + import_flags + [s.path for s in srcs], -+ executable = ctx.executable.protoc, -+ mnemonic = "ProtoCompile", -+ tools = tools, -+ use_default_shell_env = True, -+ ) -+ -+ return struct( -+ proto = struct( -+ srcs = srcs, -+ import_flags = import_flags, -+ deps = deps, -+ ), -+ ) -+ -+proto_gen = rule( -+ attrs = { -+ "srcs": attr.label_list(allow_files = True), -+ "deps": attr.label_list(providers = ["proto"]), -+ "includes": attr.string_list(), -+ "protoc": attr.label( -+ cfg = "host", -+ executable = True, -+ allow_single_file = True, -+ mandatory = True, -+ ), -+ "plugin": attr.label( -+ cfg = "host", -+ allow_files = True, -+ executable = True, -+ ), -+ "plugin_language": attr.string(), -+ "plugin_options": attr.string_list(), -+ "gen_cc": attr.bool(), -+ "gen_py": attr.bool(), -+ "outs": attr.output_list(), -+ }, -+ output_to_genfiles = True, -+ implementation = _proto_gen_impl, -+) -+"""Generates codes from Protocol Buffers definitions. -+ -+This rule helps you to implement Skylark macros specific to the target -+language. You should prefer more specific `cc_proto_library `, -+`py_proto_library` and others unless you are adding such wrapper macros. -+ -+Args: -+ srcs: Protocol Buffers definition files (.proto) to run the protocol compiler -+ against. -+ deps: a list of dependency labels; must be other proto libraries. -+ includes: a list of include paths to .proto files. -+ protoc: the label of the protocol compiler to generate the sources. -+ plugin: the label of the protocol compiler plugin to be passed to the protocol -+ compiler. -+ plugin_language: the language of the generated sources -+ plugin_options: a list of options to be passed to the plugin -+ gen_cc: generates C++ sources in addition to the ones from the plugin. -+ gen_py: generates Python sources in addition to the ones from the plugin. -+ outs: a list of labels of the expected outputs from the protocol compiler. -+""" -+ -+def py_proto_library( -+ name, -+ srcs = [], -+ deps = [], -+ py_libs = [], -+ py_extra_srcs = [], -+ include = None, -+ default_runtime = None, -+ protoc = "//third_party:protoc", -+ use_grpc_plugin = False, -+ **kwargs): -+ """Bazel rule to create a Python protobuf library from proto source files -+ -+ NOTE: the rule is only an internal workaround to generate protos. The -+ interface may change and the rule may be removed when bazel has introduced -+ the native rule. -+ -+ Args: -+ name: the name of the py_proto_library. -+ srcs: the .proto files of the py_proto_library. -+ deps: a list of dependency labels; must be py_proto_library. -+ py_libs: a list of other py_library targets depended by the generated -+ py_library. -+ py_extra_srcs: extra source files that will be added to the output -+ py_library. This attribute is used for internal bootstrapping. -+ include: a string indicating the include path of the .proto files. -+ default_runtime: the implicitly default runtime which will be depended on by -+ the generated py_library target. -+ protoc: the label of the protocol compiler to generate the sources. -+ use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin -+ when processing the proto files. -+ **kwargs: other keyword arguments that are passed to py_library. -+ -+ """ -+ outs = _PyOuts(srcs, use_grpc_plugin) -+ -+ includes = [] -+ if include != None: -+ includes = [include] -+ -+ grpc_python_plugin = None -+ if use_grpc_plugin: -+ grpc_python_plugin = "//external:grpc_python_plugin" -+ # Note: Generated grpc code depends on Python grpc module. This dependency -+ # is not explicitly listed in py_libs. Instead, host system is assumed to -+ # have grpc installed. -+ -+ proto_gen( -+ name = name + "_genproto", -+ srcs = srcs, -+ deps = [s + "_genproto" for s in deps], -+ includes = includes, -+ protoc = protoc, -+ gen_py = 1, -+ outs = outs, -+ visibility = ["//visibility:public"], -+ plugin = grpc_python_plugin, -+ plugin_language = "grpc", -+ ) -+ -+ if default_runtime and not default_runtime in py_libs + deps: -+ py_libs = py_libs + [default_runtime] -+ -+ native.py_library( -+ name = name, -+ srcs = outs + py_extra_srcs, -+ deps = py_libs + deps, -+ imports = includes, -+ **kwargs -+ ) --- -2.35.1 - diff --git a/sci-libs/keras/files/keras-2.11.0-0001-bazel-Use-system-protobuf.patch b/sci-libs/keras/files/keras-2.11.0-0001-bazel-Use-system-protobuf.patch deleted file mode 100644 index 9d8f645970d2..000000000000 --- a/sci-libs/keras/files/keras-2.11.0-0001-bazel-Use-system-protobuf.patch +++ /dev/null @@ -1,330 +0,0 @@ -From 439f4ece698f90796b42d8627a52deccce8efc97 Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Sun, 14 Nov 2021 17:59:39 -0800 -Subject: [PATCH] bazel: Use system protobuf - ---- - WORKSPACE | 52 ---------- - keras/protobuf/BUILD | 2 +- - third_party/BUILD | 8 +- - third_party/protobuf.bzl | 216 +++++++++++++++++++++++++++++++++++++++ - 4 files changed, 224 insertions(+), 54 deletions(-) - create mode 100644 third_party/protobuf.bzl - -diff --git a/WORKSPACE b/WORKSPACE -index e7d7c8f5..61282aea 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -1,53 +1 @@ - workspace(name = "org_keras") -- --load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -- --# Needed by protobuf --load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") --http_archive( -- name = "bazel_skylib", -- url = "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.1/bazel-skylib-1.0.1.tar.gz", -- sha256 = "f1c8360c01fcf276778d3519394805dc2a71a64274a3a0908bc9edff7b5aebc8", --) --load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") --bazel_skylib_workspace() -- --# Needed by protobuf --http_archive( -- name = "six_archive", -- build_file = "//third_party:six.BUILD", -- sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", -- strip_prefix = "six-1.12.0", -- urls = [ -- "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz", -- "https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz", # 2018-12-10 -- ], --) -- --bind( -- name = "six", -- actual = "@six_archive//:six", --) -- --http_archive( -- name = "com_google_protobuf", -- sha256 = "1fbf1c2962af287607232b2eddeaec9b4f4a7a6f5934e1a9276e9af76952f7e0", -- strip_prefix = "protobuf-3.9.2", -- urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.2.tar.gz"], --) -- --# ZLIB. Need by com_google_protobuf. --http_archive( -- name = "zlib", -- build_file = "@com_google_protobuf//:third_party/zlib.BUILD", -- sha256 = "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30", -- strip_prefix = "zlib-1.2.13", -- urls = [ -- "https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.13.tar.gz", -- "https://zlib.net/zlib-1.2.13.tar.gz", -- ], --) -- -- --load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") --protobuf_deps() -diff --git a/keras/protobuf/BUILD b/keras/protobuf/BUILD -index 413dcb74..80133c06 100644 ---- a/keras/protobuf/BUILD -+++ b/keras/protobuf/BUILD -@@ -1,7 +1,7 @@ - # Description: - # Contains Keras protobufs - --load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") -+load("//third_party:protobuf.bzl", "py_proto_library") - - package( - default_visibility = [ -diff --git a/third_party/BUILD b/third_party/BUILD -index 9be54076..9399232f 100644 ---- a/third_party/BUILD -+++ b/third_party/BUILD -@@ -1,4 +1,5 @@ - package( -+ default_visibility = ["//visibility:public"], - licenses = ["notice"], # Apache 2.0 - ) - -@@ -7,4 +8,9 @@ exports_files([ - "six.BUILD", - ]) - --package(default_visibility = ["//visibility:public"]) -+genrule( -+ name = "protoc", -+ outs = ["protoc.bin"], -+ cmd = "ln -s $$(which protoc) $@", -+ executable = 1, -+) -diff --git a/third_party/protobuf.bzl b/third_party/protobuf.bzl -new file mode 100644 -index 00000000..3a7ef0a2 ---- /dev/null -+++ b/third_party/protobuf.bzl -@@ -0,0 +1,216 @@ -+def _GetPath(ctx, path): -+ if ctx.label.workspace_root: -+ return ctx.label.workspace_root + "/" + path -+ else: -+ return path -+ -+def _IsNewExternal(ctx): -+ # Bazel 0.4.4 and older have genfiles paths that look like: -+ # bazel-out/local-fastbuild/genfiles/external/repo/foo -+ # After the exec root rearrangement, they look like: -+ # ../repo/bazel-out/local-fastbuild/genfiles/foo -+ return ctx.label.workspace_root.startswith("../") -+ -+def _GenDir(ctx): -+ if _IsNewExternal(ctx): -+ # We are using the fact that Bazel 0.4.4+ provides repository-relative paths -+ # for ctx.genfiles_dir. -+ return ctx.genfiles_dir.path + ( -+ "/" + ctx.attr.includes[0] if ctx.attr.includes and ctx.attr.includes[0] else "" -+ ) -+ -+ # This means that we're either in the old version OR the new version in the local repo. -+ # Either way, appending the source path to the genfiles dir works. -+ return ctx.var["GENDIR"] + "/" + _SourceDir(ctx) -+ -+def _SourceDir(ctx): -+ if not ctx.attr.includes: -+ return ctx.label.workspace_root -+ if not ctx.attr.includes[0]: -+ return _GetPath(ctx, ctx.label.package) -+ if not ctx.label.package: -+ return _GetPath(ctx, ctx.attr.includes[0]) -+ return _GetPath(ctx, ctx.label.package + "/" + ctx.attr.includes[0]) -+ -+def _PyOuts(srcs, use_grpc_plugin = False): -+ ret = [s[:-len(".proto")] + "_pb2.py" for s in srcs] -+ if use_grpc_plugin: -+ ret += [s[:-len(".proto")] + "_pb2_grpc.py" for s in srcs] -+ return ret -+ -+def _proto_gen_impl(ctx): -+ """General implementation for generating protos""" -+ srcs = ctx.files.srcs -+ deps = [] -+ deps += ctx.files.srcs -+ source_dir = _SourceDir(ctx) -+ gen_dir = _GenDir(ctx) -+ if source_dir: -+ import_flags = ["-I" + source_dir, "-I" + gen_dir] -+ else: -+ import_flags = ["-I."] -+ -+ for dep in ctx.attr.deps: -+ import_flags += dep.proto.import_flags -+ deps += dep.proto.deps -+ import_flags = depset(import_flags).to_list() -+ deps = depset(deps).to_list() -+ -+ args = [] -+ if ctx.attr.gen_cc: -+ args += ["--cpp_out=" + gen_dir] -+ if ctx.attr.gen_py: -+ args += ["--python_out=" + gen_dir] -+ -+ inputs = srcs + deps -+ tools = [ctx.executable.protoc] -+ if ctx.executable.plugin: -+ plugin = ctx.executable.plugin -+ lang = ctx.attr.plugin_language -+ if not lang and plugin.basename.startswith("protoc-gen-"): -+ lang = plugin.basename[len("protoc-gen-"):] -+ if not lang: -+ fail("cannot infer the target language of plugin", "plugin_language") -+ -+ outdir = gen_dir -+ if ctx.attr.plugin_options: -+ outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir -+ args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)] -+ args += ["--%s_out=%s" % (lang, outdir)] -+ tools.append(plugin) -+ -+ if args: -+ ctx.actions.run( -+ inputs = inputs, -+ outputs = ctx.outputs.outs, -+ arguments = args + import_flags + [s.path for s in srcs], -+ executable = ctx.executable.protoc, -+ mnemonic = "ProtoCompile", -+ tools = tools, -+ use_default_shell_env = True, -+ ) -+ -+ return struct( -+ proto = struct( -+ srcs = srcs, -+ import_flags = import_flags, -+ deps = deps, -+ ), -+ ) -+ -+proto_gen = rule( -+ attrs = { -+ "srcs": attr.label_list(allow_files = True), -+ "deps": attr.label_list(providers = ["proto"]), -+ "includes": attr.string_list(), -+ "protoc": attr.label( -+ cfg = "host", -+ executable = True, -+ allow_single_file = True, -+ mandatory = True, -+ ), -+ "plugin": attr.label( -+ cfg = "host", -+ allow_files = True, -+ executable = True, -+ ), -+ "plugin_language": attr.string(), -+ "plugin_options": attr.string_list(), -+ "gen_cc": attr.bool(), -+ "gen_py": attr.bool(), -+ "outs": attr.output_list(), -+ }, -+ output_to_genfiles = True, -+ implementation = _proto_gen_impl, -+) -+"""Generates codes from Protocol Buffers definitions. -+ -+This rule helps you to implement Skylark macros specific to the target -+language. You should prefer more specific `cc_proto_library `, -+`py_proto_library` and others unless you are adding such wrapper macros. -+ -+Args: -+ srcs: Protocol Buffers definition files (.proto) to run the protocol compiler -+ against. -+ deps: a list of dependency labels; must be other proto libraries. -+ includes: a list of include paths to .proto files. -+ protoc: the label of the protocol compiler to generate the sources. -+ plugin: the label of the protocol compiler plugin to be passed to the protocol -+ compiler. -+ plugin_language: the language of the generated sources -+ plugin_options: a list of options to be passed to the plugin -+ gen_cc: generates C++ sources in addition to the ones from the plugin. -+ gen_py: generates Python sources in addition to the ones from the plugin. -+ outs: a list of labels of the expected outputs from the protocol compiler. -+""" -+ -+def py_proto_library( -+ name, -+ srcs = [], -+ deps = [], -+ py_libs = [], -+ py_extra_srcs = [], -+ include = None, -+ default_runtime = None, -+ protoc = "//third_party:protoc", -+ use_grpc_plugin = False, -+ **kwargs): -+ """Bazel rule to create a Python protobuf library from proto source files -+ -+ NOTE: the rule is only an internal workaround to generate protos. The -+ interface may change and the rule may be removed when bazel has introduced -+ the native rule. -+ -+ Args: -+ name: the name of the py_proto_library. -+ srcs: the .proto files of the py_proto_library. -+ deps: a list of dependency labels; must be py_proto_library. -+ py_libs: a list of other py_library targets depended by the generated -+ py_library. -+ py_extra_srcs: extra source files that will be added to the output -+ py_library. This attribute is used for internal bootstrapping. -+ include: a string indicating the include path of the .proto files. -+ default_runtime: the implicitly default runtime which will be depended on by -+ the generated py_library target. -+ protoc: the label of the protocol compiler to generate the sources. -+ use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin -+ when processing the proto files. -+ **kwargs: other keyword arguments that are passed to py_library. -+ -+ """ -+ outs = _PyOuts(srcs, use_grpc_plugin) -+ -+ includes = [] -+ if include != None: -+ includes = [include] -+ -+ grpc_python_plugin = None -+ if use_grpc_plugin: -+ grpc_python_plugin = "//external:grpc_python_plugin" -+ # Note: Generated grpc code depends on Python grpc module. This dependency -+ # is not explicitly listed in py_libs. Instead, host system is assumed to -+ # have grpc installed. -+ -+ proto_gen( -+ name = name + "_genproto", -+ srcs = srcs, -+ deps = [s + "_genproto" for s in deps], -+ includes = includes, -+ protoc = protoc, -+ gen_py = 1, -+ outs = outs, -+ visibility = ["//visibility:public"], -+ plugin = grpc_python_plugin, -+ plugin_language = "grpc", -+ ) -+ -+ if default_runtime and not default_runtime in py_libs + deps: -+ py_libs = py_libs + [default_runtime] -+ -+ native.py_library( -+ name = name, -+ srcs = outs + py_extra_srcs, -+ deps = py_libs + deps, -+ imports = includes, -+ **kwargs -+ ) --- -2.37.4 - diff --git a/sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch b/sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch deleted file mode 100644 index 6870d534cf75..000000000000 --- a/sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch +++ /dev/null @@ -1,330 +0,0 @@ -From ac16152a7709f90c1dedac63157655c836c257bb Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Sun, 14 Nov 2021 17:59:39 -0800 -Subject: [PATCH] bazel: Use system protobuf - ---- - WORKSPACE | 52 ---------- - keras/protobuf/BUILD | 2 +- - third_party/BUILD | 8 +- - third_party/protobuf.bzl | 216 +++++++++++++++++++++++++++++++++++++++ - 4 files changed, 224 insertions(+), 54 deletions(-) - create mode 100644 third_party/protobuf.bzl - -diff --git a/WORKSPACE b/WORKSPACE -index c0ebc4e52..61282aead 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -1,53 +1 @@ - workspace(name = "org_keras") -- --load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -- --# Needed by protobuf --load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") --http_archive( -- name = "bazel_skylib", -- urls = [ -- "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", -- "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", -- ], -- sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506", --) --load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") --bazel_skylib_workspace() -- --# Needed by protobuf --http_archive( -- name = "six_archive", -- build_file = "//third_party:six.BUILD", -- sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", -- strip_prefix = "six-1.16.0", -- urls = ["https://pypi.python.org/packages/source/s/six/six-1.16.0.tar.gz"], --) -- --bind( -- name = "six", -- actual = "@six_archive//:six", --) -- --http_archive( -- name = "com_google_protobuf", -- sha256 = "f66073dee0bc159157b0bd7f502d7d1ee0bc76b3c1eac9836927511bdc4b3fc1", -- strip_prefix = "protobuf-3.21.9", -- urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.9.zip"], --) -- --# ZLIB. Need by com_google_protobuf. --http_archive( -- name = "zlib", -- build_file = "@com_google_protobuf//:third_party/zlib.BUILD", -- sha256 = "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30", -- strip_prefix = "zlib-1.2.13", -- urls = [ -- "https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.13.tar.gz", -- "https://zlib.net/zlib-1.2.13.tar.gz", -- ], --) -- -- --load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") --protobuf_deps() -diff --git a/keras/protobuf/BUILD b/keras/protobuf/BUILD -index 413dcb74d..80133c064 100644 ---- a/keras/protobuf/BUILD -+++ b/keras/protobuf/BUILD -@@ -1,7 +1,7 @@ - # Description: - # Contains Keras protobufs - --load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") -+load("//third_party:protobuf.bzl", "py_proto_library") - - package( - default_visibility = [ -diff --git a/third_party/BUILD b/third_party/BUILD -index 9be54076c..9399232f6 100644 ---- a/third_party/BUILD -+++ b/third_party/BUILD -@@ -1,4 +1,5 @@ - package( -+ default_visibility = ["//visibility:public"], - licenses = ["notice"], # Apache 2.0 - ) - -@@ -7,4 +8,9 @@ exports_files([ - "six.BUILD", - ]) - --package(default_visibility = ["//visibility:public"]) -+genrule( -+ name = "protoc", -+ outs = ["protoc.bin"], -+ cmd = "ln -s $$(which protoc) $@", -+ executable = 1, -+) -diff --git a/third_party/protobuf.bzl b/third_party/protobuf.bzl -new file mode 100644 -index 000000000..3a7ef0a27 ---- /dev/null -+++ b/third_party/protobuf.bzl -@@ -0,0 +1,216 @@ -+def _GetPath(ctx, path): -+ if ctx.label.workspace_root: -+ return ctx.label.workspace_root + "/" + path -+ else: -+ return path -+ -+def _IsNewExternal(ctx): -+ # Bazel 0.4.4 and older have genfiles paths that look like: -+ # bazel-out/local-fastbuild/genfiles/external/repo/foo -+ # After the exec root rearrangement, they look like: -+ # ../repo/bazel-out/local-fastbuild/genfiles/foo -+ return ctx.label.workspace_root.startswith("../") -+ -+def _GenDir(ctx): -+ if _IsNewExternal(ctx): -+ # We are using the fact that Bazel 0.4.4+ provides repository-relative paths -+ # for ctx.genfiles_dir. -+ return ctx.genfiles_dir.path + ( -+ "/" + ctx.attr.includes[0] if ctx.attr.includes and ctx.attr.includes[0] else "" -+ ) -+ -+ # This means that we're either in the old version OR the new version in the local repo. -+ # Either way, appending the source path to the genfiles dir works. -+ return ctx.var["GENDIR"] + "/" + _SourceDir(ctx) -+ -+def _SourceDir(ctx): -+ if not ctx.attr.includes: -+ return ctx.label.workspace_root -+ if not ctx.attr.includes[0]: -+ return _GetPath(ctx, ctx.label.package) -+ if not ctx.label.package: -+ return _GetPath(ctx, ctx.attr.includes[0]) -+ return _GetPath(ctx, ctx.label.package + "/" + ctx.attr.includes[0]) -+ -+def _PyOuts(srcs, use_grpc_plugin = False): -+ ret = [s[:-len(".proto")] + "_pb2.py" for s in srcs] -+ if use_grpc_plugin: -+ ret += [s[:-len(".proto")] + "_pb2_grpc.py" for s in srcs] -+ return ret -+ -+def _proto_gen_impl(ctx): -+ """General implementation for generating protos""" -+ srcs = ctx.files.srcs -+ deps = [] -+ deps += ctx.files.srcs -+ source_dir = _SourceDir(ctx) -+ gen_dir = _GenDir(ctx) -+ if source_dir: -+ import_flags = ["-I" + source_dir, "-I" + gen_dir] -+ else: -+ import_flags = ["-I."] -+ -+ for dep in ctx.attr.deps: -+ import_flags += dep.proto.import_flags -+ deps += dep.proto.deps -+ import_flags = depset(import_flags).to_list() -+ deps = depset(deps).to_list() -+ -+ args = [] -+ if ctx.attr.gen_cc: -+ args += ["--cpp_out=" + gen_dir] -+ if ctx.attr.gen_py: -+ args += ["--python_out=" + gen_dir] -+ -+ inputs = srcs + deps -+ tools = [ctx.executable.protoc] -+ if ctx.executable.plugin: -+ plugin = ctx.executable.plugin -+ lang = ctx.attr.plugin_language -+ if not lang and plugin.basename.startswith("protoc-gen-"): -+ lang = plugin.basename[len("protoc-gen-"):] -+ if not lang: -+ fail("cannot infer the target language of plugin", "plugin_language") -+ -+ outdir = gen_dir -+ if ctx.attr.plugin_options: -+ outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir -+ args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)] -+ args += ["--%s_out=%s" % (lang, outdir)] -+ tools.append(plugin) -+ -+ if args: -+ ctx.actions.run( -+ inputs = inputs, -+ outputs = ctx.outputs.outs, -+ arguments = args + import_flags + [s.path for s in srcs], -+ executable = ctx.executable.protoc, -+ mnemonic = "ProtoCompile", -+ tools = tools, -+ use_default_shell_env = True, -+ ) -+ -+ return struct( -+ proto = struct( -+ srcs = srcs, -+ import_flags = import_flags, -+ deps = deps, -+ ), -+ ) -+ -+proto_gen = rule( -+ attrs = { -+ "srcs": attr.label_list(allow_files = True), -+ "deps": attr.label_list(providers = ["proto"]), -+ "includes": attr.string_list(), -+ "protoc": attr.label( -+ cfg = "host", -+ executable = True, -+ allow_single_file = True, -+ mandatory = True, -+ ), -+ "plugin": attr.label( -+ cfg = "host", -+ allow_files = True, -+ executable = True, -+ ), -+ "plugin_language": attr.string(), -+ "plugin_options": attr.string_list(), -+ "gen_cc": attr.bool(), -+ "gen_py": attr.bool(), -+ "outs": attr.output_list(), -+ }, -+ output_to_genfiles = True, -+ implementation = _proto_gen_impl, -+) -+"""Generates codes from Protocol Buffers definitions. -+ -+This rule helps you to implement Skylark macros specific to the target -+language. You should prefer more specific `cc_proto_library `, -+`py_proto_library` and others unless you are adding such wrapper macros. -+ -+Args: -+ srcs: Protocol Buffers definition files (.proto) to run the protocol compiler -+ against. -+ deps: a list of dependency labels; must be other proto libraries. -+ includes: a list of include paths to .proto files. -+ protoc: the label of the protocol compiler to generate the sources. -+ plugin: the label of the protocol compiler plugin to be passed to the protocol -+ compiler. -+ plugin_language: the language of the generated sources -+ plugin_options: a list of options to be passed to the plugin -+ gen_cc: generates C++ sources in addition to the ones from the plugin. -+ gen_py: generates Python sources in addition to the ones from the plugin. -+ outs: a list of labels of the expected outputs from the protocol compiler. -+""" -+ -+def py_proto_library( -+ name, -+ srcs = [], -+ deps = [], -+ py_libs = [], -+ py_extra_srcs = [], -+ include = None, -+ default_runtime = None, -+ protoc = "//third_party:protoc", -+ use_grpc_plugin = False, -+ **kwargs): -+ """Bazel rule to create a Python protobuf library from proto source files -+ -+ NOTE: the rule is only an internal workaround to generate protos. The -+ interface may change and the rule may be removed when bazel has introduced -+ the native rule. -+ -+ Args: -+ name: the name of the py_proto_library. -+ srcs: the .proto files of the py_proto_library. -+ deps: a list of dependency labels; must be py_proto_library. -+ py_libs: a list of other py_library targets depended by the generated -+ py_library. -+ py_extra_srcs: extra source files that will be added to the output -+ py_library. This attribute is used for internal bootstrapping. -+ include: a string indicating the include path of the .proto files. -+ default_runtime: the implicitly default runtime which will be depended on by -+ the generated py_library target. -+ protoc: the label of the protocol compiler to generate the sources. -+ use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin -+ when processing the proto files. -+ **kwargs: other keyword arguments that are passed to py_library. -+ -+ """ -+ outs = _PyOuts(srcs, use_grpc_plugin) -+ -+ includes = [] -+ if include != None: -+ includes = [include] -+ -+ grpc_python_plugin = None -+ if use_grpc_plugin: -+ grpc_python_plugin = "//external:grpc_python_plugin" -+ # Note: Generated grpc code depends on Python grpc module. This dependency -+ # is not explicitly listed in py_libs. Instead, host system is assumed to -+ # have grpc installed. -+ -+ proto_gen( -+ name = name + "_genproto", -+ srcs = srcs, -+ deps = [s + "_genproto" for s in deps], -+ includes = includes, -+ protoc = protoc, -+ gen_py = 1, -+ outs = outs, -+ visibility = ["//visibility:public"], -+ plugin = grpc_python_plugin, -+ plugin_language = "grpc", -+ ) -+ -+ if default_runtime and not default_runtime in py_libs + deps: -+ py_libs = py_libs + [default_runtime] -+ -+ native.py_library( -+ name = name, -+ srcs = outs + py_extra_srcs, -+ deps = py_libs + deps, -+ imports = includes, -+ **kwargs -+ ) --- -2.39.3 - diff --git a/sci-libs/keras/keras-2.10.0.ebuild b/sci-libs/keras/keras-2.10.0.ebuild deleted file mode 100644 index 148adc58fbc3..000000000000 --- a/sci-libs/keras/keras-2.10.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -inherit bazel distutils-r1 - -DESCRIPTION="Deep Learning for humans" -HOMEPAGE="https://keras.io/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -bazel_external_uris=" - https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - -SRC_URI="https://github.com/keras-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${bazel_external_uris}" - -RDEPEND=" - >=dev-libs/protobuf-3.13.0:= - dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/h5py[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] - >=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}] - >=sci-libs/tensorflow-2.10[python,${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.13.0 - dev-java/java-config - >=dev-util/bazel-4.2.2" - -# Bazel tests not pytest, also want GPU access -RESTRICT="test" -DOCS=( CONTRIBUTING.md README.md ) -PATCHES=( - "${FILESDIR}/keras-2.10.0-0001-bazel-Use-system-protobuf.patch" -) - -src_unpack() { - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - bazel_setup_bazelrc - default - python_copy_sources -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - - ebazel build //keras/tools/pip_package:build_pip_package - ebazel shutdown - - local srcdir="${T}/src-${EPYTHON/./_}" - mkdir -p "${srcdir}" || die - bazel-bin/keras/tools/pip_package/build_pip_package --src "${srcdir}" || die - - popd || die -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) - distutils-r1_src_compile -} - -python_install() { - pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die - esetup.py install - python_optimize - popd || die -} diff --git a/sci-libs/keras/keras-2.11.0.ebuild b/sci-libs/keras/keras-2.11.0.ebuild deleted file mode 100644 index 2274402e882d..000000000000 --- a/sci-libs/keras/keras-2.11.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -inherit bazel distutils-r1 - -DESCRIPTION="Deep Learning for humans" -HOMEPAGE="https://keras.io/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -bazel_external_uris=" - https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - -SRC_URI="https://github.com/keras-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${bazel_external_uris}" - -RDEPEND=" - >=dev-libs/protobuf-3.13.0:= - dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/h5py[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] - >=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}] - >=sci-libs/tensorflow-2.10[python,${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.13.0 - dev-java/java-config - >=dev-util/bazel-4.2.2" - -# Bazel tests not pytest, also want GPU access -RESTRICT="test" -DOCS=( CONTRIBUTING.md README.md ) -PATCHES=( - "${FILESDIR}/keras-2.11.0-0001-bazel-Use-system-protobuf.patch" -) - -src_unpack() { - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - bazel_setup_bazelrc - default - python_copy_sources -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - - ebazel build //keras/tools/pip_package:build_pip_package - ebazel shutdown - - local srcdir="${T}/src-${EPYTHON/./_}" - mkdir -p "${srcdir}" || die - bazel-bin/keras/tools/pip_package/build_pip_package --src "${srcdir}" || die - - popd || die -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) - distutils-r1_src_compile -} - -python_install() { - pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die - esetup.py install - python_optimize - popd || die -} diff --git a/sci-libs/keras/keras-2.12.0.ebuild b/sci-libs/keras/keras-2.12.0.ebuild deleted file mode 100644 index 429513ced949..000000000000 --- a/sci-libs/keras/keras-2.12.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 python3_11 ) -inherit bazel distutils-r1 - -DESCRIPTION="Deep Learning for humans" -HOMEPAGE="https://keras.io/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -bazel_external_uris=" - https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - -SRC_URI="https://github.com/keras-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${bazel_external_uris}" - -RDEPEND=" - >=dev-libs/protobuf-3.13.0:= - dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/h5py[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] - >=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}] - >=sci-libs/tensorflow-2.12[python,${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.13.0 - dev-java/java-config - >=dev-util/bazel-5.3.0" - -# Bazel tests not pytest, also want GPU access -RESTRICT="test" -DOCS=( CONTRIBUTING.md README.md ) -PATCHES=( - "${FILESDIR}/keras-2.12.0-0001-bazel-Use-system-protobuf.patch" -) - -src_unpack() { - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - bazel_setup_bazelrc - default - python_copy_sources -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - - ebazel build //keras/tools/pip_package:build_pip_package - ebazel shutdown - - local srcdir="${T}/src-${EPYTHON/./_}" - mkdir -p "${srcdir}" || die - bazel-bin/keras/tools/pip_package/build_pip_package --src "${srcdir}" || die - - popd || die -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) - distutils-r1_src_compile -} - -python_install() { - pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die - esetup.py install - python_optimize - popd || die -} diff --git a/sci-libs/keras/metadata.xml b/sci-libs/keras/metadata.xml deleted file mode 100644 index c2708124bd6d..000000000000 --- a/sci-libs/keras/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <longdescription lang="en"> - A deep learning for humans. TensorFlow Keras is an implementation - of the Keras API that uses TensorFlow as a backend. - </longdescription> - <upstream> - <remote-id type="github">keras-team/keras</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest index c2d3d9cba92f..5306787a3e16 100644 --- a/sci-libs/kineto/Manifest +++ b/sci-libs/kineto/Manifest @@ -1 +1 @@ -DIST kineto-0.4.0.tar.gz 8190627 BLAKE2B 015017096b6a01b2f2172580884aef6c57df0d33c3d8904c959acc7f7dcc36386f72acb9a672571fa25b7f74c1d2d763692b8cc5a634a73ac143819f811737df SHA512 4a3cbf2f29aa174b9a67f55d0f4e7b8d952ed5dba612f33d144a4d019055031e2a6ff8c98ef1971bf2508460cb871dace38bfc669c10c076cc42d685a1842d86 +DIST kineto-0.4.0_p20231127.tar.gz 8234629 BLAKE2B ac6e13340817eb283e387e699e70e5113571b258ee3ebf72f2d4a54a6349be22d84701ddec67fbc72d12be3fb0c321a71c8dd64a7f8a6d679522c49f21304fbc SHA512 316db3db624ae36720c0fcabb81f70c31b94ea64f18bc103aeadb75a25e06e113a774a3ec0c769881960ad61f3c2210172ccde1c451df653e7c430fbe89e4d9a diff --git a/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch index 3e1a5cbc9b8d..d0f8790ae5a5 100644 --- a/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch +++ b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch @@ -1,20 +1,16 @@ --- a/CMakeLists.txt 2022-05-24 11:16:18.537610972 +0200 +++ b/CMakeLists.txt 2022-05-24 11:19:15.011073535 +0200 -@@ -78,10 +78,10 @@ - set_target_properties(kineto_base kineto_api PROPERTIES - CXX_STANDARD 14 +@@ -86,7 +86,8 @@ CXX_STANDARD_REQUIRED YES -- CXX_EXTENSIONS NO -- CXX_VISIBILITY_PRESET hidden) -+ CXX_EXTENSIONS NO) + CXX_EXTENSIONS NO) -set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto") +set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto" -+ ${CMAKE_SHARED_LIBRARY_C_FLAGS}) ++ ${CMAKE_SHARED_LIBRARY_C_FLAGS}) list(APPEND KINETO_COMPILE_OPTIONS "-DFMT_HEADER_ONLY") + list(APPEND KINETO_COMPILE_OPTIONS "-DENABLE_IPC_FABRIC") if(NOT MSVC) - list(APPEND KINETO_COMPILE_OPTIONS "-std=c++14") -@@ -100,7 +102,7 @@ +@@ -111,7 +113,7 @@ target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}") target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}") @@ -23,7 +19,7 @@ if(NOT FMT_SOURCE_DIR) set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt" CACHE STRING "fmt source directory from submodules") -@@ -118,9 +120,7 @@ +@@ -129,9 +131,7 @@ set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) endif() @@ -33,14 +29,33 @@ if (NOT CUPTI_INCLUDE_DIR) set(CUPTI_INCLUDE_DIR "${CUDA_SOURCE_DIR}/extras/CUPTI/include") endif() -@@ -140,14 +140,12 @@ +@@ -144,15 +144,14 @@ + set(ROCM_INCLUDE_DIRS "${ROCM_SOURCE_DIR}/include") + endif() + +-set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/") +-set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/") ++set(DYNOLOG_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/") ++set(IPCFABRIC_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/src/ipcfabric/") + + message(INFO " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}") + message(INFO " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}") + message(INFO " DYNOLOG_INCLUDE_DIR = ${DYNOLOG_INCLUDE_DIR}") + message(INFO " IPCFABRIC_INCLUDE_DIR = ${IPCFABRIC_INCLUDE_DIR}") + +-add_subdirectory("${IPCFABRIC_INCLUDE_DIR}") + target_link_libraries(kineto_base PRIVATE dynolog_ipcfabric_lib) + target_include_directories(kineto_base PUBLIC +@@ -160,7 +159,6 @@ $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}> $<BUILD_INTERFACE:${LIBKINETO_SOURCE_DIR}> + $<BUILD_INTERFACE:${DYNOLOG_INCLUDE_DIR}> - $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}> + $<BUILD_INTERFACE:${IPCFABRIC_INCLUDE_DIR}> $<BUILD_INTERFACE:${CUPTI_INCLUDE_DIR}> $<BUILD_INTERFACE:${CUDA_INCLUDE_DIRS}> - $<BUILD_INTERFACE:${ROCTRACER_INCLUDE_DIR}> +@@ -168,7 +166,6 @@ $<BUILD_INTERFACE:${ROCM_INCLUDE_DIRS}>) target_include_directories(kineto_api PUBLIC @@ -48,30 +63,12 @@ $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>) if(KINETO_LIBRARY_TYPE STREQUAL "default") -@@ -178,8 +180,6 @@ - if(NOT LIBKINETO_NOCUPTI) - target_link_libraries(kineto "${CUDA_cupti_LIBRARY}") +@@ -202,8 +199,6 @@ + if(CUDA_nvperf_host_LIBRARY) + target_link_libraries(kineto "${CUDA_nvperf_host_LIBRARY}") endif() -target_link_libraries(kineto $<BUILD_INTERFACE:fmt::fmt-header-only>) -add_dependencies(kineto fmt::fmt-header-only) install(TARGETS kineto EXPORT kinetoLibraryConfig ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ---- a/libkineto_defs.bzl 2022-05-24 22:06:17.324000422 +0200 -+++ b/libkineto_defs.bzl 2022-05-24 22:07:08.326419268 +0200 -@@ -46,6 +46,7 @@ - "src/init.cpp", - "src/output_csv.cpp", - "src/output_json.cpp", -+ "src/ILoggerObserver.cpp", - ] + (get_libkineto_api_srcs() if with_api else []) - - def get_libkineto_public_headers(): -@@ -51,6 +56,7 @@ - return [ - "include/AbstractConfig.h", - "include/ActivityProfilerInterface.h", -+ "include/ActivityTraceInterface.h", - "include/ActivityType.h", - "include/Config.h", - "include/ClientInterface.h", diff --git a/sci-libs/kineto/kineto-0.4.0.ebuild b/sci-libs/kineto/kineto-0.4.0_p20231127.ebuild index 2282c4406855..3a0dcc58057b 100644 --- a/sci-libs/kineto/kineto-0.4.0.ebuild +++ b/sci-libs/kineto/kineto-0.4.0_p20231127.ebuild @@ -1,14 +1,16 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 cmake +PYTHON_COMPAT=( python3_{9..12} ) +inherit python-any-r1 cmake prefix + +CommitId=c7aeac02222978e7673ee5381bfcaa6b60d5d69c DESCRIPTION="part of the PyTorch Profiler" HOMEPAGE="https://github.com/pytorch/kineto" -SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz +SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" @@ -18,6 +20,7 @@ IUSE="test" RDEPEND=" dev-libs/libfmt + dev-libs/dynolog " DEPEND="${RDEPEND}" BDEPEND=" @@ -27,10 +30,11 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2021.11.17-gentoo.patch - "${FILESDIR}"/${P}-gcc13.patch + "${FILESDIR}"/${PN}-0.4.0-gcc13.patch ) +S="${WORKDIR}"/${PN}-${CommitId} + src_prepare() { cd libkineto cmake_src_prepare @@ -38,5 +42,10 @@ src_prepare() { src_configure() { cd libkineto + local mycmakeargs=( + -DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/ + ) + eapply $(prefixify_ro "${FILESDIR}"/${PN}-0.4.0_p20231031-gentoo.patch) + cmake_src_configure } diff --git a/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch b/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch new file mode 100644 index 000000000000..a3cb3e468e17 --- /dev/null +++ b/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch @@ -0,0 +1,26 @@ +diff --git a/kissfft-config.cmake.in b/kissfft-config.cmake.in +index cd7139a..7d6c7a2 100644 +--- a/kissfft-config.cmake.in ++++ b/kissfft-config.cmake.in +@@ -66,14 +66,19 @@ foreach(_kissfft_datatype simd int16 int32 float double) + endforeach() + + if(_kissfft_datatype_detected) +- if(NOT TARGET kissfft::kissfft-${_kissfft_datatype_detected}) +- message(FATAL_ERROR "kissfft with datatype=${_kissfft_datatype_detected} is not installed") ++ if(TARGET kissfft::kissfft-${_kissfft_datatype_detected}-openmp) ++ set(_kissfft_openmp_detected "-openmp") + endif() ++ ++ if(NOT TARGET kissfft::kissfft-${_kissfft_datatype_detected}${_kissfft_openmp_detected}) ++ message(FATAL_ERROR "kissfft with datatype=${_kissfft_datatype_detected}${_kissfft_openmp_detected} is not installed") ++ endif() ++ + if(TARGET kissfft::kissfft) + message(SEND_ERROR "kissfft::kissfft already exists. You cannot use 2 find_package's with datatype that are visible to eachother.") + else() + add_library(kissfft::kissfft INTERFACE IMPORTED) +- set_property(TARGET kissfft::kissfft PROPERTY INTERFACE_LINK_LIBRARIES kissfft::kissfft-${_kissfft_datatype_detected}) ++ set_property(TARGET kissfft::kissfft PROPERTY INTERFACE_LINK_LIBRARIES kissfft::kissfft-${_kissfft_datatype_detected}${_kissfft_openmp_detected}) + endif() + endif() diff --git a/sci-libs/kissfft/files/kissfft-131.1.0-cross.patch b/sci-libs/kissfft/files/kissfft-131.1.0-cross.patch new file mode 100644 index 000000000000..137a5a939872 --- /dev/null +++ b/sci-libs/kissfft/files/kissfft-131.1.0-cross.patch @@ -0,0 +1,30 @@ +From 8b308c28e5c3684ac002289b0eebc64500bbed1c Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 24 Dec 2023 16:37:38 +0000 +Subject: [PATCH] GNUInstallDirs is not supposed to be used conditionally + +Always include it to fix cross-compiling. This should not break Windows. + +Closes: https://github.com/mborgerding/kissfft/issues/65 +--- + CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0213798..c4d7d3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -105,9 +105,7 @@ endif() + # Add GNUInstallDirs for GNU infrastructure before target)include_directories + # + +-if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" AND NOT CMAKE_CROSSCOMPILING) +- include(GNUInstallDirs) +-endif() ++include(GNUInstallDirs) + + # + # Declare PKGINCLUDEDIR for kissfft include path +-- +2.43.0 + diff --git a/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild b/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild new file mode 100644 index 000000000000..14e039c7eec1 --- /dev/null +++ b/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild @@ -0,0 +1,63 @@ +# 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 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 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() { + use test && python-any-r1_pkg_setup + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_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) + ) + + cmake_src_configure +} diff --git a/sci-libs/kissfft/kissfft-131.1.0.ebuild b/sci-libs/kissfft/kissfft-131.1.0.ebuild index 8cd5a54a6850..9fb779d33ddd 100644 --- a/sci-libs/kissfft/kissfft-131.1.0.ebuild +++ b/sci-libs/kissfft/kissfft-131.1.0.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=7 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~riscv ~x86" fi LICENSE="BSD" @@ -32,6 +32,10 @@ DEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-131.1.0-cross.patch +) + python_check_deps() { python_has_version -d "dev-python/numpy[${PYTHON_USEDEP}]" } diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild index 9bd7014dd1fb..14e039c7eec1 100644 --- a/sci-libs/kissfft/kissfft-9999.ebuild +++ b/sci-libs/kissfft/kissfft-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=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-any-r1 toolchain-funcs @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="BSD" @@ -32,6 +32,11 @@ DEPEND=" ) " +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}]" } diff --git a/sci-libs/kissfft/metadata.xml b/sci-libs/kissfft/metadata.xml index 06198343b639..9cc777a3ea9c 100644 --- a/sci-libs/kissfft/metadata.xml +++ b/sci-libs/kissfft/metadata.xml @@ -9,4 +9,7 @@ <flag name="alloca">Use alloca(3) instead of malloc(3) for memory management</flag> <flag name="tools">Build command line tools</flag> </use> + <upstream> + <remote-id type="github">mborgerding/kissfft</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild index d4400810d297..de79b06f2f39 100644 --- a/sci-libs/klu/klu-1.3.9-r2.ebuild +++ b/sci-libs/klu/klu-1.3.9-r2.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=7 @@ -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/lapack/Manifest b/sci-libs/lapack/Manifest index d2af6557b1ba..dd55df1f8618 100644 --- a/sci-libs/lapack/Manifest +++ b/sci-libs/lapack/Manifest @@ -1,2 +1,2 @@ -DIST lapack-3.10.1.tar.gz 7632257 BLAKE2B f2653239029ed9c136173fc2e54773a785ad3e469d581ca2b7f6a72697e6bb9d22879edaf8327ada510df259c08fe984202d14cb3860c0d2a711eb55a1cc11dd SHA512 0500bbbb48483208c0a35b74972ff0059c389da6032824a2079637266a99fa980882eedf7f1fc490219ee4ff27812ac8c6afe118e25f40a9c2387e7b997762fb DIST lapack-3.11.tar.gz 7723909 BLAKE2B b3f8ec8cd439d790ba5869b8b071fe924a4ac53328bce77d46032602b45353670966ed9223324a0780aabc2e95624f439e03f90a89586f96afbe1374c4261bc5 SHA512 d2f23c5f6ae14fb868312a25235459bd0c04f4b43b82a5ade01314776ade9a75dc518a457eb58595f29f64cb0bb86f1a12ce8beea3ec87ef9caf49493ce29fb3 +DIST lapack-3.12.0.tar.gz 7933607 BLAKE2B dafb1f9a717f2cbc00a26f8cff2c7a1ebb720714fe6d7bd5fabb511a2f4af317165814340864c9d601e4e16c7762f643fbbafc058170ebcdc6529a9b4f2d70b6 SHA512 f8f3c733a0221be0b3f5618235408ac59cbd4e5f1c4eab5f509b831a6ec6a9ef14b8849aa6ea10810df1aff90186ca454d15e9438d1dd271c2449d42d3da9dda diff --git a/sci-libs/lapack/files/lapack-3.12.0-correct-64bit-interface.patch b/sci-libs/lapack/files/lapack-3.12.0-correct-64bit-interface.patch new file mode 100644 index 000000000000..c9c9479f4522 --- /dev/null +++ b/sci-libs/lapack/files/lapack-3.12.0-correct-64bit-interface.patch @@ -0,0 +1,38 @@ +From 26db2da3eb84856d997e05caf9904a6b56eac1e8 Mon Sep 17 00:00:00 2001 +From: Simon Maertens <simon@slmaertens.dev> +Date: Wed, 29 Nov 2023 14:30:30 +0000 +Subject: [PATCH] Fixed Fortran compiler flags check for nagfor compiler and + usage in CBLAS target + +--- + CBLAS/CMakeLists.txt | 4 ++++ + CMAKE/CheckLAPACKCompilerFlags.cmake | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt +index c276f7da3d..b01d795af9 100644 +--- a/CBLAS/CMakeLists.txt ++++ b/CBLAS/CMakeLists.txt +@@ -14,6 +14,10 @@ if(CMAKE_Fortran_COMPILER) + FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h + MACRO_NAMESPACE "F77_" + SYMBOL_NAMESPACE "F77_") ++ ++ # Check for any necessary platform specific compiler flags ++ include(CheckLAPACKCompilerFlags) ++ CheckLAPACKCompilerFlags() + endif() + if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND) + message(WARNING "Reverting to pre-defined include/cblas_mangling.h") +diff --git a/CMAKE/CheckLAPACKCompilerFlags.cmake b/CMAKE/CheckLAPACKCompilerFlags.cmake +index ecb5009ae5..653b817583 100644 +--- a/CMAKE/CheckLAPACKCompilerFlags.cmake ++++ b/CMAKE/CheckLAPACKCompilerFlags.cmake +@@ -177,6 +177,7 @@ elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "NAG" ) + endif() + + # Suppress compiler banner and summary ++ include(CheckFortranCompilerFlag) + check_fortran_compiler_flag("-quiet" _quiet) + if( _quiet AND NOT ("${CMAKE_Fortran_FLAGS}" MATCHES "[-/]quiet") ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -quiet") diff --git a/sci-libs/lapack/files/lapack-3.12.0-test-summary.patch b/sci-libs/lapack/files/lapack-3.12.0-test-summary.patch new file mode 100644 index 000000000000..1d2303cdb018 --- /dev/null +++ b/sci-libs/lapack/files/lapack-3.12.0-test-summary.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/924929 +https://github.com/Reference-LAPACK/lapack/commit/a4298d5ff68047acfa44d6394ceb3a688a3b2534 + +From 5b0687f429cf420629c0eeafba6a74a2564d4131 Mon Sep 17 00:00:00 2001 +From: Simon Maertens <simon@slmaertens.dev> +Date: Fri, 1 Dec 2023 14:05:54 +0000 +Subject: [PATCH] Fixed search phrase for determining the amount of successful + tests + +--- a/lapack_testing.py ++++ b/lapack_testing.py +@@ -136,7 +136,7 @@ def run_summary_test( f, cmdline, short_summary): + for line in pipe.readlines(): + f.write(str(line)) + words_in_line=line.split() +- if (line.find("run")!=-1): ++ if (line.find("run)")!=-1): + # print line + whereisrun=words_in_line.index("run)") + nb_test_run+=int(words_in_line[whereisrun-2]) + diff --git a/sci-libs/lapack/lapack-3.11.ebuild b/sci-libs/lapack/lapack-3.11.ebuild index 7e2764d7f209..91d893cac281 100644 --- a/sci-libs/lapack/lapack-3.11.ebuild +++ b/sci-libs/lapack/lapack-3.11.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Some additional tests are run if Python is found PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake fortran-2 python-any-r1 +inherit cmake flag-o-matic fortran-2 python-any-r1 DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations" HOMEPAGE="https://www.netlib.org/lapack/" @@ -39,6 +39,11 @@ pkg_setup() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/878891 + # https://github.com/Reference-LAPACK/lapack/issues/990 + filter-lto + local mycmakeargs=( -DCBLAS=ON -DLAPACKE=$(usex lapacke) diff --git a/sci-libs/lapack/lapack-3.12.0-r1.ebuild b/sci-libs/lapack/lapack-3.12.0-r1.ebuild new file mode 100644 index 000000000000..3432143696f3 --- /dev/null +++ b/sci-libs/lapack/lapack-3.12.0-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Some additional tests are run if Python is found +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake flag-o-matic fortran-2 python-any-r1 + +DESCRIPTION="BLAS, CBLAS, LAPACK, LAPACKE reference implementations" +HOMEPAGE="https://www.netlib.org/lapack/" +SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" +# TODO: static-libs 64bit-index +IUSE="lapacke deprecated doc eselect-ldso test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !app-eselect/eselect-cblas + virtual/fortran + eselect-ldso? ( + >=app-eselect/eselect-blas-0.2 + >=app-eselect/eselect-lapack-0.2 + ) + doc? ( app-doc/blas-docs ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + # fix -Werror=lto-type-mismatch caused by a bug that breaks + # the 64-bit interface for cblas + # https://github.com/Reference-LAPACK/lapack/issues/990#issuecomment-1973258284 + # https://bugs.gentoo.org/878891 + "${FILESDIR}"/lapack-3.12.0-correct-64bit-interface.patch + "${FILESDIR}"/lapack-3.12.0-test-summary.patch +) + +pkg_setup() { + fortran-2_pkg_setup + use test && python-any-r1_pkg_setup +} + +src_configure() { + # bug #878891 + filter-lto + + local mycmakeargs=( + -DCBLAS=ON + -DLAPACKE=$(usex lapacke) + -DBUILD_DEPRECATED=$(usex deprecated) + -DBUILD_SHARED_LIBS=ON + -DBUILD_TESTING=$(usex test) + -DLAPACK_TESTING_USE_PYTHON=$(usex test) + # Breaks cross + -DTEST_FORTRAN_COMPILER=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + use eselect-ldso || return + # Create private lib directory for eselect::blas (ld.so.conf) + dodir /usr/$(get_libdir)/blas/reference + dosym -r /usr/$(get_libdir)/libblas.so /usr/$(get_libdir)/blas/reference/libblas.so + dosym -r /usr/$(get_libdir)/libblas.so.3 /usr/$(get_libdir)/blas/reference/libblas.so.3 + dosym -r /usr/$(get_libdir)/libcblas.so /usr/$(get_libdir)/blas/reference/libcblas.so + dosym -r /usr/$(get_libdir)/libcblas.so.3 /usr/$(get_libdir)/blas/reference/libcblas.so.3 + + # Create private lib directory for eselect::lapack (ld.so.conf) + dodir /usr/$(get_libdir)/lapack/reference + dosym -r /usr/$(get_libdir)/liblapack.so /usr/$(get_libdir)/lapack/reference/liblapack.so + dosym -r /usr/$(get_libdir)/liblapack.so.3 /usr/$(get_libdir)/lapack/reference/liblapack.so.3 +} + +pkg_postinst() { + use eselect-ldso || return + + local me=reference libdir=$(get_libdir) + # check eselect-blas + eselect blas add ${libdir} "${EPREFIX}"/usr/${libdir}/blas/${me} ${me} + local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) + if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then + eselect blas set ${libdir} ${me} + elog "Current eselect: BLAS ($libdir) -> [${current_blas}]." + else + elog "Current eselect: BLAS ($libdir) -> [${current_blas}]." + elog "To use blas [${me}] implementation, you have to issue (as root):" + elog "\t eselect blas set ${libdir} ${me}" + fi + + # check eselect-lapack + eselect lapack add ${libdir} "${EPREFIX}"/usr/${libdir}/lapack/${me} ${me} + local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2) + if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then + eselect lapack set ${libdir} ${me} + elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]." + else + elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]." + elog "To use lapack [${me}] implementation, you have to issue (as root):" + elog "\t eselect lapack set ${libdir} ${me}" + fi +} + +pkg_postrm() { + use eselect-ldso || return + + eselect blas validate + eselect lapack validate +} diff --git a/sci-libs/lapack/lapack-3.10.1.ebuild b/sci-libs/lapack/lapack-3.12.0.ebuild index 16b9d22e73df..4cc2f91f5f67 100644 --- a/sci-libs/lapack/lapack-3.10.1.ebuild +++ b/sci-libs/lapack/lapack-3.12.0.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake fortran-2 +# Some additional tests are run if Python is found +PYTHON_COMPAT=( python3_{10..11} ) +inherit cmake flag-o-matic fortran-2 python-any-r1 -DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations" +DESCRIPTION="BLAS, CBLAS, LAPACK, LAPACKE reference implementations" HOMEPAGE="https://www.netlib.org/lapack/" SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" # TODO: static-libs 64bit-index IUSE="lapacke deprecated doc eselect-ldso test" RESTRICT="!test? ( test )" -BDEPEND="virtual/pkgconfig" RDEPEND=" !app-eselect/eselect-cblas virtual/fortran @@ -24,16 +25,34 @@ RDEPEND=" >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) - doc? ( app-doc/blas-docs )" + doc? ( app-doc/blas-docs ) +" DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) +" + +pkg_setup() { + fortran-2_pkg_setup + use test && python-any-r1_pkg_setup +} src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/878891 + # https://github.com/Reference-LAPACK/lapack/issues/990 + filter-lto + local mycmakeargs=( -DCBLAS=ON -DLAPACKE=$(usex lapacke) -DBUILD_DEPRECATED=$(usex deprecated) -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=$(usex test) + -DLAPACK_TESTING_USE_PYTHON=$(usex test) + # Breaks cross + -DTEST_FORTRAN_COMPILER=OFF ) cmake_src_configure @@ -45,15 +64,15 @@ src_install() { use eselect-ldso || return # Create private lib directory for eselect::blas (ld.so.conf) dodir /usr/$(get_libdir)/blas/reference - dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so - dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3 - dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so - dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3 + dosym -r /usr/$(get_libdir)/libblas.so /usr/$(get_libdir)/blas/reference/libblas.so + dosym -r /usr/$(get_libdir)/libblas.so.3 /usr/$(get_libdir)/blas/reference/libblas.so.3 + dosym -r /usr/$(get_libdir)/libcblas.so /usr/$(get_libdir)/blas/reference/libcblas.so + dosym -r /usr/$(get_libdir)/libcblas.so.3 /usr/$(get_libdir)/blas/reference/libcblas.so.3 # Create private lib directory for eselect::lapack (ld.so.conf) dodir /usr/$(get_libdir)/lapack/reference - dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so - dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3 + dosym -r /usr/$(get_libdir)/liblapack.so /usr/$(get_libdir)/lapack/reference/liblapack.so + dosym -r /usr/$(get_libdir)/liblapack.so.3 /usr/$(get_libdir)/lapack/reference/liblapack.so.3 } pkg_postinst() { @@ -61,7 +80,7 @@ pkg_postinst() { local me=reference libdir=$(get_libdir) # check eselect-blas - eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me} + eselect blas add ${libdir} "${EPREFIX}"/usr/${libdir}/blas/${me} ${me} local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then eselect blas set ${libdir} ${me} @@ -73,7 +92,7 @@ pkg_postinst() { fi # check eselect-lapack - eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me} + eselect lapack add ${libdir} "${EPREFIX}"/usr/${libdir}/lapack/${me} ${me} local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2) if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then eselect lapack set ${libdir} ${me} diff --git a/sci-libs/lemon/lemon-1.3.1-r2.ebuild b/sci-libs/lemon/lemon-1.3.1-r2.ebuild index e0891825d062..15fae94bf9e3 100644 --- a/sci-libs/lemon/lemon-1.3.1-r2.ebuild +++ b/sci-libs/lemon/lemon-1.3.1-r2.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 @@ -26,7 +26,7 @@ RDEPEND="coin? ( glpk? ( sci-mathematics/glpk:= )" DEPEND="${RDEPEND}" BDEPEND="doc? ( - app-doc/doxygen + app-text/doxygen app-text/ghostscript-gpl <dev-libs/mathjax-3 )" diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest index 16596109fa60..811136e73542 100644 --- a/sci-libs/libcifpp/Manifest +++ b/sci-libs/libcifpp/Manifest @@ -1,4 +1,4 @@ -DIST libcifpp-5.1.1-components.cif.xz 58896016 BLAKE2B 2bf61944fe6b11325df3c6c32eaabeb27b0f117eed362dd2eba51f623f4054d142ee84aeb04908322b7aebd30a1bd17da969eeda953f7423cca922006fe767d2 SHA512 d4103ac0b0ae5698dd4c17e452ea35871c4854827d3a2ee93f00b73b6f57b87ee2278b44ec0501f818dfc34284b4c19d4617ba3a98df9552da5ebedaa59c9622 -DIST libcifpp-5.1.1.tar.gz 2244833 BLAKE2B 3a5feada63ee123dbed1ba776d0248569f46bbc2d39748db7d3cdfdfb66c89e08c54cdf5133182978e9ef4808c19adfc794ee895a95e882f0d5ff3d173e57311 SHA512 3e988d0e4f24174fb47274b0feaae5a8a793441efb9c8273b328f412fbd29ee082cd91e19f19008069ebfd3507c83f7945dc33fc015784727603f987091eaa5c -DIST libcifpp-5.1.2-components.cif.xz 59092332 BLAKE2B 3672ca8e9553be80822ca7d7398fd3b73b14b1bf375e63f3a7aef33c2ee92d837c9ca08b3a756d838c512ac5918a0537d70e9a422331fafaf0ff77ecf2134515 SHA512 b2d3507d339d8467b10d0a638a5b86e75ed73fb64fee854aefeb2f0ce999e6a99755af30483749ce75e8a4ce63536111bd2a7a5f698dfc86d1a2be3d243304ce -DIST libcifpp-5.1.2.tar.gz 2244795 BLAKE2B 7bec9f901c112fabf86c9ce691229f42dcf854be4c99bdf09dbe7dd0d0a3a7e92831cb2b72afa4debc1ce8b1a3a33e27cceda048adca6805802189e0ad50349c SHA512 3adb801ed52b250f6779228288a2c2926c1c7d8d0eff0bb6ed610b4258de8537253d2ce95208e8682b2eb8d0c09ecb53b6269c24bdce907360d9478c6c8c3c1b +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 diff --git a/sci-libs/libcifpp/libcifpp-5.1.2.ebuild b/sci-libs/libcifpp/libcifpp-5.2.2.ebuild index 47d08fc49c68..0a794df24722 100644 --- a/sci-libs/libcifpp/libcifpp-5.1.2.ebuild +++ b/sci-libs/libcifpp/libcifpp-5.2.2.ebuild @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="Code to work with mmCIF and PDB files" HOMEPAGE="https://github.com/PDB-REDO/libcifpp" # Update components file on every bump -# http://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz +# https://files.wwpdb.org/pub/pdb/data/monomers/components.cif.gz SRC_URI=" https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz @@ -32,7 +32,7 @@ src_configure() { -DBUILD_SHARED_LIBS=ON -DCIFPP_DOWNLOAD_CCD=OFF -DCIFPP_INSTALL_UPDATE_SCRIPT=OFF - -DENABLE_TESTING="$(usex test)" + -DBUILD_TESTING="$(usex test)" ) cmake_src_configure } diff --git a/sci-libs/libcifpp/libcifpp-5.1.1.ebuild b/sci-libs/libcifpp/libcifpp-7.0.4.ebuild index 8d30793f975e..8c10d84a2291 100644 --- a/sci-libs/libcifpp/libcifpp-5.1.1.ebuild +++ b/sci-libs/libcifpp/libcifpp-7.0.4.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 @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="Code to work with mmCIF and PDB files" HOMEPAGE="https://github.com/PDB-REDO/libcifpp" # Update components file on every bump -# ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz +# https://files.wwpdb.org/pub/pdb/data/monomers/components.cif.gz SRC_URI=" https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz @@ -20,19 +20,26 @@ 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_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 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 - -DENABLE_TESTING="$(usex test)" + -DBUILD_TESTING="$(usex test)" ) cmake_src_configure } diff --git a/sci-libs/libdap/libdap-3.20.9.ebuild b/sci-libs/libdap/libdap-3.20.9.ebuild index 94352c46f41f..1692827e92de 100644 --- a/sci-libs/libdap/libdap-3.20.9.ebuild +++ b/sci-libs/libdap/libdap-3.20.9.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 @@ -22,7 +22,7 @@ RDEPEND=" sys-libs/zlib" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - sys-devel/flex + app-alternatives/lex test? ( dev-util/cppunit )" PATCHES=( @@ -36,6 +36,12 @@ src_prepare() { } src_configure() { + # -Werror=lto, -Werror=strict-aliasing + # https://bugs.gentoo.org/878895 + # https://github.com/OPENDAP/libdap4/issues/244 + append-flags -fno-strict-aliasing + filter-lto + # bug 619144 append-cxxflags -std=c++14 diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild index 3b63da935131..d66f3e634af3 100644 --- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild +++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ IUSE="cuda doc hpx mpi opencl opencv qt5 silo" BDEPEND=" doc? ( - app-doc/doxygen + app-text/doxygen app-text/texlive media-gfx/graphviz )" diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml index 5f7c388f3620..fbbe417e9a1c 100644 --- a/sci-libs/libgeodecomp/metadata.xml +++ b/sci-libs/libgeodecomp/metadata.xml @@ -20,12 +20,6 @@ details of the parallel computer. </longdescription> <use> - <flag name="cuda"> - Enables plugins for NVIDIA GPUs - </flag> - <flag name="opencl"> - Enables OpenCL backend - </flag> <flag name="opencv"> Enables OpenCV related code </flag> diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild index 81527b98f2ce..a10ddebd692f 100644 --- a/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild +++ b/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.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 @@ -19,7 +19,7 @@ DEPEND=">=sci-libs/proj-6.0.0:= tiff? ( >=media-libs/tiff-3.9.1:= ) zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/${PN}-1.7.1-gnuinstalldirs.patch diff --git a/sci-libs/libghemical/Manifest b/sci-libs/libghemical/Manifest deleted file mode 100644 index cd9d8ff520a5..000000000000 --- a/sci-libs/libghemical/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libghemical-3.0.0.tar.gz 787947 BLAKE2B ea0bf4c8f257df3d22d5efdede83cea1ad2239692e98c87cdb44c7da3352956d5bc21c2c92f6ab8759cf6b8cad2d6041cb49d4532234ba8ff2d323db583c7d48 SHA512 71531e7bd72a7fa063dd35536a346f15e3c0fd0284112fa2f304580204b93552bd0c9a426cee22044b5dd1662e34e5d191d20af938e474561fe55f2394e7519e diff --git a/sci-libs/libghemical/files/libghemical-2.98-gl.patch b/sci-libs/libghemical/files/libghemical-2.98-gl.patch deleted file mode 100644 index 8cea8aab636e..000000000000 --- a/sci-libs/libghemical/files/libghemical-2.98-gl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/typedef.h b/src/typedef.h -index 8d2efcc..1e304e8 100644 ---- a/src/typedef.h -+++ b/src/typedef.h -@@ -27,7 +27,7 @@ - - // comment this out if you have no GL/gl.h available... - --#define HAVE_GL_H // 2008-07-31 ; also with mingw comment this out??? -+// #define HAVE_GL_H // 2008-07-31 ; also with mingw comment this out??? - - // added by Robert Williams for Compaq cxx, alpha 11/28/01 - diff --git a/sci-libs/libghemical/libghemical-3.0.0.ebuild b/sci-libs/libghemical/libghemical-3.0.0.ebuild deleted file mode 100644 index de7e0299a0dc..000000000000 --- a/sci-libs/libghemical/libghemical-3.0.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Chemical quantum mechanics and molecular mechanics" -HOMEPAGE="http://bioinformatics.org/ghemical/" -SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="mopac7 mpqc static-libs" - -RDEPEND=" - mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) - mpqc? ( - >=sci-chemistry/mpqc-2.3.1-r1 - virtual/blas - virtual/lapack - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-2.98-gl.patch ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --enable-shared \ - $(use_enable mopac7) \ - $(use_enable mpqc) \ - $(use_enable static-libs static) -} diff --git a/sci-libs/libghemical/metadata.xml b/sci-libs/libghemical/metadata.xml deleted file mode 100644 index d7bc678f012b..000000000000 --- a/sci-libs/libghemical/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-chemistry@gentoo.org</email> - <name>Gentoo Chemistry Project</name> - </maintainer> - <longdescription> - Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models - and molecular mechanics models (there is an experimental Tripos 5.2-like force - field for organic molecules). Also a tool for reduced protein models is - included. Geometry optimization, molecular dynamics and a large set of - visualization tools are currently available. - </longdescription> - <use> - <flag name="mopac7">Use <pkg>sci-chemistry/mopac7</pkg> for semi-empirical - calculations</flag> - <flag name="mpqc">Use <pkg>sci-chemistry/mpqc</pkg> for quantum-mechanical - calculations</flag> - </use> -</pkgmetadata> diff --git a/sci-libs/libigl/Manifest b/sci-libs/libigl/Manifest index 810b7df6b33c..f7966dfde000 100644 --- a/sci-libs/libigl/Manifest +++ b/sci-libs/libigl/Manifest @@ -1 +1 @@ -DIST libigl-2.4.0.tar.gz 1124759 BLAKE2B c2ba37192f2603a3ab0052aeb14f7706322364183c297af38ea88af8937bc7d76f0e3cc248a8e88c6bf2ad7ce2d9568d6e446a60c5da905fd4a235a706c4289c SHA512 f9e19c6d9a7fa2afe12c0a4042c3cc46606413d7f79b20e2464021fc0c5d9730e0ab2c192e5b4f161f3bc3a42a654929a2e77baac44c3eddad486f709cf909a1 +DIST libigl-2.5.0.tar.gz 1230536 BLAKE2B c92df589a6e114c33151256945786aa7357d89f32bf4b0dedb3d523e3beef85beed67e926875066c05b899b3dfc70d9f64aeb7674449a2487acaf0f67e9217b3 SHA512 39b92ec4c2479a3c0a8e99b2890643c9d76a7e5b61b485c1a3a5f5abff1da4e62b67b879dbcf6e18a43f98172fc9f87f0a6c92b99e2a1900e6f1d2e809899b11 diff --git a/sci-libs/libigl/libigl-2.4.0.ebuild b/sci-libs/libigl/libigl-2.5.0.ebuild index aeec8b4e51ff..498c245e2cce 100644 --- a/sci-libs/libigl/libigl-2.4.0.ebuild +++ b/sci-libs/libigl/libigl-2.5.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -15,7 +15,6 @@ KEYWORDS="amd64 ~arm64 ~x86" IUSE="static-libs" DEPEND="dev-cpp/eigen:3" - RDEPEND="${DEPEND}" src_configure() { @@ -32,8 +31,9 @@ src_configure() { -DLIBIGL_OPENGL=OFF -DLIBIGL_GLFW=OFF -DLIBIGL_IMGUI=OFF - -DLIBIGL_PNG=OFF + -DLIBIGL_STB=OFF -DLIBIGL_PREDICATES=OFF + -DLIBIGL_SPECTRA=OFF -DLIBIGL_COPYLEFT_TETGEN=OFF -DLIBIGL_RESTRICTED_TRIANGLE=OFF -DLIBIGL_XML=OFF @@ -45,13 +45,13 @@ src_prepare() { cmake_src_prepare # Tries to copy eigen headers into /usr/include - sed -i '/install(DIRECTORY/d' cmake/recipes/external/eigen.cmake || die + sed -e '/install(DIRECTORY/d' -i cmake/recipes/external/eigen.cmake || die } src_install() { - cmake_src_install + cmake_src_install - # Install won't install all headers - insinto /usr/include/ - doins -r include/igl + # Install won't install all headers + insinto /usr/include/ + doins -r include/igl } diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest index f9aba9659d87..037fb5fba076 100644 --- a/sci-libs/libint/Manifest +++ b/sci-libs/libint/Manifest @@ -1,2 +1,3 @@ DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef +DIST libint-2.9.0.tar.gz 21705777 BLAKE2B b2e8f36356f6eb8eff1207ba47c0f3bcc4471bd918cf933d03a1dd97efddd72d65464af743815d8bb633567ba97b19b8629881a5115b14f1630df1be7e6d0304 SHA512 6cffbd3d78dee4722b8085f4dd93085351cb610b5cb7ac090335adb2c43e87256ca06a658c202473fd763a38f7c0eeb6570b2c6a107e3f41d1258baf6e5b17de diff --git a/sci-libs/libint/libint-2.9.0.ebuild b/sci-libs/libint/libint-2.9.0.ebuild new file mode 100644 index 000000000000..f2d1c2fa4e39 --- /dev/null +++ b/sci-libs/libint/libint-2.9.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic fortran-2 toolchain-funcs + +DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions" +HOMEPAGE="https://github.com/evaleev/libint" +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" +IUSE="static-libs doc" + +DEPEND=" + dev-libs/boost + dev-libs/gmp[cxx(+)] + doc? ( + dev-texlive/texlive-latex + dev-tex/latex2html + ) +" + +src_prepare() { + default + eautoreconf + + # bug 725454 + sed -i -e '/RANLIB/d' src/bin/libint/Makefile || die +} + +src_configure() { + # bug #862894 + append-flags -fno-strict-aliasing + filter-lto + + econf \ + --with-cxx="$(tc-getCXX)" \ + --with-cxx-optflags="${CXXFLAGS}" \ + --with-cxxgen-optflags="${CXXFLAGS}" \ + --with-cxxdepend="$(tc-getCXX)" \ + --with-ranlib="$(tc-getRANLIB)" \ + --with-ar="$(tc-getAR)" \ + --with-ld="$(tc-getLD)" \ + --enable-eri=2 --enable-eri3=2 --enable-eri2=2 \ + --with-eri-max-am=7,5,4 --with-eri-opt-am=3 \ + --with-eri3-max-am=7 --with-eri2-max-am=7 \ + --with-g12-max-am=5 --with-g12-opt-am=3 \ + --with-g12dkh-max-am=5 --with-g12dkh-opt-am=3 \ + --enable-contracted-ints \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_compile() { + emake LDFLAGS="${LDFLAGS}" + + use doc && emake html pdf +} + +src_install() { + default + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die "Failed to remove .la files" + fi + + if use doc; then + DOCS=( doc/progman/progman.pdf ) + HTML_DOCS=( doc/progman/progman/*.{html,png,css} ) + einstalldocs + fi +} diff --git a/sci-libs/libmuscle/libmuscle-3.7-r3.ebuild b/sci-libs/libmuscle/libmuscle-3.7-r4.ebuild index d3a8107c1052..1a00a894d11e 100644 --- a/sci-libs/libmuscle/libmuscle-3.7-r3.ebuild +++ b/sci-libs/libmuscle/libmuscle-3.7-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Library for sci-biology/mauve" HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/" @@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="doc static-libs" RDEPEND="!sci-biology/muscle" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/${PV}-bufferoverflow.patch @@ -29,6 +28,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862897 + # Upstream website doesn't load. Nowhere to report bugs to. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf $(use_enable static-libs static) } diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild index 4c8ecb9f5f81..bc3ef11b3d3a 100644 --- a/sci-libs/libnova/libnova-0.16.0.ebuild +++ b/sci-libs/libnova/libnova-0.16.0.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=7 @@ -6,7 +6,7 @@ EAPI=7 inherit autotools DESCRIPTION="Celestial Mechanics and Astronomical Calculation Library" -HOMEPAGE="http://libnova.sourceforge.net/" +HOMEPAGE="https://libnova.sourceforge.net/" SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" LICENSE="LGPL-2" @@ -14,7 +14,7 @@ SLOT="0/0.16" KEYWORDS="amd64 ~hppa ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/${P}-slibtool.patch ) diff --git a/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild b/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild index 9b2c2bb6e60f..d0237a668033 100644 --- a/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild +++ b/sci-libs/liborigin/liborigin-3.0.1_p20210828-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 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug doc tools" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND=" dev-cpp/tree diff --git a/sci-libs/libpdb++/libpdb++-040728-r1.ebuild b/sci-libs/libpdb++/libpdb++-040728-r2.ebuild index c4850098afdf..16b25e83c4af 100644 --- a/sci-libs/libpdb++/libpdb++-040728-r1.ebuild +++ b/sci-libs/libpdb++/libpdb++-040728-r2.ebuild @@ -1,29 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit multilib toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="PDB Record I/O Libraries -- c++ version" HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html" -SRC_URI="mirror://gentoo/${P}.shar" +SRC_URI="mirror://gentoo/f8/${P}.shar" +S=${WORKDIR}/${PN} -SLOT="0" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" -RDEPEND="" -DEPEND="${RDEPEND} - app-arch/sharutils" - -S="${WORKDIR}"/${PN} +BDEPEND="app-arch/sharutils" PATCHES=( "${FILESDIR}"/${P}-dynlib+flags.patch ) src_unpack() { - "${EPREFIX}/usr/bin/unshar" "${DISTDIR}"/${A} || die + edo unshar "${DISTDIR}"/${A} } src_prepare() { diff --git a/sci-libs/libpdb/libpdb-991112-r1.ebuild b/sci-libs/libpdb/libpdb-991112-r2.ebuild index 31d30652f13e..efaba36468dc 100644 --- a/sci-libs/libpdb/libpdb-991112-r1.ebuild +++ b/sci-libs/libpdb/libpdb-991112-r2.ebuild @@ -1,29 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="PDB Record I/O Libraries -- c version" HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html" -SRC_URI="mirror://gentoo/${P}.shar" +SRC_URI="mirror://gentoo/90/${P}.shar" +S=${WORKDIR} -SLOT="0" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" -RDEPEND="" -DEPEND="${RDEPEND} - app-arch/sharutils" - -S="${WORKDIR}" +BDEPEND="app-arch/sharutils" PATCHES=( "${FILESDIR}"/${P}-dynlib+flags.patch ) src_unpack() { - "${EPREFIX}/usr/bin/unshar" "${DISTDIR}"/${A} || die + edo unshar "${DISTDIR}"/${A} } src_prepare() { diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index e8eb145752ec..029cd91e973a 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -2,3 +2,6 @@ DIST libqalculate-4.5.0.tar.gz 2603599 BLAKE2B 142790cf89e97c601b08d553b1f9cd6c1 DIST libqalculate-4.6.1.tar.gz 2610769 BLAKE2B 02ad7371c537bf40d98bb1b32877f0a39394b0723c45e53b00381df2d0d326b79ab39c66238a8e3a89f10aa093f6c12bcc5ae0457f6d65503fb3712a78bb0dfc SHA512 7f03e0f8cc87918b8ec962ce8c85840b644aad02cdd53037d41602198cdcb6567099d175771ff3752fc99fccbc4b180527da5fef68b0059bd1b259c34c57620e DIST libqalculate-4.7.0.tar.gz 2618347 BLAKE2B 1ec01e124d9c96a2651f3e2a82a4eb8ae771b2701d3fd2be0894666e37eccf1e15e779ccfb96ff866c3e3d5a625ca8884961b505f30d34310be1efe69f0ba1d1 SHA512 d72754f00e26daa0afc1357cc30571b5dae28d7f5f79bcdba2f159644216288df20e5a518457fb244fd3057935f7d800a3e95bdf0f04929353841cc8371be138 DIST libqalculate-4.8.0.tar.gz 2625669 BLAKE2B 957adcc6b5dabee4d9d6a593a4d5c894e6db05856875a241b1090bada49a0c802c94076a347df6b9b60d088edcba6f5e50ffa0d4a4517ead6da9cebc2f02c592 SHA512 db41bf883520d72f5d7c80b78492aba5367e74a6c5c452a420d6ecc79ae8f1dfa208c13bfff96ea699d31189cc49c264cf1b543946e4ec39b9df97a386c215ea +DIST libqalculate-4.8.1.tar.gz 2625564 BLAKE2B 017188bd43da03c398ed17e883f460637d1af35df9643ac62c938f5aa189431fee49143d517c2d4489c4cca030f1220129f9dfce448969a9601c74273bfdb1a9 SHA512 e4e3f884ac42b706ee79f8fa37fbff69a30dc3f24edbe66b259507723dc3f028243acea4cb29dd68d933e7e357a55207aaf619fe9f66caa118a212de06c2a8d4 +DIST libqalculate-5.0.0.tar.gz 2674322 BLAKE2B 1ae2203c4443b57198a0e7862361f732ae8428cb6b55942f9ff9984f0956c5a2cda3fd9f5a49fa98c10526879e9ce2751a9e5c33d1e6092503640da13844df0d SHA512 d3467e79e1454a76ee0c4d8795241c105d42580f95321e24b0657d99535ed8827809cc7ec0474c9e75cd668158aa84a500e5bd3a92dd0f4a3d1e4fc91811c399 +DIST libqalculate-5.0.0b.tar.gz 2674304 BLAKE2B 8f41f141aedac2f1ccdd8b48182f972b29ae2835b1a4844ba076112754061f06970817ec3e1248c50c3c9792d41927e277b05bd8933b9a63446e0d56d5449a8b SHA512 88bddd961fca48b0c971ba035cd295d642aac009164654b0c6b18e1c72892c69614f3dd90d5b851c05dfab41fda9a6dd18fbaecac9d28bfed387a7063280ebc7 diff --git a/sci-libs/libqalculate/libqalculate-4.8.1.ebuild b/sci-libs/libqalculate/libqalculate-4.8.1.ebuild new file mode 100644 index 000000000000..11f18e6d5570 --- /dev/null +++ b/sci-libs/libqalculate/libqalculate-4.8.1.ebuild @@ -0,0 +1,79 @@ +# 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 toolchain-funcs + +DESCRIPTION="A modern multi-purpose calculator library" +HOMEPAGE="https://qalculate.github.io/" +SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +# SONAME changes pretty often on bumps. Check! +SLOT="0/22" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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 + + 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) \ + $(use_with readline) +} + +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.0.0.ebuild b/sci-libs/libqalculate/libqalculate-5.0.0.ebuild new file mode 100644 index 000000000000..685c8d1d9967 --- /dev/null +++ b/sci-libs/libqalculate/libqalculate-5.0.0.ebuild @@ -0,0 +1,79 @@ +# 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 toolchain-funcs + +DESCRIPTION="A modern multi-purpose calculator library" +HOMEPAGE="https://qalculate.github.io/" +SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +# SONAME changes pretty often on bumps. Check! +SLOT="0/22" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 + + 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) \ + $(use_with readline) +} + +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.0.0b.ebuild b/sci-libs/libqalculate/libqalculate-5.0.0b.ebuild new file mode 100644 index 000000000000..d7ef99549ebe --- /dev/null +++ b/sci-libs/libqalculate/libqalculate-5.0.0b.ebuild @@ -0,0 +1,81 @@ +# 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 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 + + 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) \ + $(use_with readline) +} + +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/libsc/Manifest b/sci-libs/libsc/Manifest index fdfb64071d01..424976397546 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,2 +1,3 @@ DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117 DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b +DIST libsc-2.8.6.tar.gz 436045 BLAKE2B e0c9911ece10703d70686c5fa67700ed28f2ad2cfa6fc5e8f31c18fadb3e85c82a062520765589f71fbb8b69f2ebc9d07803488e8b0eae50d3146cefddb6c1ad SHA512 9e8d9256fafce3a583a9dc850308020ae614434e94146dc81bd1b8a3130e6ff55eb094d97fe48bf2b9205ea16906503313f1ebf4f3386db92d6cf0bac50c2d74 diff --git a/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch new file mode 100644 index 000000000000..ed0f30a1a7c8 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ebf6ef..0a14b19 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ HOMEPAGE_URL https://www.p4est.org/ + DESCRIPTION "The SC library supports parallel scientific applications." + VERSION ${PROJECT_VERSION}) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + enable_testing() + + include(GNUInstallDirs) +@@ -63,7 +65,10 @@ TYPE INCLUDE + FILES_MATCHING PATTERN "*.h" + ) + +-install(TARGETS sc EXPORT ${PROJECT_NAME}-targets) ++install(TARGETS sc EXPORT ${PROJECT_NAME}-targets ++ARCHIVE DESTINATION ${library_reldir} ++LIBRARY DESTINATION ${library_reldir} ++) + + add_subdirectory(src) + diff --git a/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch b/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch new file mode 100644 index 000000000000..6c8b65f32215 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch @@ -0,0 +1,40 @@ +diff --git a/cmake/install.cmake b/cmake/install.cmake +index edd8012..93f9301 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion + + install(EXPORT ${PROJECT_NAME}-targets + NAMESPACE ${PROJECT_NAME}:: +-DESTINATION cmake ++DESTINATION ${library_reldir}/cmake/SC + ) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake +-DESTINATION cmake ++DESTINATION ${library_reldir}/cmake/SC + ) + + export(EXPORT ${PROJECT_NAME}-targets +diff --git a/cmake/pkgconf.cmake b/cmake/pkgconf.cmake +index 1a1b865..f5bab08 100644 +--- a/cmake/pkgconf.cmake ++++ b/cmake/pkgconf.cmake +@@ -17,14 +17,4 @@ set(pc_filename libsc-${git_version}.pc) + configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconf.pc.in ${pc_filename} @ONLY) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pc_filename} +- DESTINATION lib/pkgconfig) +- +-set(pc_target ${pc_filename}) +-set(pc_link ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/libsc.pc) +- +-install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ +- ${pc_target} \ +- ${pc_link} \ +- )" +- ) ++ DESTINATION ${library_reldir}/pkgconfig) diff --git a/sci-libs/libsc/files/libsc-2.8.6-set_version.patch b/sci-libs/libsc/files/libsc-2.8.6-set_version.patch new file mode 100644 index 000000000000..c37943e21c15 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.6-set_version.patch @@ -0,0 +1,48 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index 4718b8e..c2c594d 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,39 +1,6 @@ + # --- 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 ${PROJECT_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(PROJECT_MAJOR 2) ++set(PROJECT_MINOR 8) ++set(PROJECT_PATCH 6) ++set(PROJECT_VERSION 2.8.6) diff --git a/sci-libs/libsc/libsc-2.8.6.ebuild b/sci-libs/libsc/libsc-2.8.6.ebuild new file mode 100644 index 000000000000..19acc8bc484f --- /dev/null +++ b/sci-libs/libsc/libsc-2.8.6.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Support for parallel scientific applications" +HOMEPAGE="http://www.p4est.org/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="debug examples mpi openmp threads" + +RDEPEND=" + sys-apps/util-linux + sys-libs/zlib + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-set_version.patch + "${FILESDIR}"/${P}-fix_build_system.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 + +# rm -r "${ED}"/usr/include/getopt.h \ +# "${ED}"/usr/include/getopt_int.h \ +# "${ED}"/usr/include/sc_builtin || die "rm failed" + + mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${PF}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" +} diff --git a/sci-libs/libsemigroups/Manifest b/sci-libs/libsemigroups/Manifest new file mode 100644 index 000000000000..1f3974c71a46 --- /dev/null +++ b/sci-libs/libsemigroups/Manifest @@ -0,0 +1 @@ +DIST libsemigroups-2.7.3.tar.gz 2543883 BLAKE2B 02700cb9f132d7121ce42f978e9a1c01ed9f1957fab0da45c60837240639f7a049d3b7e1f9b989be71de8b85a669b475733aeb0e96760eda846b50db903da895 SHA512 001cfdfc55ee9a0bb3fe0914229905083e8eaaec682952bb23b2dc44680631909478bf32e67e93488a7347bfb674305b0cc3b713afa9bce1997a0b1a5693ad36 diff --git a/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild b/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild new file mode 100644 index 000000000000..04bbfd48d7b9 --- /dev/null +++ b/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="C++ library for semigroups and monoids" +HOMEPAGE="https://github.com/libsemigroups/libsemigroups" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + +# Source headers have "or any later version" +LICENSE="GPL-3+" +SLOT="0/2" +KEYWORDS="~amd64 ~x86" +IUSE="cpu_flags_x86_popcnt" + +src_configure() { + econf \ + $(use_enable cpu_flags_x86_popcnt popcnt) \ + --disable-eigen \ + --disable-hpcombi \ + --disable-fmt +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sci-libs/libsemigroups/metadata.xml b/sci-libs/libsemigroups/metadata.xml new file mode 100644 index 000000000000..77788e074722 --- /dev/null +++ b/sci-libs/libsemigroups/metadata.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>frp.bissey@gmail.com</email> + <name>François Bissey</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>sci-mathematics@gentoo.org</email> + <name>Gentoo Mathematics Project</name> + </maintainer> + <longdescription lang="en"> + libsemigroups is a C++14 library containing implementations of + several algorithms for computing finite, and finitely presented, + semigroups and monoids. Namely: + + * the Froidure-Pin algorithm for computing finite semigroups; + * the Todd-Coxeter algorithm for finitely presented semigroups + and monoids; + * the Knuth-Bendix algorithm for finitely presented semigroups + and monoids; + * the Schreier-Sims algorithm for permutation groups; + * a preliminary implementation of the Konieczny and Lallement- + McFadden algorithm for computing finite semigroups which act + on sets; + * an implementation of the Radoszewski-Rytter algorithm for + testing equivalence of words in free bands; + * an implementation of the algorithm for solving the word problem + for small overlap monoids, and for computing normal forms in + such monoids; + * a version of Sims low index subgroup algorithm for computing + one-sided congruences of a semigroup or monoid; + * a version of Stephen's procedure for finitely presented + semigroups and monoids (for a given word w this procedure + is for determining words equivalent to w or that are left + divisors of w). + </longdescription> + <upstream> + <remote-id type="github">libsemigroups/libsemigroups</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch new file mode 100644 index 000000000000..a4c1be8de96a --- /dev/null +++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch @@ -0,0 +1,46 @@ +http://sigrok.org/gitweb/?p=libsigrok.git;a=commit;h=5bc8174531df86991ba8aa6d12942923925d9e72 + +From: Gerhard Sittig <redacted> +Date: Mon, 2 Oct 2023 16:33:08 +0000 (+0200) +Subject: bindings/python: rephrase for Python 3.9 deprecation (call API) +X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=5bc8174531df86991ba8aa6d12942923925d9e72;hp=1711287ee9e5e4d37cab1cf9fcda5c98f732a137 + +bindings/python: rephrase for Python 3.9 deprecation (call API) + +The PyEval_CallObject() routine was deprecated in Python 3.9, use +PyObject_CallObject() instead which has existed since at least 3.0. + +There are also PyEval_InitThreads() deprecation warnings, but these +originate from SWIG generated code and are outside of our control. +Requires SWIG version 4.1 to silence these. + +Tested-By: Sascha Silbe <redacted> +--- a/bindings/python/sigrok/core/classes.i ++++ b/bindings/python/sigrok/core/classes.i +@@ -134,7 +134,7 @@ typedef guint pyg_flags_type; + + auto arglist = Py_BuildValue("(OO)", log_obj, string_obj); + +- auto result = PyEval_CallObject($input, arglist); ++ auto result = PyObject_CallObject($input, arglist); + + Py_XDECREF(arglist); + Py_XDECREF(log_obj); +@@ -177,7 +177,7 @@ typedef guint pyg_flags_type; + $1 = [=] () { + const auto gstate = PyGILState_Ensure(); + +- const auto result = PyEval_CallObject($input, nullptr); ++ const auto result = PyObject_CallObject($input, nullptr); + const bool completed = !PyErr_Occurred(); + const bool valid_result = (completed && result == Py_None); + +@@ -221,7 +221,7 @@ typedef guint pyg_flags_type; + + auto arglist = Py_BuildValue("(OO)", device_obj, packet_obj); + +- auto result = PyEval_CallObject($input, arglist); ++ auto result = PyObject_CallObject($input, arglist); + + Py_XDECREF(arglist); + Py_XDECREF(device_obj); diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild deleted file mode 100644 index 96bc45edf8d2..000000000000 --- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" -HOMEPAGE="https://sigrok.org/wiki/Libsigrok" - -LICENSE="GPL-3" -SLOT="0/4" -IUSE="bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb" -REQUIRED_USE="java? ( cxx ) - python? ( cxx ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -# We also support librevisa, but that isn't in the tree ... -LIB_DEPEND=" - >=dev-libs/glib-2.32.0[static-libs(+)] - >=dev-libs/libzip-0.8:=[static-libs(+)] - bluetooth? ( >=net-wireless/bluez-4.0:= ) - cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) - ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) - hidapi? ( >=dev-libs/hidapi-0.8.0 ) - parport? ( sys-libs/libieee1284[static-libs(+)] ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] - ) - serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) - usb? ( virtual/libusb:1[static-libs(+)] ) -" -RDEPEND=" - java? ( >=virtual/jre-1.8:* ) - !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( ${LIB_DEPEND} ) -" -DEPEND="${LIB_DEPEND//\[static-libs(+)]} - cxx? ( app-doc/doxygen ) - java? ( - >=dev-lang/swig-3.0.6 - >=virtual/jdk-1.8:* - ) - python? ( - >=dev-lang/swig-3.0.6 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - ) - test? ( >=dev-libs/check-0.9.4 ) - virtual/pkgconfig -" - -S="${WORKDIR}"/${P} - -PATCHES=( - # https://sigrok.org/bugzilla/show_bug.cgi?id=1527 - "${FILESDIR}/${P}-swig-4.patch" - # https://sigrok.org/bugzilla/show_bug.cgi?id=1526 - "${FILESDIR}/${P}-check-0.15.patch" -) - -pkg_setup() { - use python && python_setup - java-pkg-opt-2_pkg_setup -} - -src_unpack() { - [[ ${PV} == *9999* ]] && git-r3_src_unpack || default -} - -sigrok_src_prepare() { - eautoreconf -} - -src_prepare() { - default - sigrok_src_prepare - use python && python_copy_sources -} - -sigrok_src_configure() { - econf \ - $(use_with bluetooth libbluez) \ - $(use_with ftdi libftdi) \ - $(use_with hidapi libhidapi) \ - $(use_with parport libieee1284) \ - $(use_with serial libserialport) \ - $(use_with usb libusb) \ - $(use_enable cxx) \ - $(use_enable java) \ - $(use_enable static-libs static) \ - "${@}" -} - -each_python_configure() { - cd "${BUILD_DIR}" - sigrok_src_configure --disable-ruby --enable-python -} - -src_configure() { - sigrok_src_configure --disable-ruby --disable-python - use python && python_foreach_impl each_python_configure -} - -each_python_compile() { - cd "${BUILD_DIR}" - emake python-build -} - -src_compile() { - default - use python && python_foreach_impl each_python_compile -} - -src_test() { - emake check -} - -each_python_install() { - cd "${BUILD_DIR}" - emake python-install DESTDIR="${D}" - python_optimize -} - -src_install() { - default - use python && python_foreach_impl each_python_install - use udev && udev_dorules contrib/*.rules - find "${D}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - udev_reload -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - udev_reload -} diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild index 8da4999fe538..61b96e87fe2a 100644 --- a/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.5.2-r5.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..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" @@ -48,7 +48,7 @@ RDEPEND=" static-libs? ( ${LIB_DEPEND} ) " DEPEND="${LIB_DEPEND//\[static-libs(+)]} - cxx? ( app-doc/doxygen ) + cxx? ( app-text/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.8:* @@ -71,6 +71,8 @@ PATCHES=( "${FILESDIR}/${P}-check-0.15.patch" # https://bugs.gentoo.org/878395 "${FILESDIR}/${PN}-0.5.2-swig-4.1.patch" + + "${FILESDIR}/${P}-py313.patch" ) pkg_setup() { diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild index 242b275a45d7..951d87e75bb6 100644 --- a/sci-libs/libsigrok/libsigrok-9999.ebuild +++ b/sci-libs/libsigrok/libsigrok-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..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-r1 java-pkg-opt-2 udev xdg-utils @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 autotools else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" @@ -49,7 +49,7 @@ RDEPEND=" static-libs? ( ${LIB_DEPEND} ) " DEPEND="${LIB_DEPEND//\[static-libs(+)]} - cxx? ( app-doc/doxygen ) + cxx? ( app-text/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.8:* diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch new file mode 100644 index 000000000000..89078b3ba70e --- /dev/null +++ b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch @@ -0,0 +1,37 @@ +http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff;h=0c35c5c5845d05e5f624c99d58af992d2f004446 + +From: Sascha Silbe <redacted> +Date: Mon, 23 Oct 2023 20:21:38 +0000 (+0200) +Subject: srd: drop deprecated PyEval_InitThreads() on Python 3.9+ +X-Git-Url: http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=0c35c5c5845d05e5f624c99d58af992d2f004446 + +srd: drop deprecated PyEval_InitThreads() on Python 3.9+ + +`PyEval_InitThreads()` is called implicitly during `Py_InitializeEx()` +since Python 3.7. It has been deprecated since 3.9 and dropped in +3.13. + +[ gsi: touch up comment style ] +--- + +diff --git a/srd.c b/srd.c +index 35ec5f2..10dfaf6 100644 +--- a/srd.c ++++ b/srd.c +@@ -302,8 +302,14 @@ SRD_API int srd_init(const char *path) + g_strfreev(dir_list); + } + +- /* Initialize the Python GIL (this also happens to acquire it). */ ++#if PY_VERSION_HEX < 0x03090000 ++ /* ++ * Initialize and acquire the Python GIL. In Python 3.7+ this ++ * will be done implicitly as part of the Py_InitializeEx() ++ * call above. PyEval_InitThreads() was deprecated in 3.9. ++ */ + PyEval_InitThreads(); ++#endif + + /* Release the GIL (ignore return value, we don't need it here). */ + (void)PyEval_SaveThread(); + diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild index 617e1edb0d21..72015cba5833 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild +++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.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..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools python-single-r1 if [[ ${PV} == *9999* ]]; then diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild new file mode 100644 index 000000000000..0e58fddc4fb2 --- /dev/null +++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{10..13} ) +inherit autotools python-single-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="git://sigrok.org/${PN}" + inherit git-r3 +else + SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Provide (streaming) protocol decoding functionality" +HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode" + +LICENSE="GPL-3" +SLOT="0/4" +IUSE="static-libs" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-libs/glib-2.34.0 +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-py3.13.patch +) + +src_prepare() { + default + + # bug #794592 + sed -i -e "s/\[SRD_PKGLIBS\],\$/& [python-${EPYTHON#python}-embed], [python-${EPYTHON#python}],/" configure.ac || die + + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) PYTHON3="${PYTHON}" +} + +src_test() { + emake check +} + +src_install() { + default + python_optimize "${D}"/usr/share/libsigrokdecode/decoders + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild index 8f04c30aebba..193ac833026d 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild +++ b/sci-libs/libsigrokdecode/libsigrokdecode-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..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools python-single-r1 if [[ ${PV} == *9999* ]]; then @@ -18,7 +18,7 @@ DESCRIPTION="Provide (streaming) protocol decoding functionality" HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode" LICENSE="GPL-3" -SLOT="0/9999" +SLOT="0/4" IUSE="static-libs" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild index 7911fe92a05f..11ffc49a6b58 100644 --- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild +++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P LICENSE="MIT" SLOT="0/6" -KEYWORDS="amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sci-libs/libticables2/libticables2-1.3.5.ebuild b/sci-libs/libticables2/libticables2-1.3.5-r1.ebuild index 0e42cb2ab1a4..f71abc217606 100644 --- a/sci-libs/libticables2/libticables2-1.3.5.ebuild +++ b/sci-libs/libticables2/libticables2-1.3.5-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="Library to handle different link cables for TI calculators" HOMEPAGE="http://lpg.ticalc.org/prj_tilp/" -SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -17,11 +17,13 @@ IUSE="debug doc nls static-libs usb" RDEPEND=" dev-libs/glib:2 usb? ( virtual/libusb:1 ) - nls? ( virtual/libintl )" - -DEPEND="${RDEPEND} + nls? ( virtual/libintl ) +" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt ) @@ -31,23 +33,24 @@ src_prepare() { } src_configure() { - # --disable-libusb $(use_enable usb libusb10) would enable virtual/libusb:1 - econf \ - --disable-rpath \ - $(use_enable static-libs static) \ - $(use_enable debug logging) \ - $(use_enable nls) \ - $(use_enable usb libusb) \ + local myeconfargs=( + --disable-rpath + $(use_enable static-libs static) + $(use_enable debug logging) + $(use_enable nls) + $(use_enable usb libusb) $(use_enable usb libusb10) + ) + econf "${myeconfargs[@]}" } src_install() { use doc && HTML_DOCS+=( docs/html/. ) default - find "${D}" -name '*.la' -delete || die + find "${D}" -type f -name '*.la' -delete || die } pkg_postinst() { - elog "Please read README in ${EROOT%/}/usr/share/doc/${PF}" + elog "Please read README in ${EROOT}/usr/share/doc/${PF}" elog "if you encounter any problem with a link cable" } diff --git a/sci-libs/libticalcs2/files/0001-libticalcs-fix-erroneous-bashism-in-configure-script.patch b/sci-libs/libticalcs2/files/0001-libticalcs-fix-erroneous-bashism-in-configure-script.patch new file mode 100644 index 000000000000..7cf0f173af34 --- /dev/null +++ b/sci-libs/libticalcs2/files/0001-libticalcs-fix-erroneous-bashism-in-configure-script.patch @@ -0,0 +1,39 @@ +From e27900a6b30f35b1a586b171603047fec3f39990 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Fri, 29 Mar 2024 01:48:47 -0400 +Subject: [PATCH] libticalcs: fix erroneous bashism in configure script + +configure scripts are POSIX /bin/sh scripts and cannot have +bash-specific syntax. The `test xxx == yyy` construct with double equals +is a bash-specific alias for single equals. It does exactly the same +thing as single equals -- it provides no additional functionality, no +behavior changes, it is *exactly* the same but with an additional +alternate spelling. In exchange for doing nothing, it breaks muscle +memory when writing POSIX sh scripts and tricks developers into writing +the wrong thing. + +It should never be used under any circumstances. Ideally it would be +removed altogether from GNU bash. + +Bug: https://bugs.gentoo.org/723452 +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + libticalcs/trunk/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libticalcs/trunk/configure.ac b/libticalcs/trunk/configure.ac +index 3ec257ed..42588f9f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -180,7 +180,7 @@ esac + AC_ARG_VAR([CXX_FOR_BUILD], [C++ compiler for programs to be run on the build system]) + AC_ARG_VAR([CXXFLAGS_FOR_BUILD], [C++ compiler flags for CXX_FOR_BUILD]) + AC_MSG_CHECKING([for the host compiler]) +-if test "x$build" == "x$host" ; then ++if test "x$build" = "x$host" ; then + # Not cross-compiling. + CXX_FOR_BUILD=$CXX + CXXFLAGS_FOR_BUILD=$CXXFLAGS +-- +2.43.2 + diff --git a/sci-libs/libticalcs2/libticalcs2-1.1.9.ebuild b/sci-libs/libticalcs2/libticalcs2-1.1.9-r1.ebuild index fe2478ec3c3a..8c63dfed0262 100644 --- a/sci-libs/libticalcs2/libticalcs2-1.1.9.ebuild +++ b/sci-libs/libticalcs2/libticalcs2-1.1.9-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Library for communication with TI calculators" HOMEPAGE="http://lpg.ticalc.org/prj_tilp/" -SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc nls static-libs" RDEPEND=" @@ -20,18 +20,29 @@ RDEPEND=" >=sci-libs/libticonv-1.1.3 >=sci-libs/libtifiles2-1.1.5 nls? ( virtual/libintl )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt ) +PATCHES=( + # https://github.com/debrouxl/tilibs/pull/87 + "${FILESDIR}"/0001-libticalcs-fix-erroneous-bashism-in-configure-script.patch +) + src_prepare() { default eautoreconf } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927586 + filter-lto + econf \ --disable-rpath \ $(use_enable static-libs static) \ diff --git a/sci-libs/libticonv/libticonv-1.1.5.ebuild b/sci-libs/libticonv/libticonv-1.1.5-r1.ebuild index b4bd611bce5c..28a04dada505 100644 --- a/sci-libs/libticonv/libticonv-1.1.5.ebuild +++ b/sci-libs/libticonv/libticonv-1.1.5-r1.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="Charset conversion library for TI calculators" HOMEPAGE="http://lpg.ticalc.org/prj_tilp/" -SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc iconv static-libs" -RDEPEND="dev-libs/glib:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="dev-libs/glib:2" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt ) diff --git a/sci-libs/libtifiles2/libtifiles2-1.1.7.ebuild b/sci-libs/libtifiles2/libtifiles2-1.1.7-r1.ebuild index 158a6d79c8b8..c1ac4f11883b 100644 --- a/sci-libs/libtifiles2/libtifiles2-1.1.7.ebuild +++ b/sci-libs/libtifiles2/libtifiles2-1.1.7-r1.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="Library for TI calculator files" HOMEPAGE="http://lpg.ticalc.org/prj_tilp/" -SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc nls static-libs" RDEPEND=" - app-arch/libarchive + app-arch/libarchive:= dev-libs/glib:2 >=sci-libs/libticables2-1.3.3 >=sci-libs/libticonv-1.1.3 - nls? ( virtual/libintl )" - -DEPEND="${RDEPEND} + nls? ( virtual/libintl ) +" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt ) @@ -39,7 +41,7 @@ src_configure() { } src_install() { - use doc && HTML_DOCS=( docs/html/. ) + use doc && local HTML_DOCS=( docs/html/. ) default find "${D}" -name '*.la' -delete || die } diff --git a/sci-libs/linbox/Manifest b/sci-libs/linbox/Manifest index 11458f317018..ff1b73d45618 100644 --- a/sci-libs/linbox/Manifest +++ b/sci-libs/linbox/Manifest @@ -1 +1 @@ -DIST linbox-1.6.3.tar.gz 1968034 BLAKE2B 55fb83db7da375d8d97f2567c6a120ac48fefc41eb02db68152cc32f1f16009b8c8108a07bbc68087ad2ef3279108db61b48b805c9ce39f4c5f0072ab6e96304 SHA512 ccef3b4c7b9d8f999e5e4ce4e544f22cd869154513827501ecb7e1abf132ff585dfb3315cced963abe842feecda9331dda9081efb3948987365d338223a8305c +DIST linbox-1.7.0.tar.gz 2258420 BLAKE2B a416e7ab138c6f3f4778a00c0c1eb46aa0a5b26d84f19a2df93e9f8959d3237e5f298f8013f9414f66605c08eebd7d632f71dcdef7080c8df814afcd2de34456 SHA512 cb4e848186d1f6357f498d1e3bda6484b4c789c02440f9614a227a2ae206a31fb20b32be40bda74da3f2f8f981bbd58d80fc97c95499b5151bb06eafb867ef9e diff --git a/sci-libs/linbox/files/linbox-1.6.3-pc.patch b/sci-libs/linbox/files/linbox-1.6.3-pc.patch deleted file mode 100644 index de0025108b89..000000000000 --- a/sci-libs/linbox/files/linbox-1.6.3-pc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8fb95a5dba51fbfcd37db10da4db69d518f7b0f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <frp.bissey@gmail.com> -Date: Fri, 24 Apr 2020 14:10:05 +1200 -Subject: [PATCH] Remove @LINBOX_SAGE@ from linbox.pc.in. linbox_sage is gone - and the string stays as garbage in the final .pc file. - ---- - linbox.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linbox.pc.in b/linbox.pc.in -index f54285e..1f83834 100644 ---- a/linbox.pc.in -+++ b/linbox.pc.in -@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library - URL: http://github.com/linbox-team/linbox - Version: @VERSION@ - Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0 --Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ -+Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ - Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@ @IML_CFLAGS@ @FLINT_CFLAGS@ - \------------------------------------------------------- --- -2.26.2 - diff --git a/sci-libs/linbox/files/linbox-1.7.0-gcc14.patch b/sci-libs/linbox/files/linbox-1.7.0-gcc14.patch new file mode 100644 index 000000000000..f35f1072955d --- /dev/null +++ b/sci-libs/linbox/files/linbox-1.7.0-gcc14.patch @@ -0,0 +1,433 @@ +https://bugs.gentoo.org/930923 +https://github.com/linbox-team/linbox/commit/b8f2d4ccdc0af4418d14f72caf6c4d01969092a3 +https://src.fedoraproject.org/rpms/linbox/c/7389d46e81dc00dcb952b2ccbbbec3fb4fcc6c8b + +From c614c401386ee8db014a9be56244888f7b282a18 Mon Sep 17 00:00:00 2001 +From: Jean-Guillaume Dumas <Jean-Guillaume.Dumas@imag.fr> +Date: Fri, 26 Jan 2024 16:31:56 +0100 +Subject: [PATCH] const_cast missing faster empty init + +--- + linbox/algorithms/gauss/gauss-nullspace.inl | 10 +- + .../matrix/sparsematrix/sparse-ell-matrix.h | 8 +- + .../matrix/sparsematrix/sparse-ellr-matrix.h | 18 +-- + linbox/ring/ntl/ntl-lzz_p.h | 11 +- + linbox/ring/ntl/ntl-lzz_pe.h | 143 +++++++++--------- + linbox/ring/ntl/ntl-zz_px.h | 6 + + 6 files changed, 104 insertions(+), 92 deletions(-) + +diff --git a/linbox/algorithms/gauss/gauss-nullspace.inl b/linbox/algorithms/gauss/gauss-nullspace.inl +index 0b70e1d7c..2d6032563 100644 +--- a/linbox/algorithms/gauss/gauss-nullspace.inl ++++ b/linbox/algorithms/gauss/gauss-nullspace.inl +@@ -2,7 +2,7 @@ + * Copyright (C) LinBox 2008 + * + * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas@imag.fr> +- * Time-stamp: <27 Aug 20 15:17:09 Jean-Guillaume.Dumas@imag.fr> ++ * Time-stamp: <26 Jan 24 16:05:55 Jean-Guillaume.Dumas@imag.fr> + * + * + * ========LICENCE======== +@@ -104,11 +104,11 @@ namespace LinBox + + Permutation<Field> P(field(),(int)Nj); + +- // A.write( std::cerr << "A:=", Tag::FileFormat::Maple ) << ';' << std::endl; ++// A.write( std::cerr << "A:=", Tag::FileFormat::Maple ) << ';' << std::endl; + this->InPlaceLinearPivoting(Rank, Det, A, P, Ni, Nj ); + +- // P.write( std::cerr << "P:=", Tag::FileFormat::Maple ) << ';' << std::endl; +- // A.write( std::cerr << "Ua:=", Tag::FileFormat::Maple ) << ';' << std::endl; ++// P.write( std::cerr << "P:=", Tag::FileFormat::Maple ) << ';' << std::endl; ++// A.write( std::cerr << "Ua:=", Tag::FileFormat::Maple ) << ';' << std::endl; + + for(size_t i=0; i< Ni; ++i) { + if (A[i].size() == 0) { +@@ -123,7 +123,7 @@ namespace LinBox + } + } + +- // A.write( std::cerr << "Ub:=", Tag::FileFormat::Maple ) << ';' << std::endl; ++// A.write( std::cerr << "Ub:=", Tag::FileFormat::Maple ) << ';' << std::endl; + + return this->nullspacebasis(x, Rank, A, P); + } +diff --git a/linbox/matrix/sparsematrix/sparse-ell-matrix.h b/linbox/matrix/sparsematrix/sparse-ell-matrix.h +index 59006d6c5..2604f47b8 100644 +--- a/linbox/matrix/sparsematrix/sparse-ell-matrix.h ++++ b/linbox/matrix/sparsematrix/sparse-ell-matrix.h +@@ -1210,10 +1210,10 @@ namespace LinBox + _colid_beg = iter._colid_beg ; + _colid_it = iter._colid_it ; + _data_it = iter._data_it ; +- _data_beg = iter._data_beg ; +- _data_end = iter._data_end ; +- _field = iter._field ; +- _ld = iter._ld ; ++ const_cast<data_it>(_data_beg) = iter._data_beg ; ++ const_cast<data_it>(_data_end) = iter._data_end ; ++ const_cast<Field &>(_field) = iter._field ; ++ const_cast<size_t&>(ld) = iter._ld ; + _row = iter._row ; + + return *this; +diff --git a/linbox/matrix/sparsematrix/sparse-ellr-matrix.h b/linbox/matrix/sparsematrix/sparse-ellr-matrix.h +index 498a5525d..a60943868 100644 +--- a/linbox/matrix/sparsematrix/sparse-ellr-matrix.h ++++ b/linbox/matrix/sparsematrix/sparse-ellr-matrix.h +@@ -1102,11 +1102,11 @@ namespace LinBox + _Iterator &operator = (const _Iterator &iter) + { + _data_it = iter._data_it ; +- _data_beg = iter._data_beg ; +- _data_end = iter._data_end ; +- _field = iter._field ; +- _rowid = iter._rowid; +- _ld = iter._ld ; ++ const_cast<element_iterator>(_data_beg) = iter._data_beg ; ++ const_cast<element_iterator>(_data_end)= iter._data_end ; ++ const_cast<Field &>(_field) = iter._field ; ++ const_cast<std::vector<size_t>&>(_rowid) = iter._rowid; ++ const_cast<size_t&>(ld) = iter._ld ; + _row = iter._row ; + + return *this; +@@ -1252,10 +1252,10 @@ namespace LinBox + _colid_beg = iter._colid_beg ; + _colid_it = iter._colid_it ; + _data_it = iter._data_it ; +- _data_beg = iter._data_beg ; +- _data_end = iter._data_end ; +- _field = iter._field ; +- _ld = iter._ld ; ++ const_cast<data_it>(_data_beg) = iter._data_beg ; ++ const_cast<data_it>(_data_end) = iter._data_end ; ++ const_cast<Field &>(_field) = iter._field ; ++ const_cast<size_t&>(ld)= iter._ld ; + _row = iter._row ; + + return *this; +diff --git a/linbox/ring/ntl/ntl-lzz_p.h b/linbox/ring/ntl/ntl-lzz_p.h +index 201baaa35..def3a23f7 100644 +--- a/linbox/ring/ntl/ntl-lzz_p.h ++++ b/linbox/ring/ntl/ntl-lzz_p.h +@@ -85,7 +85,7 @@ namespace Givaro + * @param x reference to Integer to contain output (reference returned). + * @param y constant reference to field element. + */ +- template <> ++ template <> + Integer& Caster(Integer& x, const NTL::zz_p& y) + { + return x = int64_t(rep(y)); +@@ -130,7 +130,7 @@ namespace LinBox + typedef NTL::zz_p Element ; + typedef Givaro::UnparametricOperations<Element> Father_t ; + typedef UnparametricRandIter<NTL::zz_p> RandIter; +- ++ + const Element zero,one,mOne ; + + +@@ -145,6 +145,11 @@ namespace LinBox + ,zero( NTL::to_zz_p(0)),one( NTL::to_zz_p(1)),mOne(-one) + {} + ++ Element &init (Element &x) const ++ { ++ return x = NTL::to_zz_p(0); ++ } ++ + Element& init(Element& x, const double& y) const + { + double z = fmod(y,(double)Element::modulus()); +@@ -153,7 +158,7 @@ namespace LinBox + return x = NTL::to_zz_p(static_cast<long>(z)); //rounds towards 0 + } + +- Element &init (Element &x, const integer &y=0) const ++ Element &init (Element &x, const integer &y) const + { + NTL::ZZ tmp= NTL::to_ZZ(std::string(y).data()); + return x = NTL::to_zz_p(tmp); +diff --git a/linbox/ring/ntl/ntl-lzz_pe.h b/linbox/ring/ntl/ntl-lzz_pe.h +index 60b132a06..d53444b69 100644 +--- a/linbox/ring/ntl/ntl-lzz_pe.h ++++ b/linbox/ring/ntl/ntl-lzz_pe.h +@@ -96,18 +96,18 @@ namespace LinBox + NTL::zz_pE::init(irredPoly); + _f = irredPoly; + } +- ++ + NTL_zz_pE_Initialiser( const Integer & p, const NTL::zz_pX & f) { + NTL::zz_p::init((int64_t) p); + NTL::zz_pE::init(f); + _f = f; + } +- ++ + NTL_zz_pE_Initialiser(const NTL::zz_pX &f) { + NTL::zz_pE::init(f); + _f = f; + } +- ++ + const NTL::zz_pX& modulus() const { + return _f; + } +@@ -143,22 +143,22 @@ namespace LinBox + NTL_zz_pE (const integer &p, const integer &k) : + NTL_zz_pE_Initialiser(p,k),Father_t () + { +- init(const_cast<Element &>(zero), 0); +- init(const_cast<Element &>(one), 1); +- init(const_cast<Element &>(mOne), p-1); ++ init(const_cast<Element &>(zero), 0); ++ init(const_cast<Element &>(one), 1); ++ init(const_cast<Element &>(mOne), p-1); + } +- ++ + NTL_zz_pE (const integer &p, const NTL::zz_pX &f) : + NTL_zz_pE_Initialiser(p,f), Father_t() + { + init(const_cast<Element &>(zero), 0); +- init(const_cast<Element &>(one), 1); +- init(const_cast<Element &>(mOne), p-1); ++ init(const_cast<Element &>(one), 1); ++ init(const_cast<Element &>(mOne), p-1); + } +- ++ + NTL_zz_pE(const NTL_zz_pE &F) : +- NTL_zz_pE_Initialiser(F.modulus()), Father_t(), +- zero(NTL::to_zz_pE(0)), one(NTL::to_zz_pE(1)), mOne(-one) ++ NTL_zz_pE_Initialiser(F.modulus()), Father_t(), ++ zero(NTL::to_zz_pE(0)), one(NTL::to_zz_pE(1)), mOne(-one) + { + } + +@@ -182,15 +182,15 @@ namespace LinBox + + bool isUnit (const Element& x) const + { +- if (isZero(x)) { +- return false; +- } +- +- NTL::zz_pX g, tmp; +- tmp = NTL::conv<NTL::zz_pX>(x); +- NTL::GCD(g, tmp, modulus()); +- +- return g == 1; ++ if (isZero(x)) { ++ return false; ++ } ++ ++ NTL::zz_pX g, tmp; ++ tmp = NTL::conv<NTL::zz_pX>(x); ++ NTL::GCD(g, tmp, modulus()); ++ ++ return g == 1; + } + + bool isMOne (const Element& x) const +@@ -207,7 +207,9 @@ namespace LinBox + return f; + } + +- Element & init(Element & x, integer n = 0) const ++ Element & init(Element & x) const { return x; } ++ ++ Element & init(Element & x, integer n) const + { // assumes n >= 0. + int e = exponent(); + n %= cardinality(); +@@ -215,14 +217,14 @@ namespace LinBox + //write(std::cout << "init-ed ", x) << std::endl; + return x; + } +- ++ + // documentation of NTL::conv: + // http://www.shoup.net/ntl/doc/conversions.txt + // XXX = long, ZZ, ZZ_p, ZZ_pE, ZZ_pX + template<class XXX> + Element &init(Element &x, const XXX &y) const { +- x = NTL::conv<NTL::zz_pE>(y); +- return x; ++ x = NTL::conv<NTL::zz_pE>(y); ++ return x; + } + + integer & convert(integer & x, const Element & y) const +@@ -279,81 +281,80 @@ namespace LinBox + x=one/x; + return x; + } +- ++ + Element& div(Element &x, const Element &y, const Element &z) const { +- NTL::zz_pX g, zx; +- conv(zx, z); +- NTL::GCD(g, zx, modulus()); +- +- NTL::zz_pE zg; +- conv(zg, zx / g); +- x = NTL::conv<NTL::zz_pE>(NTL::conv<NTL::zz_pX>(y) / g); +- x /= zg; +- +- return x; ++ NTL::zz_pX g, zx; ++ conv(zx, z); ++ NTL::GCD(g, zx, modulus()); ++ ++ NTL::zz_pE zg; ++ conv(zg, zx / g); ++ x = NTL::conv<NTL::zz_pE>(NTL::conv<NTL::zz_pX>(y) / g); ++ x /= zg; ++ ++ return x; + } +- ++ + Element& divin(Element &x, const Element &y) const { +- Element r; +- div(r, x, y); +- return x = r; ++ Element r; ++ div(r, x, y); ++ return x = r; + } + + bool isDivisor(const Element &x, const Element &y) const { +- if (isZero(y)) { +- return false; +- } +- +- if (isUnit(y)) { +- return true; +- } +- +- NTL::zz_pX a, b; +- conv(a, x); +- conv(b, y); +- +- NTL::zz_pX ga, gb; +- NTL::GCD(ga, a, modulus()); +- NTL::GCD(gb, b, modulus()); +- +- NTL::zz_pX r; +- r = ga % gb; +- return isZero(NTL::conv<Element>(r)); ++ if (isZero(y)) { ++ return false; ++ } ++ ++ if (isUnit(y)) { ++ return true; ++ } ++ ++ NTL::zz_pX a, b; ++ conv(a, x); ++ conv(b, y); ++ ++ NTL::zz_pX ga, gb; ++ NTL::GCD(ga, a, modulus()); ++ NTL::GCD(gb, b, modulus()); ++ NTL::zz_pX r; ++ r = ga % gb; ++ return isZero(NTL::conv<Element>(r)); + } +- ++ + Element& gcd(Element &g, const Element &a, const Element &b) const { + NTL::zz_pX r1, r2, x, y; + conv(x, a); + conv(y, b); +- ++ + NTL::GCD(r1, x, modulus()); + NTL::GCD(r2, y, r1); +- ++ + return g = NTL::conv<Element>(r2); + } +- ++ + Element& gcdin(Element &a, const Element &b) const { + NTL::zz_pE g; + gcd(g, a, b); + return a = g; + } +- ++ + Element& dxgcd(Element &g, Element &s, Element &t, Element &u, Element &v, const Element &a, const Element &b) const { + NTL::zz_pX gx, sx, tx, ux, vx, ax, bx; + conv(ax, a); + conv(bx, b); +- ++ + NTL::XGCD(gx, sx, tx, ax, bx); +- ++ + ux = ax / gx; + vx = bx / gx; +- ++ + conv(g, gx); + conv(s, sx); + conv(t, tx); + conv(u, ux); + conv(v, vx); +- ++ + return g; + } + +@@ -364,12 +365,12 @@ namespace LinBox + x=NTL::to_zz_pE(tmp); + return is; + } +- ++ + std::ostream& write( std::ostream& os ) const + { + return os << "Polynomial quotient ring using NTL::zz_pE"; + } +- ++ + std::ostream& write( std::ostream& os, const Element& x) const { + os << x; + return os; +@@ -429,7 +430,7 @@ namespace LinBox + uint64_t _seed; + const NTL_zz_pE& _ring; + }; // class UnparametricRandIters +- ++ + } // LinBox + + #endif //__LINBOX_ntl_lzz_pe_H +diff --git a/linbox/ring/ntl/ntl-zz_px.h b/linbox/ring/ntl/ntl-zz_px.h +index 6e7d5b2fd..340df9f95 100644 +--- a/linbox/ring/ntl/ntl-zz_px.h ++++ b/linbox/ring/ntl/ntl-zz_px.h +@@ -104,6 +104,12 @@ namespace LinBox + ,_CField(cf) + {} + ++ /** Initialize p to 0 */ ++ Element& init( Element& p ) const ++ { ++ return p = 0; ++ } ++ + /** Initialize p to the constant y (p = y*x^0) */ + template <class ANY> + Element& init( Element& p, const ANY& y ) const +-- +2.43.0 + diff --git a/sci-libs/linbox/files/linbox-1.7.0-hardened-testfails.patch b/sci-libs/linbox/files/linbox-1.7.0-hardened-testfails.patch new file mode 100644 index 000000000000..9e46faa69dc4 --- /dev/null +++ b/sci-libs/linbox/files/linbox-1.7.0-hardened-testfails.patch @@ -0,0 +1,22 @@ +https://github.com/linbox-team/linbox/issues/304 + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index d870aa9..f7234ea 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -57,7 +57,6 @@ EXTRA_DIST = \ + BASIC_TESTS = \ + test-solve \ + test-solve-full \ +- test-smith-form-valence \ + test-local-smith-form-sparseelim\ + test-smith-form \ + test-smith-form-adaptive \ +@@ -66,7 +65,6 @@ BASIC_TESTS = \ + test-last-invariant-factor \ + test-qlup \ + test-det \ +- test-regression \ + test-regression2 \ + test-rank-ex \ + test-rank-u32 \ diff --git a/sci-libs/linbox/linbox-1.6.3-r1.ebuild b/sci-libs/linbox/linbox-1.6.3-r1.ebuild deleted file mode 100644 index cabe5a6d2cf9..000000000000 --- a/sci-libs/linbox/linbox-1.6.3-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="C++ template library for integer and finite-field linear algebra" -HOMEPAGE="https://linalg.org/" -SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="doc opencl openmp static-libs cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" - -BDEPEND="doc? ( app-doc/doxygen )" - -# The project README says that gmp, givaro, and blas/lapack are required -# transitively via fflas-ffpack, but that's not true. The build system -# checks for them, and `git grep` shows that they're used directly. -DEPEND="dev-libs/gmp[cxx(+)] - =sci-libs/givaro-4.1* - =sci-libs/fflas-ffpack-2.4* - virtual/cblas - virtual/lapack - opencl? ( virtual/opencl ) - dev-libs/ntl:= - sci-libs/iml - dev-libs/mpfr:= - sci-mathematics/flint" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-1.6.3-pc.patch" ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - # - # The --with-all flag includes, - # - # --with-givaro: used for finite fields, integer, etc. (required) - # --with-fflas-ffpack: small field dense linear algebra (required) - # --with-ntl: used for finite field, polynomial arithmetic (optional) - # --with-iml: used for fast integer/rational linear algebra (optional) - # --with-mpfr: not sure, doesn't seem to be used? (optional) - # --with-flint: used in algorithms/matrix-blas3 once (optional) - # --with-fplll: an fplll interface not directly used (optional) - # --with-doxygen: needed with --enable-doc to build them (optional) - # - # Some of these could be behind USE flags, but the ./configure output - # says that they're "not yet mandatory," which makes me think we might - # be overcomplicating things to make them optional right now. - # - # Note: after v1.6.3, we'll need to append --without-archnative to - # these flags to avoid -march=native being appended by default. - # - econf \ - --with-docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --with-all="${EPREFIX}"/usr \ - --without-fplll \ - $(use_enable doc) \ - $(use_enable openmp) \ - $(use_with opencl ocl) \ - $(use_enable cpu_flags_x86_fma3 fma) \ - $(use_enable cpu_flags_x86_fma4 fma4) \ - $(use_enable cpu_flags_x86_sse3 sse) \ - $(use_enable cpu_flags_x86_sse3 sse2) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_ssse3 ssse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) \ - $(use_enable cpu_flags_x86_sse4_2 sse42) \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable cpu_flags_x86_avx2 avx2) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - if use doc; then - # These files are used for incremental doxygen builds but aren't - # part of the final output. Check on - # - # https://github.com/linbox-team/linbox/issues/252 - # - # periodically to see if this is pointless. - find "${ED}/usr/share/doc/${PF}" -type f -name '*.md5' -delete || die - find "${ED}/usr/share/doc/${PF}" -type f -name '*.map' -delete || die - fi -} diff --git a/sci-libs/linbox/linbox-1.6.3-r2.ebuild b/sci-libs/linbox/linbox-1.7.0-r1.ebuild index 7f9aa82d3f0e..eef3546aca5d 100644 --- a/sci-libs/linbox/linbox-1.6.3-r2.ebuild +++ b/sci-libs/linbox/linbox-1.7.0-r1.ebuild @@ -1,27 +1,29 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs +inherit autotools toolchain-funcs DESCRIPTION="C++ template library for integer and finite-field linear algebra" HOMEPAGE="https://linalg.org/" SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz" -LICENSE="LGPL-2.1" +# I think only macros/libtool.m4 (and COPYING) is GPL-2+; the source +# headers all say LGPL-2.1 +LICENSE="GPL-2+ LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="doc opencl openmp static-libs cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="doc opencl openmp" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" # The project README says that gmp, givaro, and blas/lapack are required # transitively via fflas-ffpack, but that's not true. The build system # checks for them, and `git grep` shows that they're used directly. DEPEND="dev-libs/gmp[cxx(+)] - =sci-libs/givaro-4.1* - =sci-libs/fflas-ffpack-2.4* + =sci-libs/givaro-4.2* + =sci-libs/fflas-ffpack-2.5* virtual/cblas virtual/lapack opencl? ( virtual/opencl ) @@ -36,8 +38,14 @@ RDEPEND="${DEPEND} doc? ( >=dev-libs/mathjax-3 ) " -PATCHES=( "${FILESDIR}/${PN}-1.6.3-pc.patch" ) +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-hardened-testfails.patch + "${FILESDIR}"/${PN}-1.7.0-gcc14.patch +) +# The --enable-openmp flag has been removed upstream, but we don't want +# openmp support to disappear after the package has been compiled with +# it, so we retain the USE flag and the toolchain check. pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -60,6 +68,8 @@ src_prepare() { MATHJAX_EXTENSIONS = ams " >> doc/Doxyfile.mod || die fi + + eautoreconf } src_configure() { @@ -79,27 +89,13 @@ src_configure() { # says that they're "not yet mandatory," which makes me think we might # be overcomplicating things to make them optional right now. # - # Note: after v1.6.3, we'll need to append --without-archnative to - # these flags to avoid -march=native being appended by default. - # econf \ --with-docdir="${EPREFIX}/usr/share/doc/${PF}" \ --with-all="${EPREFIX}"/usr \ --without-fplll \ + --without-archnative \ $(use_enable doc) \ - $(use_enable openmp) \ - $(use_with opencl ocl) \ - $(use_enable cpu_flags_x86_fma3 fma) \ - $(use_enable cpu_flags_x86_fma4 fma4) \ - $(use_enable cpu_flags_x86_sse3 sse) \ - $(use_enable cpu_flags_x86_sse3 sse2) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_ssse3 ssse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) \ - $(use_enable cpu_flags_x86_sse4_2 sse42) \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable cpu_flags_x86_avx2 avx2) \ - $(use_enable static-libs static) + $(use_with opencl ocl) } src_install() { diff --git a/sci-libs/linbox/metadata.xml b/sci-libs/linbox/metadata.xml index b935b656e7df..db695272dc66 100644 --- a/sci-libs/linbox/metadata.xml +++ b/sci-libs/linbox/metadata.xml @@ -18,12 +18,6 @@ <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="opencl"> - Enable the use of OpenCL in LinBox - </flag> - </use> - <longdescription lang="en"> LinBox is a C++ template library for exact, high-performance linear algebra computation with dense, sparse, and structured diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest index 16bfdea8a5f6..a03e19c7378c 100644 --- a/sci-libs/linux-gpib-modules/Manifest +++ b/sci-libs/linux-gpib-modules/Manifest @@ -1 +1,2 @@ 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-modules/linux-gpib-modules-4.3.5-r3.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild index 0736e0159f4d..4306cc4b7fe7 100644 --- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild +++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.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 @@ -7,12 +7,12 @@ inherit linux-mod-r1 DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware" HOMEPAGE="https://linux-gpib.sourceforge.io/" -SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/linux-gpib/linux-gpib-${PV}.tar.gz" S="${WORKDIR}/linux-gpib-kernel-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" IUSE="debug" COMMONDEPEND="" diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.6.ebuild index fb572031d1ee..57a1b4268b53 100644 --- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild +++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.6.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit linux-info linux-mod +inherit linux-mod-r1 DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware" HOMEPAGE="https://linux-gpib.sourceforge.io/" -SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/linux-gpib/linux-gpib-${PV}.tar.gz" S="${WORKDIR}/linux-gpib-kernel-${PV}" LICENSE="GPL-2" @@ -27,13 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.3.4-depmod.patch" ) -pkg_setup() { - linux-mod_pkg_setup - - if kernel_is -lt 2 6 8; then - die "Kernel versions older than 2.6.8 are not supported." - fi -} +MODULES_KERNEL_MIN=2.6.8 src_unpack() { default @@ -41,29 +35,26 @@ src_unpack() { } src_configure() { - set_arch_to_kernel - - my_gpib_makeopts='' - use debug && my_gpib_makeopts+='GPIB-DEBUG=1 ' - - my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} " + MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" ) + use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' ) } src_compile() { - set_arch_to_kernel - emake \ - ${my_gpib_makeopts} + # The individual modules don't have separate targets so we can't use + # modlist here. + emake "${MODULES_MAKEARGS[@]}" } src_install() { - set_arch_to_kernel emake \ + "${MODULES_MAKEARGS[@]}" \ DESTDIR="${ED}" \ INSTALL_MOD_PATH="${ED}" \ - DEPMOD="/bin/true" \ docdir="${ED}/usr/share/doc/${PF}/html" \ - ${my_gpib_makeopts} \ install + modules_post_process + dodoc ChangeLog AUTHORS README* NEWS + einstalldocs } diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index 03b2905a5e32..2fa47a31d5ad 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -1,2 +1,3 @@ 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 index 30f0a65b08bb..ec3f2baf9002 100644 --- a/sci-libs/linux-gpib/linux-gpib-4.3.5.ebuild +++ b/sci-libs/linux-gpib/linux-gpib-4.3.5.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..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit readme.gentoo-r1 autotools perl-functions python-single-r1 udev @@ -12,7 +12,7 @@ FW_PV="2008-08-10" DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware" HOMEPAGE="https://linux-gpib.sourceforge.io/" -SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz +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}" 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 new file mode 100644 index 000000000000..d42907d639c7 --- /dev/null +++ b/sci-libs/linux-gpib/linux-gpib-4.3.6-r3.ebuild @@ -0,0 +1,189 @@ +# 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/lis/Manifest b/sci-libs/lis/Manifest index 213c948eee62..a9d864afb242 100644 --- a/sci-libs/lis/Manifest +++ b/sci-libs/lis/Manifest @@ -1 +1,2 @@ DIST lis-1.6.5.tar.gz 3130045 BLAKE2B 34627d7e310000a2b3acbbc5f11bd163b682224e42dc521adea318a69587e663e59c8296806f6271e8c39062a16bd6c3c24cda5b183bec41f2aba1be09f77a47 SHA512 0cd2fc445c6464490f01def99960f33bbde53b45b453e289edbc9f31b7a20f00d70538bd3feb03324b56ddbc5993d8ba3bfbc8a0574809be08a854c05c097f13 +DIST lis-2.1.3.zip 4002188 BLAKE2B 2249b05c15f3a13db02b240f4b517a004926a8cebb8072cfff74d9ad588b5d47190249c099b5b68b7031f3a9c3614f983cb3e8a27d59a252e9fc53d52ffad6c8 SHA512 5aa873d7ed928c816da6b7da4246c41fa3b3810e97bec1a0e8c914abdd2ef940134ab25a3f044b4dd206e81e8a9f7dab2eb0b631d75e1f52528e5de29b3f7028 diff --git a/sci-libs/lis/files/lis-2.1.3-autotools.patch b/sci-libs/lis/files/lis-2.1.3-autotools.patch new file mode 100644 index 000000000000..c9020cc98fef --- /dev/null +++ b/sci-libs/lis/files/lis-2.1.3-autotools.patch @@ -0,0 +1,431 @@ +From 81a98c67bd4e0653d719c76acd8f40d99b307d3e Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 31 Mar 2024 14:50:03 -0400 +Subject: [PATCH] Import undocumented patch: lis-1.6.2-autotools.patch + +--- + configure.ac | 47 ++++--------------------------------- + src/Makefile.am | 2 +- + src/array/Makefile.am | 13 +--------- + src/esolver/Makefile.am | 13 +--------- + src/fortran/Makefile.am | 11 --------- + src/fortran/amg/Makefile.am | 19 --------------- + src/matrix/Makefile.am | 13 +--------- + src/matvec/Makefile.am | 13 +--------- + src/precision/Makefile.am | 13 +--------- + src/precon/Makefile.am | 13 +--------- + src/solver/Makefile.am | 13 +--------- + src/system/Makefile.am | 13 +--------- + src/vector/Makefile.am | 13 +--------- + test/Makefile.am | 39 +++++------------------------- + 14 files changed, 20 insertions(+), 215 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 02f226d..b887b13 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -500,26 +500,6 @@ if test "$TARGET" = ""; then + done + AC_MSG_CHECKING([for C compiler vendor]) + AC_MSG_RESULT($[ax_cv_]_AC_LANG_ABBREV[_compiler_vendor]) +- case $ax_cv_c_compiler_vendor in +- dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host $CFLAGS" ;; +- gnu) CFLAGS="-O3 -fomit-frame-pointer $CFLAGS" ;; +- intel) CFLAGS="-ansi_alias $CFLAGS" ;; +- portland) CFLAGS="-O3 -B -fastsse $CFLAGS" ;; +- pathscale) CFLAGS="-O3 $CFLAGS" ;; +- ibm) CFLAGS="-O3 -qansialias -w -qarch=auto -qtune=auto $CFLAGS" +- AR="ar -X any" +- ;; +- sun) case `(uname -m) 2>/dev/null` in +- "i86pc") CFLAGS="-xtarget=native -xO5 -dalign $CFLAGS" +- LDFLAGS="-xtarget=native -xO5" +- ;; +- *) CFLAGS="-xtarget=native64 -xO5 -dalign $CFLAGS" +- LDFLAGS="-xtarget=native64 -xO5" +- ;; +- esac +- ;; +- hp) CFLAGS="+Oall +Optrs_ansi +DSnative $CFLAGS" ;; +- esac + + AC_DEFUN([_AX_PROG_FC_V_OUTPUT], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) +@@ -666,6 +646,10 @@ if test "$enable_fortran" = "yes" || test "$enable_f90" = "yes" || test "$enable + AC_LANG_PUSH(Fortran 77) + fflags_save="$FFLAGS" + AC_PROG_F77([ifort ifc efc xlf95_r xlf90_r xlf_r xlf95 xlf90 xlf ftn frt pgf95 pgf90 pathf95 pathf90 epcf90 f95 fort lf95 gfortran f90 g77]) ++ ++ AC_F77_LIBRARY_LDFLAGS ++ AC_F77_DUMMY_MAIN ++ + FFLAGS="$fflags_save" + if test "$TARGET" = ""; then + if test "$enable_mpi" = "yes"; then +@@ -710,29 +694,6 @@ if test "$TARGET" = ""; then + AC_MSG_CHECKING([for Fortran compiler vendor]) + AC_MSG_RESULT($[ax_cv_]_AC_LANG_ABBREV[_compiler_vendor]) + AC_LANG_POP(Fortran 77) +- case $ax_cv_f77_compiler_vendor in +- gnu) FFLAGS="-O3 -fomit-frame-pointer $FFLAGS" +- FCFLAGS="-O3 -fomit-frame-pointer $FCFLAGS" ;; +- intel) FFLAGS="-fpp $FFLAGS" +- FCFLAGS="-fpp $FCFLAGS" +- LDFLAGS="-Vaxlib" +- FCLDFLAGS="-nofor_main" ;; +- portland) FFLAGS="-O3 -fastsse -Mpreprocess $FFLAGS" +- FCFLAGS="-O3 -fastsse -Mpreprocess $FCFLAGS" +- FCLDFLAGS="-Mnomain" ;; +- pathscale) FFLAGS="-O3 $FFLAGS" ;; +- ibm) FFLAGS="-O3 -qsuffix=cpp=F -qfixed=72 -w -qarch=auto -qtune=auto $FFLAGS" +- FCFLAGS="-O3 -qsuffix=cpp=F90 -w -qarch=auto -qtune=auto $FCFLAGS" ;; +- sun) case `(uname -m) 2>/dev/null` in +- "i86pc") FFLAGS="-fpp -xtarget=native -xO5 -dalign $FFLAGS" +- FCFLAGS="-fpp -xtarget=native -xO5 -dalign $FCFLAGS" +- FCLDFLAGS="-xO5" ;; +- *) FFLAGS="-fpp -xtarget=native64 -xO5 -dalign $FFLAGS" +- FCFLAGS="-fpp -xtarget=native64 -xO5 -dalign $FCFLAGS" +- FCLDFLAGS="-xO5" ;; +- esac +- ;; +- esac + + if test x$ax_cv_c_compiler_vendor = x$ax_cv_f77_compiler_vendor; then + CLIBS="" +diff --git a/src/Makefile.am b/src/Makefile.am +index 2af648b..3080b78 100755 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -23,7 +23,7 @@ if ENABLE_SAAMG + liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la + else + if ENABLE_FORTRAN +- liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la ++ liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la $(FLIBS) + endif + endif + liblis@LIBSUFFIX@_la_SOURCES = +diff --git a/src/array/Makefile.am b/src/array/Makefile.am +index 2f42d3c..66c9a1e 100755 +--- a/src/array/Makefile.am ++++ b/src/array/Makefile.am +@@ -1,16 +1,5 @@ + noinst_LTLIBRARIES = libarray.la + libarray_la_SOURCES = lis_array.c + +-AM_CFLAGS = -I$(top_srcdir)/include $(ILIBS) ++AM_CPPFLAGS = -I$(top_srcdir)/include $(ILIBS) + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/esolver/Makefile.am b/src/esolver/Makefile.am +index 5cdc9bc..d5e77a0 100755 +--- a/src/esolver/Makefile.am ++++ b/src/esolver/Makefile.am +@@ -8,16 +8,5 @@ lis_esolver_pi.c \ + lis_esolver_rqi.c \ + lis_esolver_si.c + +-AM_CFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/fortran/Makefile.am b/src/fortran/Makefile.am +index 107c82e..fe06650 100755 +--- a/src/fortran/Makefile.am ++++ b/src/fortran/Makefile.am +@@ -12,14 +12,3 @@ lisf_vector.c + + AM_CPPFLAGS = -I$(top_srcdir)/include + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/fortran/amg/Makefile.am b/src/fortran/amg/Makefile.am +index 798e3b0..83219c8 100755 +--- a/src/fortran/amg/Makefile.am ++++ b/src/fortran/amg/Makefile.am +@@ -25,25 +25,6 @@ endif + + CLEANFILES = *.mod + AM_CPPFLAGS = -I$(top_srcdir)/include +-FCCOMPILE = $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS) +-LTFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS) +-FCLD = $(FC) +-FCLINK = $(LIBTOOL) --mode=link $(FCLD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-PPFCCOMPILE = $(FC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS) +-LTPPFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FCFLAGS) $(FCFLAGS) +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) + + .NOTPARALLEL: + .NO_PARALLEL: +diff --git a/src/matrix/Makefile.am b/src/matrix/Makefile.am +index 2bb2497..ab831ee 100755 +--- a/src/matrix/Makefile.am ++++ b/src/matrix/Makefile.am +@@ -17,16 +17,5 @@ lis_matrix_ops.c \ + lis_matrix_rco.c \ + lis_matrix_vbr.c + +-AM_CFLAGS = -I$(top_srcdir)/include $(ILIBS) ++AM_CPPFLAGS = -I$(top_srcdir)/include $(ILIBS) + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/matvec/Makefile.am b/src/matvec/Makefile.am +index e23008c..2015116 100755 +--- a/src/matvec/Makefile.am ++++ b/src/matvec/Makefile.am +@@ -13,16 +13,5 @@ lis_matvec_msr.c \ + lis_matvec_vbr.c + + +-AM_CFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/precision/Makefile.am b/src/precision/Makefile.am +index af9bd47..a94183d 100755 +--- a/src/precision/Makefile.am ++++ b/src/precision/Makefile.am +@@ -4,16 +4,5 @@ lis_precision_matvec.c \ + lis_precision_vec.c + + +-AM_CFLAGS = -I$(top_srcdir)/include $(MPFLAG) ++AM_CPPFLAGS = -I$(top_srcdir)/include $(MPFLAG) + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/precon/Makefile.am b/src/precon/Makefile.am +index 3039cfa..14f025a 100755 +--- a/src/precon/Makefile.am ++++ b/src/precon/Makefile.am +@@ -12,16 +12,5 @@ lis_precon_sainv.c \ + lis_precon_ssor.c + + +-AM_CFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/solver/Makefile.am b/src/solver/Makefile.am +index f5c2d3d..d7ca4c3 100755 +--- a/src/solver/Makefile.am ++++ b/src/solver/Makefile.am +@@ -17,16 +17,5 @@ lis_solver_qmr.c \ + lis_solver_sor.c + + +-AM_CFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/system/Makefile.am b/src/system/Makefile.am +index 97c84f3..f495ef9 100755 +--- a/src/system/Makefile.am ++++ b/src/system/Makefile.am +@@ -13,16 +13,5 @@ lis_time.c \ + mt19937ar.c + + +-AM_CFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/src/vector/Makefile.am b/src/vector/Makefile.am +index 4c9e2e2..848adc2 100755 +--- a/src/vector/Makefile.am ++++ b/src/vector/Makefile.am +@@ -4,16 +4,5 @@ lis_vector_ops.c \ + lis_vector_opv.c + + +-AM_CFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include + CLEANFILES = *.il +- +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +diff --git a/test/Makefile.am b/test/Makefile.am +index 1a3e25a..3bc26fb 100755 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -5,21 +5,21 @@ AM_LDFLAGS = $(AMDEFS) + + EXTRA_DIST = defs test.sh testmat.mtx testmat2.mtx testmat3.mtx testmat4.mtx testmat0.mtx testvec0.mtx + +-testdir = ${prefix}/share/examples/lis ++testdir = ${prefix}/share/lis/examples + + test_DATA = testmat.mtx testmat2.mtx testmat3.mtx testmat4.mtx testmat0.mtx testvec0.mtx + + test_SCRIPTS = defs test.sh + +-test_PROGRAMS = etest1 etest2 etest3 etest4 etest5 etest5b etest6 etest7 getest1 getest5 getest5b spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 test1 test2 test2b test3 test3b test3c test4 test5 test6 test7 ++check_PROGRAMS = etest1 etest2 etest3 etest4 etest5 etest5b etest6 etest7 getest1 getest5 getest5b spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 test1 test2 test2b test3 test3b test3c test4 test5 test6 test7 + if ENABLE_FORTRAN +- test_PROGRAMS += etest1f etest4f test1f test4f test7f ++ check_PROGRAMS += etest1f etest4f test1f test4f test7f + endif + if ENABLE_F90 +- test_PROGRAMS += test2f test6f ++ check_PROGRAMS += test2f test6f + if ENABLE_SAAMG + if ENABLE_MPI +- test_PROGRAMS += test8f ++ check_PROGRAMS += test8f + endif + endif + endif +@@ -65,7 +65,7 @@ if ENABLE_F90 + test8f_SOURCES = test8f.F90 + endif + +-bin_PROGRAMS = esolve esolver gesolve gesolver hpcg_kernel hpcg_spmvtest lsolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 ++noinst_PROGRAMS = esolve esolver gesolve gesolver hpcg_kernel hpcg_spmvtest lsolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 + + lsolve_SOURCES = test1.c + esolve_SOURCES = etest5.c +@@ -75,33 +75,6 @@ gesolver_SOURCES = getest5b.c + hpcg_kernel_SOURCES = test3b.c + hpcg_spmvtest_SOURCES = spmvtest3b.c + +-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) +-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_FFLAGS) $(FFLAGS) +-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +- +-if ENABLE_SAAMG +- LINK = $(LIBTOOL) --mode=link $(FC) \ +- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS) +- F77LINK = $(LIBTOOL) --mode=link $(FC) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS) +-else +-if ENABLE_FORTRAN +- LINK = $(LIBTOOL) --mode=link $(FC) \ +- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS) +- F77LINK = $(LIBTOOL) --mode=link $(F77) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS) +-else +- LINK = $(LIBTOOL) --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) +-endif +-endif +- + CLEANFILES = *.il + + +-- +2.43.2 + diff --git a/sci-libs/lis/lis-1.6.5.ebuild b/sci-libs/lis/lis-1.6.5-r1.ebuild index 27d638831af1..97ffc239f6f6 100644 --- a/sci-libs/lis/lis-1.6.5.ebuild +++ b/sci-libs/lis/lis-1.6.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools fortran-2 toolchain-funcs +inherit autotools flag-o-matic fortran-2 toolchain-funcs DESCRIPTION="Library of Iterative Solvers for Linear Systems" HOMEPAGE="https://www.ssisc.org/lis/index.en.html" @@ -34,6 +34,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927587 + # https://github.com/anishida/lis/issues/37 + filter-lto + econf \ --enable-shared \ $(use_enable static-libs static) \ diff --git a/sci-libs/lis/lis-2.1.3.ebuild b/sci-libs/lis/lis-2.1.3.ebuild new file mode 100644 index 000000000000..fb4b08bdb429 --- /dev/null +++ b/sci-libs/lis/lis-2.1.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic fortran-2 toolchain-funcs + +DESCRIPTION="Library of Iterative Solvers for Linear Systems" +HOMEPAGE="https://www.ssisc.org/lis/index.en.html" +SRC_URI="https://www.ssisc.org/lis/dl/${P}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse2 doc fortran mpi openmp quad saamg static-libs" + +RDEPEND="mpi? ( virtual/mpi )" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" + +PATCHES=( "${FILESDIR}"/${PN}-2.1.3-autotools.patch ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp && FORTRAN_NEED_OPENMP=1 + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927587 + # https://github.com/anishida/lis/issues/37 + filter-lto + + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + $(use_enable fortran) \ + $(use_enable openmp omp) \ + $(use_enable quad) \ + $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma) \ + $(use_enable cpu_flags_x86_sse2 sse2) \ + $(use_enable saamg) \ + $(use_enable mpi) +} + +src_install() { + use doc && DOCS+=( doc/*.pdf ) + default + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +} diff --git a/sci-libs/lmfit/lmfit-9.0-r1.ebuild b/sci-libs/lmfit/lmfit-9.0-r1.ebuild index 1c7f7fcdd3bf..32374742eb2f 100644 --- a/sci-libs/lmfit/lmfit-9.0-r1.ebuild +++ b/sci-libs/lmfit/lmfit-9.0-r1.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 @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" SLOT="0/9" -KEYWORDS="amd64 arm ~arm64 ~x86" +KEYWORDS="amd64 arm ~arm64 ~riscv ~x86" PATCHES=( "${FILESDIR}"/${P}-cmake.patch diff --git a/sci-libs/m4ri/files/m4ri-20200125-testfix.patch b/sci-libs/m4ri/files/m4ri-20200125-testfix.patch new file mode 100644 index 000000000000..cd45acac4d69 --- /dev/null +++ b/sci-libs/m4ri/files/m4ri-20200125-testfix.patch @@ -0,0 +1,31 @@ +From 0643268f316af1150ea2631d27fd1533f5994bb8 Mon Sep 17 00:00:00 2001 +From: "Martin R. Albrecht" <martinralbrecht@googlemail.com> +Date: Wed, 6 May 2020 13:15:44 +0100 +Subject: [PATCH] don't test things we forbid + +fixes #75 +--- + tests/test_misc.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tests/test_misc.c b/tests/test_misc.c +index b1a2e32..0ccddb3 100644 +--- a/tests/test_misc.c ++++ b/tests/test_misc.c +@@ -130,11 +130,11 @@ int main(int argc, char *argv[]) { + status += test_submatrix(2, 130, 1, 1, 2, 130); + status += test_submatrix(2, 131, 1, 1, 2, 131); + +- status += test_submatrix(2, 63, 1, 1, 1, 63); +- status += test_submatrix(2, 64, 1, 1, 1, 64); +- status += test_submatrix(2, 65, 1, 1, 1, 65); +- status += test_submatrix(2, 66, 1, 1, 1, 66); +- status += test_submatrix(2, 67, 1, 1, 1, 67); ++ status += test_submatrix(2, 63, 1, 1, 2, 63); ++ status += test_submatrix(2, 64, 1, 1, 2, 64); ++ status += test_submatrix(2, 65, 1, 1, 2, 65); ++ status += test_submatrix(2, 66, 1, 1, 2, 66); ++ status += test_submatrix(2, 67, 1, 1, 2, 67); + + status += test_submatrix(2, 127, 1, 63, 2, 127); + status += test_submatrix(2, 128, 1, 64, 2, 128); diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild index adf6e85765c9..5c4de4a39ebf 100644 --- a/sci-libs/m4ri/m4ri-20200125.ebuild +++ b/sci-libs/m4ri/m4ri-20200125.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=7 @@ -18,6 +18,8 @@ BDEPEND="virtual/pkgconfig" DEPEND="png? ( media-libs/libpng:= )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-testfix.patch" ) + # NEWS and ChangeLog are empty as of 2020-01-01, and README.md # didn't make it into the release tarball. DOCS=( AUTHORS ) diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest index ed743f578265..32667b8b502a 100644 --- a/sci-libs/mathgl/Manifest +++ b/sci-libs/mathgl/Manifest @@ -1,2 +1 @@ -DIST STIX_font.tgz 2450541 BLAKE2B f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5 -DIST mathgl-2.4.4.tar.gz 23917716 BLAKE2B 11d36195c65b11f0eedbc1c946f600fd33bdc6ab8d3ff95c65634300527b2e06ffbb6615e4425896b87435fdb45bfad806f00e79edd26af4ab67bf223695d5cf SHA512 6955cb3630b4c17ab7eeb7542569a7fba653f592640f30700988abe340ecb17f09f1cbcd3903232797e9debc9f74ba2ea1f76f51935749bc8dec5e05951bb573 +DIST mathgl-8.0.1.tar.gz 23979834 BLAKE2B 275301c945ea15a38d1c75fd509c126425080b811403d5a8c8e864c8a975b914b5f0909bdc2c0de2feb84638ef0655694cd4d0c2aec8fb537c937147d81608c9 SHA512 1ff3023f1bbd7bfd84202777a0166a8d4255a020a07f3650b9858929345bc8a2ceea4db155d2c93ba32b762d2304474276290a9edac99fda70fb4b5bc12982c2 diff --git a/sci-libs/mathgl/files/mathgl-libharu2.4.patch b/sci-libs/mathgl/files/mathgl-libharu2.4.patch new file mode 100644 index 000000000000..fb0acb5da547 --- /dev/null +++ b/sci-libs/mathgl/files/mathgl-libharu2.4.patch @@ -0,0 +1,25 @@ +diff -up mathgl-8.0.1/src/prc.cpp.libharu2.4 mathgl-8.0.1/src/prc.cpp +--- mathgl-8.0.1/src/prc.cpp.libharu2.4 2022-01-11 13:48:53.000000000 -0700 ++++ mathgl-8.0.1/src/prc.cpp 2022-10-05 21:10:18.640050969 -0600 +@@ -36,6 +36,7 @@ + #include <hpdf.h>
+ #include <hpdf_u3d.h>
+ #include <hpdf_annotation.h>
++#include <hpdf_version.h>
+ #endif // MGL_HAVE_PDF
+
+
+@@ -959,7 +960,12 @@ void MGL_EXPORT mgl_write_prc(HMGL gr, c + HPDF_U3D_SetDefault3DView(u3d, "DefaultView");
+
+ // Create annotation
+- annot = HPDF_Page_Create3DAnnot (page, rect, u3d );
++ annot
++#if HPDF_VERSION_ID >= 20400
++ = HPDF_Page_Create3DAnnot (page, rect, HPDF_FALSE, HPDF_FALSE, u3d, NULL);
++#else
++ = HPDF_Page_Create3DAnnot (page, rect, u3d );
++#endif
+
+ // Enable toolbar
+ HPDF_Dict action = (HPDF_Dict)HPDF_Dict_GetItem (annot, "3DA", HPDF_OCLASS_DICT);
diff --git a/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild b/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild index 67cf1d52fc52..96df3e08c15a 100644 --- a/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild +++ b/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +WX_GTK_VER="3.2-gtk3" -WX_GTK_VER=3.0 - -inherit cmake wxwidgets multilib flag-o-matic +inherit cmake wxwidgets multilib flag-o-matic xdg DESCRIPTION="Math Graphics Library" HOMEPAGE="https://mathgl.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="LGPL-3+" SLOT="0/7.5.0" @@ -30,7 +29,7 @@ RDEPEND=" glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2:= ) hdf? ( sci-libs/hdf ) - hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) + hdf5? ( >=sci-libs/hdf5-1.8:=[mpi=] ) jpeg? ( virtual/jpeg:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) @@ -58,29 +57,15 @@ pkg_setup() { use mpi && export CC=mpicc CXX=mpicxx } -src_unpack() { - default - if ! [[ -d "${S}"/fonts ]]; then - mkdir "${S}"/fonts || die - fi - cd "${S}"/fonts || die - unpack STIX_font.tgz -} +PATCHES=( + # From Fedora + "${FILESDIR}"/${PN}-libharu2.4.patch +) src_prepare() { - # fix for location of hdf headers - sed -i -e 's:hdf/::g' src/data_io.cpp || die - # bored of reporting bad libdir upstream - sed -i \ - -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \ - {src,widgets}/CMakeLists.txt || die - echo "" > lang/install.m || die - # fix desktop file - sed -i -e 's/.png//' udav/udav.desktop || die - # prevent sandbox violation + # Prevent sandbox violation sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die - cmake_src_prepare } @@ -148,6 +133,7 @@ pkg_postinst() { pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz EOF fi + xdg_pkg_postinst } pkg_prerm() { diff --git a/sci-libs/matio/matio-1.5.23.ebuild b/sci-libs/matio/matio-1.5.23.ebuild index 50ba1730381e..e6ae2a54d346 100644 --- a/sci-libs/matio/matio-1.5.23.ebuild +++ b/sci-libs/matio/matio-1.5.23.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit libtool + DESCRIPTION="Library for reading and writing matlab files" HOMEPAGE="https://sourceforge.net/projects/matio/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0/11" # subslot = soname version -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples hdf5 sparse" RDEPEND=" @@ -18,6 +20,11 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="doc? ( virtual/latex-base )" +src_prepare() { + default + elibtoolize +} + src_configure() { econf \ --disable-static \ diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5.ebuild index 3c0019e332ed..68c2785c6417 100644 --- a/sci-libs/mc/mc-1.5.ebuild +++ b/sci-libs/mc/mc-1.5.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=7 @@ -29,7 +29,7 @@ DEPEND="${RDEPEND}" BDEPEND=" doc? ( media-gfx/graphviz - app-doc/doxygen + app-text/doxygen )" PATCHES=( diff --git a/sci-libs/med/med-4.1.1-r3.ebuild b/sci-libs/med/med-4.1.1-r3.ebuild index c5d4f76fecce..3fc844af69b3 100644 --- a/sci-libs/med/med-4.1.1-r3.ebuild +++ b/sci-libs/med/med-4.1.1-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 FORTRAN_NEEDED=fortran -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake flag-o-matic fortran-2 python-single-r1 diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest index 39754651ea8d..c9a17a772929 100644 --- a/sci-libs/metis/Manifest +++ b/sci-libs/metis/Manifest @@ -1,2 +1 @@ -DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25 DIST metis-5.2.1.tar.gz 4838377 BLAKE2B 7f2bb3b4dce71cd05e25d042095c311f814d5d197b1a6ae19994b6bcbb7d948d3a96210cbce5633f39d7bb8ad7cc3f8f4977c6465ec8591934aac00ea9637c94 SHA512 69127b7a777f9ba14cf399a7122000af9d6094a5f44be600a28384cfc0495c024fb0c6eab37c4473a5763ec1077cd9f30d9bcbb3c952462f6c9ead31c6b9e790 diff --git a/sci-libs/metis/files/metis-5.1.0-multilib.patch b/sci-libs/metis/files/metis-5.1.0-multilib.patch deleted file mode 100644 index 9e72c5b1b2d3..000000000000 --- a/sci-libs/metis/files/metis-5.1.0-multilib.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libmetis/CMakeLists.txt -+++ b/libmetis/CMakeLists.txt -@@ -4,13 +4,14 @@ - file(GLOB metis_sources *.c) - # Build libmetis. - add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) -+set_target_properties(metis PROPERTIES SOVERSION 0) - if(UNIX) - target_link_libraries(metis m) - endif() - - if(METIS_INSTALL) - install(TARGETS metis -- LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ RUNTIME DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) - endif() diff --git a/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch b/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch deleted file mode 100644 index 507395867fcc..000000000000 --- a/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/GKlib/GKlibSystem.cmake -+++ b/GKlib/GKlibSystem.cmake -@@ -20,7 +20,7 @@ - elseif(MINGW) - set(GKlib_COPTS "-DUSE_GKREGEX") - else() -- set(GKlib_COPTS "-O3") -+ set(GKlib_COPTS "") - set(GKlib_COPTIONS "-DLINUX -D_FILE_OFFSET_BITS=64") - endif(MSVC) - if(CYGWIN) diff --git a/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch b/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch deleted file mode 100644 index 483820164638..000000000000 --- a/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/GKlib/CMakeLists.txt -+++ b/GKlib/CMakeLists.txt -@@ -7,7 +7,7 @@ - include(GKlibSystem.cmake) - - include_directories(".") --add_library(GKlib STATIC ${GKlib_sources}) -+add_library(GKlib SHARED ${GKlib_sources}) - if(UNIX) - target_link_libraries(GKlib m) - endif(UNIX) -@@ -16,6 +16,6 @@ - add_subdirectory("test") - - install(TARGETS GKlib -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) --install(FILES ${GKlib_includes} DESTINATION include) -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} -+ LIBRARY DESTINATION lib${LIB_SUFFIX}) -+install(FILES ${GKlib_includes} DESTINATION include/metis) diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild deleted file mode 100644 index 71b30fa92596..000000000000 --- a/sci-libs/metis/metis-5.1.0-r5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A package for unstructured serial graph partitioning" -HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview" -SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc double-precision examples int64 openmp" - -RDEPEND="!<sci-libs/parmetis-4.0.3-r2" - -PATCHES=( - "${FILESDIR}"/${P}-shared-GKlib.patch - "${FILESDIR}"/${P}-multilib.patch - "${FILESDIR}"/${P}-remove-GKlib-O3.patch -) - -src_prepare() { - if use int64; then - sed -i -e '/^#define IDXTYPEWIDTH/s/32/64/' include/metis.h || die - fi - - if use double-precision; then - sed -i -e '/^#define REALTYPEWIDTH/s/32/64/' include/metis.h || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DGKLIB_PATH="${S}"/GKlib - -DSHARED=yes - -DOPENMP=$(usex openmp) - ) - cmake_src_configure -} - -src_test() { - cd graphs || die - local PATH="${BUILD_DIR}"/programs/:${PATH} - - ndmetis mdual.graph || die - mpmetis metis.mesh 2 || die - gpmetis test.mgraph 4 || die - gpmetis copter2.graph 4 || die - graphchk 4elt.graph || die -} - -src_install() { - cmake_src_install - use doc && dodoc manual/manual.pdf - if use examples; then - docinto examples - dodoc -r programs graphs - fi - - cat >> "${T}"/metis.pc <<- EOF || die - prefix=${EPREFIX}/usr - exec_prefix=\${prefix} - libdir=\${exec_prefix}/$(get_libdir) - includedir=\${prefix}/include - - Name: METIS - Description: Software for partioning unstructured graphes and meshes - Version: ${PV} - Cflags: -I\${includedir}/metis - Libs: -L\${libdir} -lmetis - EOF - insinto /usr/$(get_libdir)/pkgconfig - doins "${T}"/metis.pc -} diff --git a/sci-libs/metis/metis-5.2.1-r2.ebuild b/sci-libs/metis/metis-5.2.1-r2.ebuild index 9c8ab6aafe58..3f6300981bd1 100644 --- a/sci-libs/metis/metis-5.2.1-r2.ebuild +++ b/sci-libs/metis/metis-5.2.1-r2.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 @@ -12,7 +12,7 @@ S="${WORKDIR}/METIS-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos" IUSE="double-precision examples int64 openmp" PATCHES=( diff --git a/sci-libs/minuit/minuit-5.34.14.ebuild b/sci-libs/minuit/minuit-5.34.14.ebuild index 433d7e2663a2..108fecfc27e7 100644 --- a/sci-libs/minuit/minuit-5.34.14.ebuild +++ b/sci-libs/minuit/minuit-5.34.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc openmp static-libs" -DEPEND="doc? ( app-doc/doxygen )" +DEPEND="doc? ( app-text/doxygen )" RDEPEND="" S="${WORKDIR}/${PN^}2-${PV}" diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest index ababb7dc3105..2b9827766bf0 100644 --- a/sci-libs/miopen/Manifest +++ b/sci-libs/miopen/Manifest @@ -1 +1,4 @@ DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd +DIST MIOpen-5.7.1.tar.gz 100751593 BLAKE2B c5f847fe4374ab22737c281a65401125012328412d584fc09244b431ea6265d6d5028429115ee15fa8b04cbe0edd020e4e7ac8deb22561183ed76cb8c3d4d9d4 SHA512 3354b3b154f29a6337403abc5a71ec47c0b2558320c5a1b0cbfbbdb370c4fada2db12d4a19a312b5e30ca2e2302ee50ece3390603e84d132b2212a168e9523fa +DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe57962cac8b7b6b20bc76f136ef29f0441e48112010280c2e674a1ae9fd202ca3e07be47cf4a4bc797234d6dc618be5 SHA512 b8860583919bf2f3e0da7ace30fdb0595ab45b85a367be3737e0b15a22a5565b8d6660c652ee070f21c36ac7d17ef3ba8e2eda7ed89bd6a0c65a4df799626d1a +DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a diff --git a/sci-libs/miopen/files/miopen-5.7.1-fix-miopendriver-gemm.patch b/sci-libs/miopen/files/miopen-5.7.1-fix-miopendriver-gemm.patch new file mode 100644 index 000000000000..859667f3da30 --- /dev/null +++ b/sci-libs/miopen/files/miopen-5.7.1-fix-miopendriver-gemm.patch @@ -0,0 +1,74 @@ +Fix uninitialized variable in MIOpenDriver gemm and restore gemmfp16 for testing +Upstream bug: https://github.com/ROCmSoftwarePlatform/MIOpen/issues/2505 +--- a/driver/driver.hpp ++++ b/driver/driver.hpp +@@ -141,7 +141,7 @@ inline void PadBufferSize(size_t& sz, int datatype_sz) + printf("Usage: ./driver *base_arg* *other_args*\n"); + printf("Supported Base Arguments: conv[fp16|int8|bfp16], CBAInfer[fp16], " + "pool[fp16], lrn[fp16], " +- "activ[fp16], softmax[fp16], bnorm[fp16], rnn[fp16], gemm, ctc, dropout[fp16], " ++ "activ[fp16], softmax[fp16], bnorm[fp16], rnn[fp16], gemm[fp16], ctc, dropout[fp16], " + "tensorop[fp16], reduce[fp16,fp64]\n"); + exit(0); // NOLINT (concurrency-mt-unsafe) + } +@@ -160,7 +160,7 @@ inline std::string ParseBaseArg(int argc, char* argv[]) + arg != "CBAInfer" && arg != "CBAInferfp16" && arg != "pool" && arg != "poolfp16" && + arg != "lrn" && arg != "lrnfp16" && arg != "activ" && arg != "activfp16" && + arg != "softmax" && arg != "softmaxfp16" && arg != "bnorm" && arg != "bnormfp16" && +- arg != "rnn" && arg != "rnnfp16" && arg != "gemm" /*&& arg != "gemmfp16"*/ && arg != "ctc" && ++ arg != "rnn" && arg != "rnnfp16" && arg != "gemm" && arg != "gemmfp16" && arg != "ctc" && + arg != "dropout" && arg != "dropoutfp16" && arg != "tensorop" && arg != "tensoropfp16" && + arg != "reduce" && arg != "reducefp16" && arg != "reducefp64" && arg != "--version") + { +--- a/driver/gemm_driver.hpp ++++ b/driver/gemm_driver.hpp +@@ -207,6 +207,19 @@ int GemmDriver<T>::GetandSetData() + gemm_desc.strideB = gemm_desc.k * gemm_desc.n; + gemm_desc.strideC = gemm_desc.m * gemm_desc.n; + ++ if constexpr (std::is_same_v<T, float>) ++ { ++ gemm_desc.dataType = miopenFloat; ++ } ++ else if constexpr (std::is_same_v<T, float16>) ++ { ++ gemm_desc.dataType = miopenHalf; ++ } ++ else ++ { ++ static_assert(!"unsupported type"); ++ } ++ + return (0); + } + +@@ -230,9 +243,9 @@ int GemmDriver<T>::AllocateBuffersAndCopy() + a = std::vector<T>(a_sz); + b = std::vector<T>(b_sz); + #if GEMM_DRIVER_DEBUG +- c = std::vector<T>(c_sz, 1.); ++ c = std::vector<T>(c_sz, static_cast<T>(1.)); + #else +- c = std::vector<T>(c_sz, 0.); ++ c = std::vector<T>(c_sz, static_cast<T>(0.)); + #endif + chost = c; + +--- a/driver/main.cpp ++++ b/driver/main.cpp +@@ -125,11 +125,10 @@ int main(int argc, char* argv[]) + { + drv = new GemmDriver<float>(); + } +-// TODO half is not supported in gemm +-// else if(base_arg == "gemmfp16") +-// { +-// drv = new GemmDriver<float16>(); +-// } ++ else if(base_arg == "gemmfp16") ++ { ++ drv = new GemmDriver<float16>(); ++ } + #endif + else if(base_arg == "bnorm") + { diff --git a/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch b/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch new file mode 100644 index 000000000000..49ec1ccbff3b --- /dev/null +++ b/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch @@ -0,0 +1,13 @@ +Normally, MIOpen compiles tests during test phase instead of "compile". +This patch allows to build testing executables during compile phase. +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -330,7 +330,7 @@ endfunction() + separate_arguments(MIOPEN_TEST_FLAGS_ARGS NATIVE_COMMAND ${MIOPEN_TEST_FLAGS}) + + function(add_test_executable TEST_NAME) +- add_executable (${TEST_NAME} EXCLUDE_FROM_ALL ${ARGN}) ++ add_executable (${TEST_NAME} ${ARGN}) + if(WIN32) + target_compile_definitions(${TEST_NAME} PRIVATE NOMINMAX) + endif() diff --git a/sci-libs/miopen/metadata.xml b/sci-libs/miopen/metadata.xml index e74d41fd607c..e08e7753394d 100644 --- a/sci-libs/miopen/metadata.xml +++ b/sci-libs/miopen/metadata.xml @@ -12,4 +12,11 @@ <email>xgreenlandforwyy@gmail.com</email> <name>Yiyang Wu</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> + <upstream> + <remote-id type="github">ROCm/MIOpen</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/miopen/miopen-5.1.3-r1.ebuild b/sci-libs/miopen/miopen-5.1.3-r1.ebuild index 15c5e1feaea3..7d02435948f7 100644 --- a/sci-libs/miopen/miopen-5.1.3-r1.ebuild +++ b/sci-libs/miopen/miopen-5.1.3-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 @@ -30,7 +30,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="dev-libs/half:0/1 - dev-util/rocm-cmake + dev-build/rocm-cmake " S="${WORKDIR}/MIOpen-rocm-${PV}" @@ -87,6 +87,7 @@ src_configure() { -DMIOPEN_USE_MLIR=OFF -DBUILD_TESTS=$(usex test ON OFF) -DMIOPEN_TEST_ALL=$(usex test ON OFF) + -DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half" ) if use test; then diff --git a/sci-libs/miopen/miopen-5.7.1-r1.ebuild b/sci-libs/miopen/miopen-5.7.1-r1.ebuild new file mode 100644 index 000000000000..b13e6354554f --- /dev/null +++ b/sci-libs/miopen/miopen-5.7.1-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake flag-o-matic llvm rocm + +GTEST_COMMIT="e2239ee6043f73722e7aa812a459f54a28552929" +GTEST_FILE="gtest-1.11.0_p20210611.tar.gz" + +LLVM_MAX_SLOT=17 + +DESCRIPTION="AMD's Machine Intelligence Library" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/MIOpen" + +SRC_URI="https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +IUSE="debug test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/hip + >=dev-db/sqlite-3.17 + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}] + >=dev-libs/boost-1.72 + dev-cpp/nlohmann_json + dev-cpp/frugally-deep +" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-libs/half:0/1 + dev-build/rocm-cmake +" + +S="${WORKDIR}/MIOpen-rocm-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.0-disable-no-inline-boost.patch" + "${FILESDIR}/${PN}-4.2.0-gcc11-numeric_limits.patch" + "${FILESDIR}/${PN}-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch" + "${FILESDIR}/${PN}-4.3.0-enable-test.patch" + "${FILESDIR}/${PN}-5.1.3-no-strip.patch" + "${FILESDIR}/${PN}-5.1.3-include-array.patch" + "${FILESDIR}/${PN}-5.7.1-fix-miopendriver-gemm.patch" +) + +src_prepare() { + cmake_src_prepare + + sed -e "s:/opt/rocm/llvm:$(get_llvm_prefix ${LLVM_MAX_SLOT}) NO_DEFAULT_PATH:" \ + -e "s:/opt/rocm/hip:$(hipconfig -p) NO_DEFAULT_PATH:" \ + -e '/set( MIOPEN_INSTALL_DIR/s:miopen:${CMAKE_INSTALL_PREFIX}:' \ + -e '/MIOPEN_TIDY_ERRORS ALL/d' \ + -e 's:find_program(UNZIPPER lbunzip2 bunzip2):find_program(UNZIPPER NAMES lbunzip2 bunzip2):' \ + -i CMakeLists.txt || die + + sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" \ + -i test/CMakeLists.txt || die + + sed -e "s:\${PROJECT_BINARY_DIR}/miopen/include:\${PROJECT_BINARY_DIR}/include:" \ + -i src/CMakeLists.txt || die + + sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i cmake/hip-config.cmake || die +} + +src_configure() { + if ! use debug; then + append-cflags "-DNDEBUG" + append-cxxflags "-DNDEBUG" + CMAKE_BUILD_TYPE="Release" + else + CMAKE_BUILD_TYPE="Debug" + fi + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DMIOPEN_BACKEND=HIP + -DBoost_USE_STATIC_LIBS=OFF + -DMIOPEN_USE_MLIR=OFF + -DBUILD_TESTS=$(usex test ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half" + ) + + if use test; then + mycmakeargs+=( + -DMIOPEN_TEST_ALL=ON + -DBUILD_TESTING=ON + -DMIOPEN_TEST_GDB=OFF + -DGOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + ) + for gpu_target in ${AMDGPU_TARGETS}; do + mycmakeargs+=(-DMIOPEN_TEST_${gpu_target^^}=ON ) + done + fi + + addpredict /dev/kfd + addpredict /dev/dri/ + append-cxxflags "--rocm-path=$(hipconfig -R)" + append-cxxflags "--hip-device-lib-path=${EPREFIX}/usr/lib/amdgcn/bitcode" + CXX="$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin/clang++" cmake_src_configure +} + +src_test() { + check_amdgpu + LD_LIBRARY_PATH="${BUILD_DIR}"/lib cmake_src_test -j1 +} + +src_install() { + cmake_src_install +} diff --git a/sci-libs/miopen/miopen-6.1.1.ebuild b/sci-libs/miopen/miopen-6.1.1.ebuild new file mode 100644 index 000000000000..7cf62bdcb790 --- /dev/null +++ b/sci-libs/miopen/miopen-6.1.1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} +LLVM_COMPAT=( 18 ) + +inherit cmake flag-o-matic llvm-r1 rocm + +DESCRIPTION="AMD's Machine Intelligence Library" +HOMEPAGE="https://github.com/ROCm/MIOpen" +SRC_URI="https://github.com/ROCm/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz" +S="${WORKDIR}/MIOpen-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +IUSE="debug test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/hip + >=dev-db/sqlite-3.17 + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}] + dev-util/roctracer:${SLOT}[${ROCM_USEDEP}] + >=dev-libs/boost-1.72 + dev-cpp/nlohmann_json + dev-cpp/frugally-deep +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + >=dev-libs/half-1.12.0-r1 + dev-build/rocm-cmake + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-build-all-tests.patch +) + +src_prepare() { + cmake_src_prepare + + sed -e '/MIOPEN_TIDY_ERRORS ALL/d' \ + -e 's/FLAGS_RELEASE} -s/FLAGS_RELEASE}/g' \ + -i CMakeLists.txt || die + + sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" \ + -i test/CMakeLists.txt || die + + sed -e "s:\${PROJECT_BINARY_DIR}/miopen/include:\${PROJECT_BINARY_DIR}/include:" \ + -i src/CMakeLists.txt || die +} + +src_configure() { + if ! use debug; then + append-cflags "-DNDEBUG" + append-cxxflags "-DNDEBUG" + CMAKE_BUILD_TYPE="Release" + else + CMAKE_BUILD_TYPE="Debug" + fi + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DMIOPEN_BACKEND=HIP + -DBoost_USE_STATIC_LIBS=OFF + -DMIOPEN_USE_MLIR=OFF + -DBUILD_TESTING=$(usex test ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DMIOPEN_HIP_COMPILER="${ESYSROOT}/usr/bin/hipcc" + -DMIOPEN_AMDGCN_ASSEMBLER="$(get_llvm_prefix)/bin/clang" + -DHIP_OC_COMPILER="$(get_llvm_prefix)/bin/clang" + ) + + if use test; then + mycmakeargs+=( + -DMIOPEN_TEST_ALL=ON + -DMIOPEN_TEST_GDB=OFF + ) + # needed by rocminfo + addpredict /dev/random + check_amdgpu + fi + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + LD_LIBRARY_PATH="${BUILD_DIR}"/lib MIOPEN_SYSTEM_DB_PATH="${BUILD_DIR}"/share/miopen/db/ cmake_src_test -j1 +} + +src_install() { + cmake_src_install +} diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild index 80f3bc6e283a..76afa306787b 100644 --- a/sci-libs/mpfi/mpfi-1.5.4.ebuild +++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild @@ -9,7 +9,9 @@ DESCRIPTION="Multiple precision interval arithmetic library based on MPFR" HOMEPAGE="http://perso.ens-lyon.fr/nathalie.revol/software.html" SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz" -LICENSE="GPL-2" +# COPYING is GPL-3, COPYING.LESSER is LGPL-3, source file headers +# are LGPL-2.1+ +LICENSE="GPL-3 LGPL-3 LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest deleted file mode 100644 index 1688d2b7877d..000000000000 --- a/sci-libs/mpir/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e diff --git a/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch b/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch deleted file mode 100644 index 100a6ae7088d..000000000000 --- a/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch +++ /dev/null @@ -1,145 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -361,7 +361,7 @@ - # hugely bloat the output. - - --AC_ARG_VAR(ABI, [desired ABI (for processors supporting more than one ABI)]) -+AC_ARG_VAR(MPIRABI, [desired ABI (for processors supporting more than one ABI)]) - - # abilist needs to be non-empty, "standard" is just a generic name here - abilist="standard" -@@ -1590,7 +1590,7 @@ - - cat >&AC_FD_CC <<EOF - User: --ABI=$ABI -+MPIRABI=$MPIRABI - CC=$CC - CFLAGS=$CFLAGS_or_unset - CPPFLAGS=$CPPFLAGS_or_unset -@@ -1611,22 +1611,22 @@ - # If the user specifies an ABI then it must be in $abilist, after that - # $abilist is restricted to just that choice. - # --if test -n "$ABI"; then -+if test -n "$MPIRABI"; then - found=no - for abi in $abilist; do -- if test $abi = "$ABI"; then found=yes; break; fi -+ if test $abi = "$MPIRABI"; then found=yes; break; fi - done - if test $found = no; then -- AC_MSG_ERROR([ABI=$ABI is not among the following valid choices: $abilist]) -+ AC_MSG_ERROR([MPIRABI=$MPIRABI is not among the following valid choices: $abilist]) - fi -- abilist="$ABI" -+ abilist="$MPIRABI" - fi - - found_compiler=no - - for abi in $abilist; do - -- echo "checking ABI=$abi" -+ echo "checking MPIRABI=$abi" - - # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and - # abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how -@@ -1879,7 +1879,7 @@ - done - fi - -- ABI="$abi" -+ MPIRABI="$abi" - CC="$cc" - CFLAGS="$cflags" - CPPFLAGS="$cppflags" -@@ -1895,8 +1895,8 @@ - AC_SUBST(GMP_CFLAGS) - - # Could easily have this in config.h too, if desired. -- ABI_nodots=`echo $ABI | sed 's/\./_/'` -- GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')", POST) -+ ABI_nodots=`echo $MPIRABI | sed 's/\./_/'` -+ GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$MPIRABI_nodots')", POST) - - - # GMP_LDFLAGS substitution, selected according to ABI. -@@ -2094,7 +2094,7 @@ - # - case $host in - X86_PATTERN | X86_64_PATTERN) -- if test "$ABI" = 32; then -+ if test "$MPIRABI" = 32; then - case "$path $fat_path" in - *mmx*) GMP_ASM_X86_MMX( , [GMP_STRIP_PATH(*mmx*)]) ;; - esac -@@ -2108,7 +2108,7 @@ - - cat >&AC_FD_CC <<EOF - Decided: --ABI=$ABI -+MPIRABI=$MPIRABI - CC=$CC - CFLAGS=$CFLAGS - CPPFLAGS=$CPPFLAGS -@@ -2117,7 +2117,7 @@ - CXXFLAGS=$CXXFLAGS - path=$path - EOF --echo "using ABI=\"$ABI\"" -+echo "using MPIRABI=\"$MPIRABI\"" - echo " CC=\"$CC\"" - echo " CFLAGS=\"$CFLAGS\"" - echo " CPPFLAGS=\"$CPPFLAGS\"" -@@ -2593,7 +2593,7 @@ - - - if test -n "$fat_path"; then -- if test "$ABI" = 64; then -+ if test "$MPIRABI" = 64; then - fat_path="$fat_path_64" - fi - -@@ -3099,19 +3099,19 @@ - GMP_INCLUDE_MPN(powerpc32/powerpc-defs.m4) - case $host in - *-*-aix*) -- case $ABI in -+ case $MPIRABI in - 64 | aix64) GMP_INCLUDE_MPN(powerpc64/aix.m4) ;; - *) GMP_INCLUDE_MPN(powerpc32/aix.m4) ;; - esac - ;; - *-*-linux* | *-*-*bsd*) -- case $ABI in -+ case $MPIRABI in - mode64) GMP_INCLUDE_MPN(powerpc64/elf.m4) ;; - mode32 | 32) GMP_INCLUDE_MPN(powerpc32/elf.m4) ;; - esac - ;; - *-*-darwin*) -- case $ABI in -+ case $MPIRABI in - mode64) GMP_INCLUDE_MPN(powerpc64/darwin.m4) ;; - mode32 | 32) GMP_INCLUDE_MPN(powerpc32/darwin.m4) ;; - esac -@@ -3126,7 +3126,7 @@ - GMP_INCLUDE_MPN(powerpc32/aix.m4) - ;; - sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) -- case $ABI in -+ case $MPIRABI in - 64) - GMP_ASM_SPARC_REGISTER - ;; -@@ -3134,7 +3134,7 @@ - ;; - X86_PATTERN | X86_64_PATTERN) - GMP_ASM_ALIGN_FILL_0x90 -- case $ABI in -+ case $MPIRABI in - 32) - GMP_INCLUDE_MPN(x86/x86-defs.m4) - AC_DEFINE(HAVE_HOST_CPU_FAMILY_x86) diff --git a/sci-libs/mpir/metadata.xml b/sci-libs/mpir/metadata.xml deleted file mode 100644 index 926ae4d3740e..000000000000 --- a/sci-libs/mpir/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription> -MPIR is an open source multiprecision integer (bignum) library forked -from the GMP (GNU Multi Precision) project. It consists of much code -from past GMP releases, in combination with much original contributed -code. - -MPIR is constructed by a developer and vendor friendly community of -professional and amateur mathematicians, computer scientists and -hobbyists. - </longdescription> - <use> - <flag name="cpudetection">Enables runtime cpudetection (useful for bindist, compatibility on other CPUs)</flag> - </use> - <upstream> - <remote-id type="github">wbhart/mpir</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/mpir/mpir-3.0.0-r1.ebuild b/sci-libs/mpir/mpir-3.0.0-r1.ebuild deleted file mode 100644 index 1c8e843d6950..000000000000 --- a/sci-libs/mpir/mpir-3.0.0-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)" -HOMEPAGE="https://www.mpir.org/" -SRC_URI="https://www.mpir.org/${P}.tar.bz2" - -LICENSE="LGPL-3" -SLOT="0/23" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+cxx cpudetection" - -BDEPEND=" - x86? ( dev-lang/yasm ) - amd64? ( dev-lang/yasm ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.7.2-ABI-multilib.patch -) - -src_prepare() { - tc-export CC - - default - - # In the same way there was QA regarding executable stacks - # with GMP we have some here as well. We cannot apply the - # GMP solution as yasm is used, at least on x86/amd64. - # Furthermore we are able to patch config.ac. - einfo "Patching assembler files to remove executable sections" - local i - for i in $(find . -type f -name '*.asm') ; do - cat >> $i <<-EOF || die - - #if defined(__linux__) && defined(__ELF__) - .section .note.GNU-stack,"",%progbits - #endif - EOF - done - - for i in $(find . -type f -name '*.as') ; do - cat >> $i <<-EOF || die - - %ifidn __OUTPUT_FORMAT__,elf - section .note.GNU-stack noalloc noexec nowrite progbits - %endif - EOF - done - - eautoreconf -} - -src_configure() { - # beware that cpudetection aka fat binaries is x86/amd64 only. - # Place mpir in profiles/arch/$arch/package.use.mask - # when making it available on $arch. - local myeconfargs=( - $(use_enable cxx) - $(use_enable cpudetection fat) - --disable-static - ) - # https://bugs.gentoo.org/661430 - if ! use amd64 && ! use x86; then - myeconfargs+=( --with-yasm="${BROOT}"/bin/false ) - fi - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/mumps/mumps-5.3.5-r1.ebuild b/sci-libs/mumps/mumps-5.3.5-r1.ebuild index 8e6488b38200..8df93f5e4e8c 100644 --- a/sci-libs/mumps/mumps-5.3.5-r1.ebuild +++ b/sci-libs/mumps/mumps-5.3.5-r1.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=7 @@ -8,8 +8,8 @@ inherit fortran-2 flag-o-matic multilib toolchain-funcs MYP=MUMPS_${PV} DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver" -HOMEPAGE="http://mumps.enseeiht.fr/" -SRC_URI="http://mumps.enseeiht.fr/${MYP}.tar.gz" +HOMEPAGE="https://mumps-solver.org/" +SRC_URI="https://mumps-solver.org/${MYP}.tar.gz" S="${WORKDIR}/${MYP}" LICENSE="public-domain" @@ -63,6 +63,16 @@ static_to_shared() { } src_prepare() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862903 + # + # There is an upstream mailing list but it seems to be broken. I *think*, + # because it's all in French. I tried and failed to report the bug. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + # workaround for gcc10 (bug #743442) append-fflags $(test-flags-FC -fallow-argument-mismatch) diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild b/sci-libs/neartree/neartree-5.1.1.ebuild index 89ccf3f61888..eec314fd86ad 100644 --- a/sci-libs/neartree/neartree-5.1.1.ebuild +++ b/sci-libs/neartree/neartree-5.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=7 @@ -8,7 +8,7 @@ inherit cmake DESCRIPTION="Function library efficiently solving the Nearest Neighbor Problem" HOMEPAGE="http://neartree.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1" diff --git a/sci-libs/nemesis/metadata.xml b/sci-libs/nemesis/metadata.xml index 67b3df447eab..6114f376e86d 100644 --- a/sci-libs/nemesis/metadata.xml +++ b/sci-libs/nemesis/metadata.xml @@ -6,18 +6,18 @@ <name>Gentoo Science Project</name> </maintainer> <longdescription lang="en"> - NEMESIS is an enhancement to the EXODUSII finite element database - model used to store and retrieve data for unstructured parallel finite - element analyses. NEMESIS adds data structures which facilitate the - partitioning of a scalar (standard serial) EXODUSII file onto parallel - disk systems found on many parallel computers. Since the NEMESIS - application programming interface (API) can be used to append - information to an existing EXODUSII database, any existing software - that reads EXODUSII files can be used on files which contain NEMESIS - information. The NEMESIS information is written and read via C or C++ - callable functions which compromise the NEMESIS I API. + NEMESIS is an enhancement to the EXODUSII finite element database + model used to store and retrieve data for unstructured parallel finite + element analyses. NEMESIS adds data structures which facilitate the + partitioning of a scalar (standard serial) EXODUSII file onto parallel + disk systems found on many parallel computers. Since the NEMESIS + application programming interface (API) can be used to append + information to an existing EXODUSII database, any existing software + that reads EXODUSII files can be used on files which contain NEMESIS + information. The NEMESIS information is written and read via C or C++ + callable functions which compromise the NEMESIS I API. </longdescription> <upstream> - <remote-id type="sourceforge">exodusii</remote-id> + <remote-id type="github">certik/exodus</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild index 897094334974..04c76791f47d 100644 --- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild +++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="C++ library for netCDF" HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" SRC_URI="https://www.unidata.ucar.edu/downloads/netcdf/ftp/${P}.tar.gz" @@ -15,6 +17,11 @@ IUSE="examples" RDEPEND=">=sci-libs/netcdf-4.2:0=" DEPEND="${RDEPEND}" +src_prepare() { + default + eautoreconf +} + src_configure() { econf --disable-static } diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild index a628593681d9..dddb7002fbd6 100644 --- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild +++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit libtool + MYP=${PN}4-${PV} DESCRIPTION="C++ library for netCDF" HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" @@ -10,7 +12,7 @@ SRC_URI="https://downloads.unidata.ucar.edu/netcdf-cxx/${PV}/${PN}4-${PV}.tar.gz LICENSE="UCAR-Unidata" SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples" # 6 out of 9 fail, reported upstream #RESTRICT="test" @@ -24,6 +26,11 @@ PATCHES=( "${FILESDIR}"/${P}-slibtool.patch ) +src_prepare() { + default + elibtoolize +} + src_install() { default use examples && dodoc -r examples diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild index 243ba75a2e3a..559d4d5483dc 100644 --- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild +++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit libtool + MYP=${PN}4-${PV} DESCRIPTION="C++ library for netCDF" HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" @@ -24,6 +26,11 @@ PATCHES=( "${FILESDIR}"/${P}-slibtool.patch ) +src_prepare() { + default + elibtoolize +} + src_configure() { econf --disable-static } diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild index d9969bd8da43..011dff676f10 100644 --- a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild +++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 FORTRAN_STANDARD="77 90" -inherit fortran-2 +inherit flag-o-matic fortran-2 DESCRIPTION="Scientific library and interface for array oriented data access" HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" @@ -22,9 +22,14 @@ DEPEND=" ${RDEPEND} dev-lang/cfortran " -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927588 + # https://github.com/Unidata/netcdf-fortran/issues/437 + filter-lto + econf \ --disable-valgrind \ --with-temp-large="${T}" \ diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild index 2e163ea93b82..fc08cfb95414 100644 --- a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild +++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 FORTRAN_STANDARD="77 90" -inherit autotools fortran-2 +inherit autotools flag-o-matic fortran-2 DESCRIPTION="Scientific library and interface for array oriented data access" HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" @@ -19,7 +19,7 @@ IUSE="doc examples static-libs" RDEPEND="sci-libs/netcdf" DEPEND="${RDEPEND} dev-lang/cfortran" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_prepare() { default @@ -28,6 +28,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927588 + # https://github.com/Unidata/netcdf-fortran/issues/437 + filter-lto + econf \ --disable-valgrind \ --with-temp-large="${T}" \ diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild index 37fe541485f6..9b44a0997205 100644 --- a/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild +++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 FORTRAN_STANDARD="77 90" -inherit cmake fortran-2 +inherit cmake flag-o-matic fortran-2 DESCRIPTION="Scientific library and interface for array oriented data access" HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" @@ -22,9 +22,14 @@ DEPEND=" ${RDEPEND} dev-lang/cfortran " -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927588 + # https://github.com/Unidata/netcdf-fortran/issues/437 + filter-lto + local mycmakeargs=( -DDISABLE_ZSTANDARD_PLUGIN=$(usex !zstd) -DBUILD_EXAMPLES=$(usex examples) diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml index 710afdc8ff08..dec0009bbcb4 100644 --- a/sci-libs/netcdf/metadata.xml +++ b/sci-libs/netcdf/metadata.xml @@ -14,8 +14,9 @@ access, and sharing of scientific data. </longdescription> <use> + <flag name="blosc">Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg></flag> <flag name="dap">Support for remote data access with the built-in OPeNDAP client</flag> - <flag name="hdf">Add support for the Hierarchical Data Format v.4 <pkg>sci-libs/hdf</pkg></flag> + <flag name="hdf">Build with HDF4 read capability(<pkg>sci-libs/hdf</pkg>, <pkg>sci-libs/hdf5</pkg> and <pkg>sys-libs/zlib</pkg> required).</flag> </use> <upstream> <remote-id type="github">Unidata/netcdf-c</remote-id> diff --git a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild new file mode 100644 index 000000000000..45758fb6ef38 --- /dev/null +++ b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Scientific library and interface for array oriented data access" +HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" +SRC_URI="https://downloads.unidata.ucar.edu/netcdf-c/${PV}/${PN}-c-${PV}.tar.gz" +S="${WORKDIR}"/${PN}-c-${PV} + +LICENSE="UCAR-Unidata" +# SONAME of libnetcdf.so +SLOT="0/19" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd" +RESTRICT="!test? ( test )" + +# NOTE OPTION(ENABLE_HDF4 "Build netCDF-4 with HDF4 read capability(HDF4, HDF5 and Zlib required)." OFF) +RDEPEND=" + dev-libs/libxml2:= + sys-libs/zlib:= + blosc? ( dev-libs/c-blosc:= ) + bzip2? ( app-arch/bzip2:= ) + dap? ( net-misc/curl:= ) + hdf? ( + media-libs/libjpeg-turbo:= + sci-libs/hdf:= + sci-libs/hdf5:= + ) + hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] ) + zstd? ( app-arch/zstd:= ) +" + +# deflate blosc zstd bz2 +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen[dot] ) +" + +REQUIRED_USE=" + szip? ( hdf5 ) + mpi? ( hdf5 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.7.4-big-endian-test.patch +) + +src_configure() { + use mpi && export CC=mpicc + + local mycmakeargs=( + -DCMAKE_POLICY_DEFAULT_CMP0153="OLD" # exec_program + + -DENABLE_DAP_REMOTE_TESTS=OFF + #-DENABLE_HDF4_FILE_TESTS=OFF + -DENABLE_LIBXML2=ON + + -DBUILD_SHARED_LIBS="yes" + -DBUILD_TESTING="$(usex test)" + -DBUILD_UTILITIES="yes" + + -DENABLE_DAP="$(usex dap)" + -DENABLE_DAP2="$(usex dap)" + -DENABLE_DAP4="$(usex dap)" + + -DENABLE_DOXYGEN="$(usex doc)" + -DENABLE_EXAMPLES="$(usex examples)" + -DENABLE_HDF4="$(usex hdf)" + -DENABLE_NETCDF_4="$(usex hdf5)" + -DENABLE_TESTS="$(usex test)" + + -DENABLE_NCZARR="yes" + # NOTE set these via MYCMAKEARGS if need be + # -DENABLE_NCZARR_FILTERS="yes" + # -DENABLE_NCZARR_FILTER_TESTING="yes" + # -DENABLE_NCZARR_ZIP="yes" + + -DCMAKE_DISABLE_FIND_PACKAGE_Blosc="$(usex !blosc)" + -DCMAKE_DISABLE_FIND_PACKAGE_Bz2="$(usex !bzip2)" + -DCMAKE_DISABLE_FIND_PACKAGE_Szip="$(usex !szip)" + -DCMAKE_DISABLE_FIND_PACKAGE_Zstd="$(usex !zstd)" + ) + + cmake_src_configure +} + +src_test() { + if [[ -f "${BUILD_DIR}/nc_test4/run_par_test.sh" ]]; then + sed -e 's/mpiexec/mpiexec --use-hwthread-cpus/g' -i "${BUILD_DIR}/nc_test4/run_par_test.sh" || die + fi + + cmake_src_test +} + +src_install() { + cmake_src_install + + # bug #827188 + sed -i -re "s:${EPREFIX}/usr/$(get_libdir)/lib(dl|m).(so|a);:\1;:g" "${ED}/usr/$(get_libdir)/cmake/netCDF/netCDFTargets.cmake" || die +} diff --git a/sci-libs/netcdf/netcdf-4.9.2.ebuild b/sci-libs/netcdf/netcdf-4.9.2.ebuild index 186210a47b95..c07bfa2a6298 100644 --- a/sci-libs/netcdf/netcdf-4.9.2.ebuild +++ b/sci-libs/netcdf/netcdf-4.9.2.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 @@ -30,7 +30,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " REQUIRED_USE=" diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml index 2147f867cb61..17976ba280dd 100644 --- a/sci-libs/nlopt/metadata.xml +++ b/sci-libs/nlopt/metadata.xml @@ -6,18 +6,21 @@ <name>Gentoo Science Project</name> </maintainer> <longdescription lang="en"> - NLopt is a library for nonlinear optimization, - providing a common interface for a number of different free - optimization routines available online as well as original - implementations of various other algorithms. Its features include: - * Callable from variety of languages (C, C++, Fortran, Python, Octave) - * A common interface for many different algorithms—try a different - algorithm just by changing one parameter. - * Both global and local optimization algorithms. - * Both derivative-free and gradient-based optimization algorithms. - * Algorithms for unconstrained optimization, bound-constrained - optimization, and general nonlinear inequality constraints. + NLopt is a library for nonlinear optimization, + providing a common interface for a number of different free + optimization routines available online as well as original + implementations of various other algorithms. Its features include: + * Callable from variety of languages (C, C++, Fortran, Python, Octave) + * A common interface for many different algorithms—try a different + algorithm just by changing one parameter. + * Both global and local optimization algorithms. + * Both derivative-free and gradient-based optimization algorithms. + * Algorithms for unconstrained optimization, bound-constrained + optimization, and general nonlinear inequality constraints. </longdescription> + <upstream> + <remote-id type="github">stevengj/nlopt</remote-id> + </upstream> <use> <flag name="octave">Add plugin for <pkg>sci-mathematics/octave</pkg></flag> </use> diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild index 634c1c5947bf..4788982d8935 100644 --- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild +++ b/sci-libs/nlopt/nlopt-2.7.1-r2.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..11} ) +PYTHON_COMPAT=( python3_{10..12} ) FORTRAN_NEEDED="test" inherit python-r1 cmake fortran-2 @@ -13,7 +13,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 ~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="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-libs/o2scl/Manifest b/sci-libs/o2scl/Manifest deleted file mode 100644 index bb8146a5d629..000000000000 --- a/sci-libs/o2scl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST o2scl-0.920.tar.gz 34498666 BLAKE2B de269d1d6d329786d34dcbf84b6cb89d5bfae709ff1e0116455dbf8cee9e66d45b2a66086ca467037c572a8495ad198a23836861914c681050471810dda00354 SHA512 a80c959b76d15473e206f1caac496607af254f0617f7a18d13bd9732861b6c51f5db8ca3ff6866bb8d0ea70865d4ac94cb972e0a0c158f19034667340341467c diff --git a/sci-libs/o2scl/metadata.xml b/sci-libs/o2scl/metadata.xml deleted file mode 100644 index bfbde3f72f12..000000000000 --- a/sci-libs/o2scl/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - O2scl is a C++ class library for object-oriented numerical - programming. It includes classes based on numerical routines from - GSL and CERNLIB and two sub-libraries: thermodynamics of ideal and - nearly-ideal particles with quantum statistics and e quations of - state for finite density relevant for neutron stars. - </longdescription> - <use> - <flag name="armadillo">Build matrix manipulation with <pkg>sci-libs/armadillo</pkg></flag> - <flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag> - </use> - <upstream> - <remote-id type="github">awsteiner/o2scl</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/o2scl/o2scl-0.920.ebuild b/sci-libs/o2scl/o2scl-0.920.ebuild deleted file mode 100644 index b82c2a9bcc19..000000000000 --- a/sci-libs/o2scl/o2scl-0.920.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Object-oriented Scientific Computing Library" -HOMEPAGE="https://web.utk.edu/~asteine1/o2scl/" -SRC_URI="https://github.com/awsteiner/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="armadillo debug doc examples eigen fftw gsl hdf5 openmp readline static-libs" - -RDEPEND=" - dev-libs/boost:= - >=sci-libs/gsl-2:0= - virtual/cblas:= - eigen? ( dev-cpp/eigen:3 ) - armadillo? ( sci-libs/armadillo[lapack] ) - fftw? ( sci-libs/fftw:3.0= ) - hdf5? ( sci-libs/hdf5:0= ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp && ! tc-check-openmp; then - ewarn "OpenMP is not available in your current selected compiler" - die "need openmp capable compiler" - fi -} - -src_configure() { - use debug || append-cppflags -DO2SCL_NO_RANGE_CHECK - econf \ - --enable-acol \ - $(use_enable armadillo) \ - $(use_enable eigen) \ - $(use_enable fftw) \ - $(use_enable gsl gsl2) \ - $(use_enable hdf5 hdf) \ - $(use_enable hdf5 partlib) \ - $(use_enable hdf5 eoslib) \ - $(use_enable openmp) \ - $(use_enable static-libs static) -} - -src_install() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - rm -r "${ED}"/usr/doc || die - if use doc; then - dodoc -r doc/o2scl/html - docompress -x /usr/share/doc/${PF}/html - fi - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sci-libs/oc/oc-2.0.ebuild b/sci-libs/oc/oc-2.0-r1.ebuild index ee688999d5dd..7928f0b41d15 100644 --- a/sci-libs/oc/oc-2.0.ebuild +++ b/sci-libs/oc/oc-2.0-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit flag-o-matic DESCRIPTION="Network Data Access Protocol client C library" HOMEPAGE="https://opendap.org/" @@ -18,6 +20,15 @@ RDEPEND="net-misc/curl" DEPEND="${RDEPEND}" src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862906 + # + # Upstream exists, they just don't seem to mention oc anymore, *anywhere*. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf --disable-static } diff --git a/sci-libs/octomap/octomap-1.9.8.ebuild b/sci-libs/octomap/octomap-1.9.8.ebuild index 0902d3e3b2a0..c4d6b422062c 100644 --- a/sci-libs/octomap/octomap-1.9.8.ebuild +++ b/sci-libs/octomap/octomap-1.9.8.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=7 @@ -25,7 +25,7 @@ RDEPEND=" " BDEPEND="${RDEPEND} doc? ( - app-doc/doxygen + app-text/doxygen media-gfx/graphviz ) " diff --git a/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch b/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch new file mode 100644 index 000000000000..476f77b938ef --- /dev/null +++ b/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch @@ -0,0 +1,21 @@ +--- a/vpflib/vpfprop.c 2024-04-04 12:03:43.682864289 +0000 ++++ b/vpflib/vpfprop.c 2024-04-04 12:07:30.498441728 +0000 +@@ -840,7 +840,8 @@ + #endif + + { +- int32 ncov,i,j,k,n; ++ char ncov; ++ int32 i,j,k,n; + char path[255]; + char **ptr, **coverages, **subset, **fcnames=(char **)NULL; + +@@ -1447,7 +1447,7 @@ + int32 *nfc ) + #else + char **coverage_feature_class_names (library_path, coverage, nfc) +- char *library_path, coverage; ++ char *library_path, *coverage; + int32 *nfc; + #endif + diff --git a/sci-libs/ogdi/metadata.xml b/sci-libs/ogdi/metadata.xml index c51ca5360917..429161d45435 100644 --- a/sci-libs/ogdi/metadata.xml +++ b/sci-libs/ogdi/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">ogdi</remote-id> + <remote-id type="github">libogdi/ogdi</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild index e449cbd2f7e3..c0eb8f3c5dff 100644 --- a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild +++ b/sci-libs/ogdi/ogdi-4.1.0-r1.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=7 @@ -26,6 +26,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.2.0-endianess.patch "${FILESDIR}"/${PN}-3.2.0-optimisation.patch "${FILESDIR}"/${PN}-3.2.0-tcl.patch + "${FILESDIR}"/${P}-c99-conversions.patch ) src_prepare() { diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index d47a8a91e628..9d273cf27dc6 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -1,4 +1 @@ -DIST onnx-1.11.0.tar.gz 9464979 BLAKE2B dfc8ab81d4776f806fa26c751c1eb1e19ea4cf9f0aa498880dc18eca160fdd9c43eda0077124ea7a674082e5ed93de7497411c48c3f9a12146905072e6477af6 SHA512 dc7045702188d7f40fead3ab6eccd8ff63357824c36873b415ad989d19aa952ff2c3758120de9050d84d92a35993198971be54ffa8e8d99fc70aa1b14b2ff73e -DIST onnx-1.12.0.tar.gz 9531142 BLAKE2B 59117ea95e3686ca41c307f9ee35fbb3e9abc3b262943211a3c25f7ef3f89e3a185145f92c9dfc4108469a3bc4580a140de7c436f97a35e64902d5a6ed5ac8ab SHA512 ab0c4f92358e904c2f28d98b35eab2d6eac22dd0a270e4f45ee590aa1ad22d09e92b32225efd7e98edb1531743f150526d26e0cbdc537757784bef2bc93efa8e -DIST onnx-1.13.1.tar.gz 10782133 BLAKE2B e5c93e00ccb73b56e839da48b255132f8c60508a258d136b53a2755caabed5f1b962208d570c71068484b269f016a08b398d6c8f4fc86d3850ad6d5742b760b6 SHA512 325859f591dece43a083a0945aefe3427bfdb68a98ef5922343bf7ed959528947e7664d6c8e3e3d35c390d6c20ef22d07c672e5311f80c72c199931be6c256c3 -DIST onnx-1.14.0.tar.gz 11568979 BLAKE2B 9aed36489f0bbe0a96f2a7d3f44b70d228a7ec1239f5ba2b16f4b2c9ffa8fb1ddddba06b1b5e6d279d12f8d55eaeece6654da0c60220bf813e99df74e33a33eb SHA512 8a525b365fd203f0a59bcf82fa7f2e29d7e0563885ebe38269c596cd4eb949bcfc65d848b92b7abafa7ddecedcfc019f8779097ffcb5087f06037cace24462fc +DIST onnx-1.16.0.tar.gz 12428161 BLAKE2B b0d16212c527078fcbe46af8efaf8bfccb0a22825cfee3c88728314599bc90f5b43ae407cc9ec10300ed19367dff769a5d6ba29d2faa61fd8e27029e2d64e83a SHA512 ef641447d8d6c4ed9f083793fe14a8568d6aa7b9b7e7b859a4082e9b892acd801230da2027d097ceaa0d68bbd37b2422b89bb7d1d55d5c3b5955c0f9c7c657c5 diff --git a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch b/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch deleted file mode 100644 index 239e0bd3a56a..000000000000 --- a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2023-09-01 12:19:40.772172388 +0200 -+++ b/CMakeLists.txt 2023-09-01 12:19:53.422188861 +0200 -@@ -58,7 +58,7 @@ - # Required to use /std:c++17 or higher on Windows - # For other platforms, set C++11 as standard for the whole project - if(NOT MSVC) -- set(CMAKE_CXX_STANDARD 11) -+ set(CMAKE_CXX_STANDARD 14) - else() - string(APPEND CMAKE_CXX_FLAGS " /std:c++17") - endif() diff --git a/sci-libs/onnx/files/onnx-1.15.0-hidden.patch b/sci-libs/onnx/files/onnx-1.15.0-hidden.patch new file mode 100644 index 000000000000..b500c01a91bc --- /dev/null +++ b/sci-libs/onnx/files/onnx-1.15.0-hidden.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt 2024-05-04 19:39:17.464135798 +0200 ++++ b/CMakeLists.txt 2024-05-04 19:39:23.155068064 +0200 +@@ -496,7 +496,6 @@ + else() + # On non-Windows, hide all symbols we don't need + set(ONNX_API_DEFINE "-DONNX_API=__attribute__\(\(__visibility__\(\"default\"\)\)\)") +- set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden) + set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1) + endif() + target_compile_definitions(onnx_proto PRIVATE ${ONNX_API_DEFINE}) diff --git a/sci-libs/onnx/metadata.xml b/sci-libs/onnx/metadata.xml index 2a58de7a87a9..e06b5c6e88c2 100644 --- a/sci-libs/onnx/metadata.xml +++ b/sci-libs/onnx/metadata.xml @@ -5,6 +5,9 @@ <email>tupone@gentoo.org</email> <name>Tupone Alfredo</name> </maintainer> + <use> + <flag name="disableStaticReg">Disable Static Registration</flag> + </use> <upstream> <remote-id type="github">onnx/onnx</remote-id> </upstream> diff --git a/sci-libs/onnx/onnx-1.11.0-r2.ebuild b/sci-libs/onnx/onnx-1.11.0-r2.ebuild deleted file mode 100644 index ba196590ef22..000000000000 --- a/sci-libs/onnx/onnx-1.11.0-r2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-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" -RESTRICT="test" - -DEPEND="" -RDEPEND="${DEPEND} - dev-libs/protobuf:=" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/patchelf -" - -src_configure() { - local mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - patchelf --set-soname libonnxifi.so "${ED}"/usr/lib/libonnxifi.so \ - || die - mv "${ED}"/usr/lib/libonnxifi.so "${ED}"/usr/$(get_libdir)/libonnxifi.so \ - || die -} diff --git a/sci-libs/onnx/onnx-1.12.0.ebuild b/sci-libs/onnx/onnx-1.12.0.ebuild deleted file mode 100644 index ba196590ef22..000000000000 --- a/sci-libs/onnx/onnx-1.12.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-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" -RESTRICT="test" - -DEPEND="" -RDEPEND="${DEPEND} - dev-libs/protobuf:=" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/patchelf -" - -src_configure() { - local mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - patchelf --set-soname libonnxifi.so "${ED}"/usr/lib/libonnxifi.so \ - || die - mv "${ED}"/usr/lib/libonnxifi.so "${ED}"/usr/$(get_libdir)/libonnxifi.so \ - || die -} diff --git a/sci-libs/onnx/onnx-1.13.1-r1.ebuild b/sci-libs/onnx/onnx-1.13.1-r1.ebuild deleted file mode 100644 index 1de081f5931b..000000000000 --- a/sci-libs/onnx/onnx-1.13.1-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-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" -RESTRICT="test" - -DEPEND="" -RDEPEND="${DEPEND} - dev-libs/protobuf:=" -BDEPEND=" - ${PYTHON_DEPS} -" - -PATCHES=( "${FILESDIR}"/${PN}-1.14.0-cxx_14.patch ) - -src_configure() { - local mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - ) - cmake_src_configure -} diff --git a/sci-libs/onnx/onnx-1.14.0-r1.ebuild b/sci-libs/onnx/onnx-1.14.0-r1.ebuild deleted file mode 100644 index bed797b68a21..000000000000 --- a/sci-libs/onnx/onnx-1.14.0-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-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" -RESTRICT="test" - -DEPEND="" -RDEPEND="${DEPEND} - dev-libs/protobuf:=" -BDEPEND=" - ${PYTHON_DEPS} -" - -PATCHES=( "${FILESDIR}"/${P}-cxx_14.patch ) - -src_configure() { - local mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - ) - cmake_src_configure -} diff --git a/sci-libs/onnx/onnx-1.16.0-r1.ebuild b/sci-libs/onnx/onnx-1.16.0-r1.ebuild new file mode 100644 index 000000000000..16f073d9b4d3 --- /dev/null +++ b/sci-libs/onnx/onnx-1.16.0-r1.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[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-libs/protobuf:= +" +DEPEND="${RDEPEND} + dev-cpp/abseil-cpp" + +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/Manifest b/sci-libs/openblas/Manifest index ba6ab6c54c50..62f8bbbfc4b8 100644 --- a/sci-libs/openblas/Manifest +++ b/sci-libs/openblas/Manifest @@ -1,2 +1,2 @@ -DIST openblas-0.3.21.tar.gz 23729571 BLAKE2B 678bfb13ead69045e7d4d840bbcaed884d9ebedded5425cfa1f55e3d85bda31a3eb43dbbf9f07099d0d198f97ae68ef3b3b2b78aa1bd5b4999dd729dc08f7e28 SHA512 4625c8e6ccfa9120281fd714d3f6b7c3ba2265470c1be76121d6b25dc3dacb899d26e5d9a417ddc616d23909f1411495aa995ef8d8d6df8511cd5cefbabcb1c5 -DIST openblas-0.3.23.tar.gz 23950794 BLAKE2B 8394e09c682bba10450248cbbe090bb81c26661eac7d238942055ae0eecce752c8a3481af905de9efe20fe635f2c4a0e06af83bb64c998ab410e4cdc56751a47 SHA512 ea64c693e57eb63cc2a88e4d6ab2d8cf9ab84ae6a15048fb12090a3570dd41053e62e99c1ff9d3e02dd67ca93233591ab41b8c017d06585d0a69222e1ad3023f +DIST OpenBLAS-0.3.25.tar.gz 24073168 BLAKE2B c2a173b50f6931e7782c7d429487abd4b1a4ed05aec4f08febbc5cc73b9ed5cb36c9e308bf7cb89ce116b1c25556615d2384087cf7d1b489a4784901951558bc SHA512 69bcf8082575b01ce1734fc9d33454314964a7e81ff29a7c1a764af3083ac0dc24289fd72bbe22c9583398bda7b658d6e4ab1d5036e43412745f0be3c2185b3c +DIST OpenBLAS-0.3.26.tar.gz 24404912 BLAKE2B d72f02492b3ce58c5012943ea84190cb8a8efdfe438fb4fe945a713e4abbcb77f3a0603ca266df234efe8e6d6e4bab4a7386ac02b95512281165bf7ae2f9181d SHA512 01d3a536fbfa62f276fd6b1ad0e218fb3d91f41545fc83ddc74979fa26372d8389f0baa20334badfe0adacd77bd944c50a47ac920577373fcc1d495553084373 diff --git a/sci-libs/openblas/files/openblas-0.3.12-shared-blas-lapack.patch b/sci-libs/openblas/files/openblas-0.3.12-shared-blas-lapack.patch deleted file mode 100644 index 55fb7d7c66ca..000000000000 --- a/sci-libs/openblas/files/openblas-0.3.12-shared-blas-lapack.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/interface/Makefile b/interface/Makefile -index 6b247b4..1297c73 100644 ---- a/interface/Makefile -+++ b/interface/Makefile -@@ -330,7 +330,7 @@ CCBLAS3OBJS = \ - cblas_chemm.$(SUFFIX) cblas_cherk.$(SUFFIX) cblas_cher2k.$(SUFFIX) \ - cblas_comatcopy.$(SUFFIX) cblas_cimatcopy.$(SUFFIX)\ - cblas_cgeadd.$(SUFFIX) -- -+ - CXERBLAOBJ = \ - cblas_xerbla.$(SUFFIX) - -@@ -2310,3 +2310,22 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PSUFFIX) : zgeadd.c - cblas_xerbla.$(SUFFIX) cblas_xerbla.$(PSUFFIX) : xerbla.c - $(CC) -c $(CFLAGS) -DCBLAS $< -o $(@F) - -+##### -+shared-blas-lapack: libblas.so.3 libcblas.so.3 liblapack.so.3 liblapacke.so.3 -+ -+# The list of prerequisite is created by comparing with NETLIB BLAS public API. -+libblas.so.3: $(SBLAS1OBJS) $(SBLAS2OBJS) $(SBLAS3OBJS) $(DBLAS1OBJS) $(DBLAS2OBJS) $(DBLAS3OBJS) $(CBLAS1OBJS) $(CBLAS2OBJS) $(CBLAS3OBJS) $(ZBLAS1OBJS) $(ZBLAS2OBJS) $(ZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o -+ $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libblas.so.3 -L.. -lopenblas $(EXTRALIB) -+ -+libcblas.so.3: $(CSBLAS1OBJS) $(CSBLAS2OBJS) $(CSBLAS3OBJS) $(CDBLAS1OBJS) $(CDBLAS2OBJS) $(CDBLAS3OBJS) $(CCBLAS1OBJS) $(CCBLAS2OBJS) $(CCBLAS3OBJS) $(CZBLAS1OBJS) $(CZBLAS2OBJS) $(CZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o -+ $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libcblas.so.3 -L.. -lopenblas $(EXTRALIB) -+ -+# The prerequisites must match the symbols deleted in target delete-duplicate-lapack-objects -+liblapack.so.3: $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) ../kernel/lsame.o ../driver/others/xerbla.o -+ $(CC) $(LDFLAGS) -shared -o $@ $^ ../lapack-netlib/SRC/*.o -Wl,-soname,liblapack.so.3 -L.. -lopenblas $(EXTRALIB) -+ -+liblapacke.so.3: liblapack.so.3 -+ $(CC) $(LDFLAGS) -shared -o $@ `find ../lapack-netlib/LAPACKE -name "*.o"` -Wl,-soname,liblapacke.so.3 -L.. -lopenblas $(EXTRALIB) -+ -+clean:: -+ rm -f libblas.so.3 libcblas.so.3 liblapack.so.3 diff --git a/sci-libs/openblas/files/openblas-0.3.21-clang16.patch b/sci-libs/openblas/files/openblas-0.3.21-clang16.patch deleted file mode 100644 index 051966b0a870..000000000000 --- a/sci-libs/openblas/files/openblas-0.3.21-clang16.patch +++ /dev/null @@ -1,581 +0,0 @@ -https://github.com/xianyi/OpenBLAS/commit/f703846ad9400a8ea175cb8dd43e18c152aeab93 -https://github.com/xianyi/OpenBLAS/commit/515cf269291bec0d43651fe7bf99a71fb074a0ad -https://github.com/xianyi/OpenBLAS/commit/91110f92d218492d0efbdc1fdf34277ca45f4b36 -https://github.com/xianyi/OpenBLAS/commit/9402df5604e69f86f58953e3883f33f98c930baf -https://github.com/xianyi/OpenBLAS/commit/101a2c77c3f3610933f450cefca3e312edab2186 -https://src.fedoraproject.org/rpms/openblas/c/5f27d51cebe1c1bb6598d38326ece8dc0ac71ec7?branch=rawhide - -From f703846ad9400a8ea175cb8dd43e18c152aeab93 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de> -Date: Sat, 13 Aug 2022 11:38:27 +0200 -Subject: [PATCH] Add function prototypes - ---- a/exports/gensymbol -+++ b/exports/gensymbol -@@ -4000,6 +4000,22 @@ case "$p1" in - no_underscore_objs="$no_underscore_objs $misc_common_objs" - - printf 'int main(void){\n' -+ for obj in $underscore_objs; do -+ [ "$obj" != "xerbla" ] && printf 'extern void %s%s%s%s();\n' \ -+ "$symbolprefix" "$obj" "$bu" "$symbolsuffix" -+ done -+ -+ for obj in $need_2underscore_objs; do -+ printf 'extern void %s%s%s%s%s();\n' \ -+ "$symbolprefix" "$obj" "$bu" "$bu" "$symbolsuffix" -+ done -+ -+ for obj in $no_underscore_objs; do -+ printf 'extern void %s%s%s();\n' \ -+ "$symbolprefix" "$obj" "$symbolsuffix" -+ done -+ -+ printf '\n' - for obj in $underscore_objs; do - [ "$obj" != "xerbla" ] && printf '%s%s%s%s();\n' \ - "$symbolprefix" "$obj" "$bu" "$symbolsuffix" ---- a/exports/gensymbol.pl -+++ b/exports/gensymbol.pl -@@ -3955,6 +3955,18 @@ - @no_underscore_objs = (@no_underscore_objs, @misc_common_objs); - - print "int main(void){\n"; -+ foreach $objs (@underscore_objs) { -+ print "extern void ", $symbolprefix, $objs, $bu, $symbolsuffix, "();\n" if $objs ne "xerbla"; -+ } -+ -+ foreach $objs (@need_2underscore_objs) { -+ print "extern void ", $symbolprefix, $objs, $bu, $bu, $symbolsuffix, "();\n"; -+ } -+ -+ foreach $objs (@no_underscore_objs) { -+ print "extern void ", $symbolprefix, $objs, $symbolsuffix, "();\n"; -+ } -+ - foreach $objs (@underscore_objs) { - print $symbolprefix, $objs, $bu, $symbolsuffix, "();\n" if $objs ne "xerbla"; - } - -From 515cf269291bec0d43651fe7bf99a71fb074a0ad Mon Sep 17 00:00:00 2001 -From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de> -Date: Wed, 14 Sep 2022 11:48:36 +0200 -Subject: [PATCH] Fix pointer/integer argument mismatch in calls to pow() - ---- a/lapack-netlib/SRC/claed0.c -+++ b/lapack-netlib/SRC/claed0.c -@@ -796,10 +796,10 @@ f"> */ - - temp = log((real) (*n)) / log(2.f); - lgn = (integer) temp; -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } - iprmpt = indxq + *n + 1; ---- a/lapack-netlib/SRC/claed7.c -+++ b/lapack-netlib/SRC/claed7.c -@@ -864,11 +864,11 @@ f"> */ - /* Form the z-vector which consists of the last row of Q_1 and the */ - /* first row of Q_2. */ - -- ptr = pow_ii(&c__2, tlvls) + 1; -+ ptr = pow_ii(c__2, *tlvls) + 1; - i__1 = *curlvl - 1; - for (i__ = 1; i__ <= i__1; ++i__) { - i__2 = *tlvls - i__; -- ptr += pow_ii(&c__2, &i__2); -+ ptr += pow_ii(c__2, i__2); - /* L10: */ - } - curr = ptr + *curpbm; ---- a/lapack-netlib/SRC/clalsa.c -+++ b/lapack-netlib/SRC/clalsa.c -@@ -1051,7 +1051,7 @@ f"> */ - /* Finally go through the left singular vector matrices of all */ - /* the other subproblems bottom-up on the tree. */ - -- j = pow_ii(&c__2, &nlvl); -+ j = pow_ii(c__2, nlvl); - sqre = 0; - - for (lvl = nlvl; lvl >= 1; --lvl) { -@@ -1065,7 +1065,7 @@ f"> */ - ll = 1; - } else { - i__1 = lvl - 1; -- lf = pow_ii(&c__2, &i__1); -+ lf = pow_ii(c__2, i__1); - ll = (lf << 1) - 1; - } - i__1 = ll; -@@ -1110,7 +1110,7 @@ f"> */ - ll = 1; - } else { - i__2 = lvl - 1; -- lf = pow_ii(&c__2, &i__2); -+ lf = pow_ii(c__2, i__2); - ll = (lf << 1) - 1; - } - i__2 = lf; ---- a/lapack-netlib/SRC/cstedc.c -+++ b/lapack-netlib/SRC/cstedc.c -@@ -836,10 +836,10 @@ f"> */ - lrwmin = *n - 1 << 1; - } else if (icompz == 1) { - lgn = (integer) (log((real) (*n)) / log(2.f)); -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } - lwmin = *n * *n; ---- a/lapack-netlib/SRC/dlaed0.c -+++ b/lapack-netlib/SRC/dlaed0.c -@@ -827,10 +827,10 @@ f"> */ - - temp = log((doublereal) (*n)) / log(2.); - lgn = (integer) temp; -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } - iprmpt = indxq + *n + 1; ---- a/lapack-netlib/SRC/dlaed7.c -+++ b/lapack-netlib/SRC/dlaed7.c -@@ -885,11 +885,11 @@ f"> */ - /* Form the z-vector which consists of the last row of Q_1 and the */ - /* first row of Q_2. */ - -- ptr = pow_ii(&c__2, tlvls) + 1; -+ ptr = pow_ii(c__2, *tlvls) + 1; - i__1 = *curlvl - 1; - for (i__ = 1; i__ <= i__1; ++i__) { - i__2 = *tlvls - i__; -- ptr += pow_ii(&c__2, &i__2); -+ ptr += pow_ii(c__2, i__2); - /* L10: */ - } - curr = ptr + *curpbm; ---- a/lapack-netlib/SRC/dlaeda.c -+++ b/lapack-netlib/SRC/dlaeda.c -@@ -754,7 +754,7 @@ f"> */ - /* scheme */ - - i__1 = *curlvl - 1; -- curr = ptr + *curpbm * pow_ii(&c__2, curlvl) + pow_ii(&c__2, &i__1) - 1; -+ curr = ptr + *curpbm * pow_ii(c__2, *curlvl) + pow_ii(c__2, i__1) - 1; - - /* Determine size of these matrices. We add HALF to the value of */ - /* the SQRT in case the machine underestimates one of these square */ -@@ -781,12 +781,12 @@ f"> */ - /* rotations and permutation and then multiplying the center matrices */ - /* against the current Z. */ - -- ptr = pow_ii(&c__2, tlvls) + 1; -+ ptr = pow_ii(c__2, *tlvls) + 1; - i__1 = *curlvl - 1; - for (k = 1; k <= i__1; ++k) { - i__2 = *curlvl - k; - i__3 = *curlvl - k - 1; -- curr = ptr + *curpbm * pow_ii(&c__2, &i__2) + pow_ii(&c__2, &i__3) - -+ curr = ptr + *curpbm * pow_ii(c__2, i__2) + pow_ii(c__2, i__3) - - 1; - psiz1 = prmptr[curr + 1] - prmptr[curr]; - psiz2 = prmptr[curr + 2] - prmptr[curr + 1]; -@@ -847,7 +847,7 @@ f"> */ - c__1); - - i__2 = *tlvls - k; -- ptr += pow_ii(&c__2, &i__2); -+ ptr += pow_ii(c__2, i__2); - /* L70: */ - } - ---- a/lapack-netlib/SRC/dlalsa.c -+++ b/lapack-netlib/SRC/dlalsa.c -@@ -951,7 +951,7 @@ f"> */ - /* Finally go through the left singular vector matrices of all */ - /* the other subproblems bottom-up on the tree. */ - -- j = pow_ii(&c__2, &nlvl); -+ j = pow_ii(c__2, nlvl); - sqre = 0; - - for (lvl = nlvl; lvl >= 1; --lvl) { -@@ -965,7 +965,7 @@ f"> */ - ll = 1; - } else { - i__1 = lvl - 1; -- lf = pow_ii(&c__2, &i__1); -+ lf = pow_ii(c__2, i__1); - ll = (lf << 1) - 1; - } - i__1 = ll; -@@ -1010,7 +1010,7 @@ f"> */ - ll = 1; - } else { - i__2 = lvl - 1; -- lf = pow_ii(&c__2, &i__2); -+ lf = pow_ii(c__2, i__2); - ll = (lf << 1) - 1; - } - i__2 = lf; ---- a/lapack-netlib/SRC/dlasd0.c -+++ b/lapack-netlib/SRC/dlasd0.c -@@ -824,7 +824,7 @@ f"> */ - ll = 1; - } else { - i__1 = lvl - 1; -- lf = pow_ii(&c__2, &i__1); -+ lf = pow_ii(c__2, i__1); - ll = (lf << 1) - 1; - } - i__1 = ll; ---- a/lapack-netlib/SRC/dlasda.c -+++ b/lapack-netlib/SRC/dlasda.c -@@ -1027,7 +1027,7 @@ f"> */ - - /* Now conquer each subproblem bottom-up. */ - -- j = pow_ii(&c__2, &nlvl); -+ j = pow_ii(c__2, nlvl); - for (lvl = nlvl; lvl >= 1; --lvl) { - lvl2 = (lvl << 1) - 1; - -@@ -1039,7 +1039,7 @@ f"> */ - ll = 1; - } else { - i__1 = lvl - 1; -- lf = pow_ii(&c__2, &i__1); -+ lf = pow_ii(c__2, i__1); - ll = (lf << 1) - 1; - } - i__1 = ll; ---- a/lapack-netlib/SRC/dstedc.c -+++ b/lapack-netlib/SRC/dstedc.c -@@ -806,10 +806,10 @@ f"> */ - lwmin = *n - 1 << 1; - } else { - lgn = (integer) (log((doublereal) (*n)) / log(2.)); -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } - if (icompz == 1) { ---- a/lapack-netlib/SRC/slaed0.c -+++ b/lapack-netlib/SRC/slaed0.c -@@ -823,10 +823,10 @@ f"> */ - - temp = log((real) (*n)) / log(2.f); - lgn = (integer) temp; -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } - iprmpt = indxq + *n + 1; ---- a/lapack-netlib/SRC/slaed7.c -+++ b/lapack-netlib/SRC/slaed7.c -@@ -883,11 +883,11 @@ f"> */ - /* Form the z-vector which consists of the last row of Q_1 and the */ - /* first row of Q_2. */ - -- ptr = pow_ii(&c__2, tlvls) + 1; -+ ptr = pow_ii(c__2, *tlvls) + 1; - i__1 = *curlvl - 1; - for (i__ = 1; i__ <= i__1; ++i__) { - i__2 = *tlvls - i__; -- ptr += pow_ii(&c__2, &i__2); -+ ptr += pow_ii(c__2, i__2); - /* L10: */ - } - curr = ptr + *curpbm; ---- a/lapack-netlib/SRC/slaeda.c -+++ b/lapack-netlib/SRC/slaeda.c -@@ -753,7 +753,7 @@ f"> */ - /* scheme */ - - i__1 = *curlvl - 1; -- curr = ptr + *curpbm * pow_ii(&c__2, curlvl) + pow_ii(&c__2, &i__1) - 1; -+ curr = ptr + *curpbm * pow_ii(c__2, *curlvl) + pow_ii(c__2, i__1) - 1; - - /* Determine size of these matrices. We add HALF to the value of */ - /* the SQRT in case the machine underestimates one of these square */ -@@ -779,12 +779,12 @@ f"> */ - /* rotations and permutation and then multiplying the center matrices */ - /* against the current Z. */ - -- ptr = pow_ii(&c__2, tlvls) + 1; -+ ptr = pow_ii(c__2, *tlvls) + 1; - i__1 = *curlvl - 1; - for (k = 1; k <= i__1; ++k) { - i__2 = *curlvl - k; - i__3 = *curlvl - k - 1; -- curr = ptr + *curpbm * pow_ii(&c__2, &i__2) + pow_ii(&c__2, &i__3) - -+ curr = ptr + *curpbm * pow_ii(c__2, i__2) + pow_ii(c__2, i__3) - - 1; - psiz1 = prmptr[curr + 1] - prmptr[curr]; - psiz2 = prmptr[curr + 2] - prmptr[curr + 1]; -@@ -844,7 +844,7 @@ f"> */ - c__1); - - i__2 = *tlvls - k; -- ptr += pow_ii(&c__2, &i__2); -+ ptr += pow_ii(c__2, i__2); - /* L70: */ - } - ---- a/lapack-netlib/SRC/slalsa.c -+++ b/lapack-netlib/SRC/slalsa.c -@@ -946,7 +946,7 @@ f"> */ - /* Finally go through the left singular vector matrices of all */ - /* the other subproblems bottom-up on the tree. */ - -- j = pow_ii(&c__2, &nlvl); -+ j = pow_ii(c__2, nlvl); - sqre = 0; - - for (lvl = nlvl; lvl >= 1; --lvl) { -@@ -960,7 +960,7 @@ f"> */ - ll = 1; - } else { - i__1 = lvl - 1; -- lf = pow_ii(&c__2, &i__1); -+ lf = pow_ii(c__2, i__1); - ll = (lf << 1) - 1; - } - i__1 = ll; -@@ -1005,7 +1005,7 @@ f"> */ - ll = 1; - } else { - i__2 = lvl - 1; -- lf = pow_ii(&c__2, &i__2); -+ lf = pow_ii(c__2, i__2); - ll = (lf << 1) - 1; - } - i__2 = lf; ---- a/lapack-netlib/SRC/slasd0.c -+++ b/lapack-netlib/SRC/slasd0.c -@@ -821,7 +821,7 @@ f"> */ - ll = 1; - } else { - i__1 = lvl - 1; -- lf = pow_ii(&c__2, &i__1); -+ lf = pow_ii(c__2, i__1); - ll = (lf << 1) - 1; - } - i__1 = ll; ---- a/lapack-netlib/SRC/slasda.c -+++ b/lapack-netlib/SRC/slasda.c -@@ -1023,7 +1023,7 @@ f"> */ - - /* Now conquer each subproblem bottom-up. */ - -- j = pow_ii(&c__2, &nlvl); -+ j = pow_ii(c__2, nlvl); - for (lvl = nlvl; lvl >= 1; --lvl) { - lvl2 = (lvl << 1) - 1; - -@@ -1035,7 +1035,7 @@ f"> */ - ll = 1; - } else { - i__1 = lvl - 1; -- lf = pow_ii(&c__2, &i__1); -+ lf = pow_ii(c__2, i__1); - ll = (lf << 1) - 1; - } - i__1 = ll; ---- a/lapack-netlib/SRC/sstedc.c -+++ b/lapack-netlib/SRC/sstedc.c -@@ -804,10 +804,10 @@ f"> */ - lwmin = *n - 1 << 1; - } else { - lgn = (integer) (log((real) (*n)) / log(2.f)); -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } - if (icompz == 1) { ---- a/lapack-netlib/SRC/zlaed0.c -+++ b/lapack-netlib/SRC/zlaed0.c -@@ -793,10 +793,10 @@ f"> */ - - temp = log((doublereal) (*n)) / log(2.); - lgn = (integer) temp; -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } - iprmpt = indxq + *n + 1; ---- a/lapack-netlib/SRC/zlaed7.c -+++ b/lapack-netlib/SRC/zlaed7.c -@@ -864,11 +864,11 @@ f"> */ - /* Form the z-vector which consists of the last row of Q_1 and the */ - /* first row of Q_2. */ - -- ptr = pow_ii(&c__2, tlvls) + 1; -+ ptr = pow_ii(c__2, *tlvls) + 1; - i__1 = *curlvl - 1; - for (i__ = 1; i__ <= i__1; ++i__) { - i__2 = *tlvls - i__; -- ptr += pow_ii(&c__2, &i__2); -+ ptr += pow_ii(c__2, i__2); - /* L10: */ - } - curr = ptr + *curpbm; ---- a/lapack-netlib/SRC/zlalsa.c -+++ b/lapack-netlib/SRC/zlalsa.c -@@ -1051,7 +1051,7 @@ f"> */ - /* Finally go through the left singular vector matrices of all */ - /* the other subproblems bottom-up on the tree. */ - -- j = pow_ii(&c__2, &nlvl); -+ j = pow_ii(c__2, nlvl); - sqre = 0; - - for (lvl = nlvl; lvl >= 1; --lvl) { -@@ -1065,7 +1065,7 @@ f"> */ - ll = 1; - } else { - i__1 = lvl - 1; -- lf = pow_ii(&c__2, &i__1); -+ lf = pow_ii(c__2, i__1); - ll = (lf << 1) - 1; - } - i__1 = ll; -@@ -1110,7 +1110,7 @@ f"> */ - ll = 1; - } else { - i__2 = lvl - 1; -- lf = pow_ii(&c__2, &i__2); -+ lf = pow_ii(c__2, i__2); - ll = (lf << 1) - 1; - } - i__2 = lf; ---- a/lapack-netlib/SRC/zstedc.c -+++ b/lapack-netlib/SRC/zstedc.c -@@ -836,10 +836,10 @@ f"> */ - lrwmin = *n - 1 << 1; - } else if (icompz == 1) { - lgn = (integer) (log((doublereal) (*n)) / log(2.)); -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } -- if (pow_ii(&c__2, &lgn) < *n) { -+ if (pow_ii(c__2, lgn) < *n) { - ++lgn; - } - lwmin = *n * *n; - -From 91110f92d218492d0efbdc1fdf34277ca45f4b36 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de> -Date: Wed, 14 Sep 2022 14:03:31 +0200 -Subject: [PATCH] fix missing return type in function declaration - ---- a/ctest/c_sblat1c.c -+++ b/ctest/c_sblat1c.c -@@ -969,7 +969,7 @@ real *sfac; - 1.17 }; - - /* Local variables */ -- extern /* Subroutine */ srottest_(); -+ extern /* Subroutine */ void srottest_(); - static integer i__, k, ksize; - extern /* Subroutine */ int stest_(), srotmtest_(); - static integer ki, kn; - -From 9402df5604e69f86f58953e3883f33f98c930baf Mon Sep 17 00:00:00 2001 -From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de> -Date: Wed, 14 Sep 2022 21:44:34 +0200 -Subject: [PATCH] Fix missing external declaration - ---- a/driver/others/blas_server_omp.c -+++ b/driver/others/blas_server_omp.c -@@ -69,6 +69,8 @@ - - int blas_server_avail = 0; - -+extern int openblas_omp_adaptive_env(); -+ - static void * blas_thread_buffer[MAX_PARALLEL_NUMBER][MAX_CPU_NUMBER]; - #ifdef HAVE_C11 - static atomic_bool blas_buffer_inuse[MAX_PARALLEL_NUMBER]; - -From 101a2c77c3f3610933f450cefca3e312edab2186 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de> -Date: Thu, 15 Sep 2022 09:19:19 +0200 -Subject: [PATCH] Fix warnings - ---- a/kernel/x86_64/dgemm_ncopy_8_skylakex.c -+++ b/kernel/x86_64/dgemm_ncopy_8_skylakex.c -@@ -52,18 +52,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT * __restrict a, BLASLONG lda, FLOAT * __ - FLOAT ctemp05, ctemp06, ctemp07, ctemp08; - FLOAT ctemp09, ctemp10, ctemp11, ctemp12; - FLOAT ctemp13, ctemp14, ctemp15, ctemp16; -- FLOAT ctemp17, ctemp18, ctemp19, ctemp20; -- FLOAT ctemp21, ctemp22, ctemp23, ctemp24; -- FLOAT ctemp25, ctemp26, ctemp27, ctemp28; -- FLOAT ctemp29, ctemp30, ctemp31, ctemp32; -- FLOAT ctemp33, ctemp34, ctemp35, ctemp36; -- FLOAT ctemp37, ctemp38, ctemp39, ctemp40; -- FLOAT ctemp41, ctemp42, ctemp43, ctemp44; -- FLOAT ctemp45, ctemp46, ctemp47, ctemp48; -- FLOAT ctemp49, ctemp50, ctemp51, ctemp52; -- FLOAT ctemp53, ctemp54, ctemp55, ctemp56; -- FLOAT ctemp57, ctemp58, ctemp59, ctemp60; -- FLOAT ctemp61, ctemp62, ctemp63, ctemp64; -+ FLOAT ctemp17 /*, ctemp18, ctemp19, ctemp20*/ ; -+ FLOAT /*ctemp21, ctemp22,*/ ctemp23, ctemp24; -+ FLOAT ctemp25 /*, ctemp26, ctemp27, ctemp28*/ ; -+ FLOAT /*ctemp29, ctemp30,*/ ctemp31, ctemp32; -+ FLOAT ctemp33 /*, ctemp34, ctemp35, ctemp36*/ ; -+ FLOAT /*ctemp37, ctemp38,*/ ctemp39, ctemp40; -+ FLOAT ctemp41 /*, ctemp42, ctemp43, ctemp44*/ ; -+ FLOAT /*ctemp45, ctemp46,*/ ctemp47, ctemp48; -+ FLOAT ctemp49 /*, ctemp50, ctemp51, ctemp52*/ ; -+ FLOAT /*ctemp53, ctemp54,*/ ctemp55, ctemp56; -+ FLOAT ctemp57 /*, ctemp58, ctemp59, ctemp60*/ ; -+ FLOAT /*ctemp61, ctemp62,*/ ctemp63, ctemp64; - - - aoffset = a; ---- a/kernel/x86_64/omatcopy_rt.c -+++ b/kernel/x86_64/omatcopy_rt.c -@@ -142,7 +142,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ,"xmm0","xmm1","xmm2","xmm3","xmm4","xmm5","xmm6","xmm7","xmm8","xmm9","xmm10","xmm11","xmm12","xmm13","xmm14","xmm15");\ - } - int CNAME(BLASLONG rows, BLASLONG cols, FLOAT alpha, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG ldb){ -- float *src, *dst, *dst_tmp, *src_base, *dst_base; -+ float *src, *dst, *dst_tmp=0, *src_base, *dst_base; - uint64_t src_ld_bytes = (uint64_t)lda * sizeof(float), dst_ld_bytes = (uint64_t)ldb * sizeof(float), num_rows = 0; - BLASLONG cols_left, rows_done; float ALPHA = alpha; - if(ALPHA==0.0){ - diff --git a/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch b/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch deleted file mode 100644 index ed112d62380b..000000000000 --- a/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch +++ /dev/null @@ -1,237 +0,0 @@ -https://github.com/xianyi/OpenBLAS/pull/3626 - -From 5af7b8638b3b972bd0e25597ec07927fffd52108 Mon Sep 17 00:00:00 2001 -From: WANG Xuerui <xen0n@gentoo.org> -Date: Fri, 13 May 2022 15:26:33 +0800 -Subject: [PATCH 1/3] Move LoongArch make rules to Makefile.loongarch64 - ---- - Makefile.loongarch64 | 5 +++-- - Makefile.system | 5 ----- - 2 files changed, 3 insertions(+), 7 deletions(-) - -diff --git a/Makefile.loongarch64 b/Makefile.loongarch64 -index 05ea9c679d..fced1a9462 100644 ---- a/Makefile.loongarch64 -+++ b/Makefile.loongarch64 -@@ -1,3 +1,4 @@ --ifdef BINARY64 --else -+ifeq ($(CORE), LOONGSON3R5) -+CCOMMON_OPT += -march=loongarch64 -mabi=lp64 -+FCOMMON_OPT += -march=loongarch64 -mabi=lp64 - endif -diff --git a/Makefile.system b/Makefile.system -index 3be5efa0c2..9c91425b0f 100644 ---- a/Makefile.system -+++ b/Makefile.system -@@ -895,11 +895,6 @@ ifeq ($(OSNAME), AIX) - BINARY_DEFINED = 1 - endif - --ifeq ($(ARCH), loongarch64) --CCOMMON_OPT += -march=loongarch64 -mabi=lp64 --FCOMMON_OPT += -march=loongarch64 -mabi=lp64 --endif -- - endif - - ifndef BINARY_DEFINED - -From 869061c783d60ba0b799fab643952c493b57fb0a Mon Sep 17 00:00:00 2001 -From: WANG Xuerui <xen0n@gentoo.org> -Date: Fri, 13 May 2022 15:53:22 +0800 -Subject: [PATCH 2/3] Probe for old-world LASX flavor on LoongArch and use - generic DGEMM kernel otherwise - -See: https://bugs.gentoo.org/844013 ---- - Makefile.system | 1 + - c_check | 27 ++++++++++++++++++++++++++- - kernel/loongarch64/KERNEL.LOONGSON3R5 | 5 +++++ - 3 files changed, 32 insertions(+), 1 deletion(-) - -diff --git a/Makefile.system b/Makefile.system -index 9c91425b0f..b86aafbddb 100644 ---- a/Makefile.system -+++ b/Makefile.system -@@ -1702,6 +1702,7 @@ export TARGET_CORE - export NO_AVX512 - export NO_AVX2 - export BUILD_BFLOAT16 -+export NO_LASX - - export SBGEMM_UNROLL_M - export SBGEMM_UNROLL_N -diff --git a/c_check b/c_check -index 01d4f4a7cf..a37e91f82c 100755 ---- a/c_check -+++ b/c_check -@@ -112,7 +112,7 @@ case "$architecture" in - defined=1 - ;; - arm|arm64) defined=1 ;; -- zarch|e2k|alpha|ia64|riscv64|loonarch64) -+ zarch|e2k|alpha|ia64|riscv64|loongarch64) - defined=1 - BINARY=64 - ;; -@@ -240,6 +240,29 @@ if [ "$architecture" = "riscv64" ]; then - rm -rf "$tmpd" - fi - -+no_lasx=0 -+if [ "$architecture" = "loongarch64" ]; then -+ tmpd=`mktemp -d` -+ tmpf="$tmpd/a.c" -+ # Old-world assembly flavor: LASX registers named "$xrNN", different -+ # from the ISA manual which suggests "$xNN". This is the flavor we -+ # currently support. -+ # -+ # As the LASX ISA manual is not out yet, we cannot predict what the -+ # new-world flavor would look like, so do not probe flavor for now. -+ # The compiler flags are also unsuitable for new-world gcc. -+ code='"xvld $xr0, $a0, 0\n"' -+ printf "int main(void){ __asm__ volatile(%s); }\n" "$code" >> "$tmpf" -+ args=" -march=loongarch64 -mabi=lp64 -mlasx -c -o $tmpf.o $tmpf" -+ no_lasx=0 -+ { -+ $compiler_name $flags $args >/dev/null 2>&1 -+ } || { -+ no_lasx=1 -+ } -+ rm -rf "$tmpd" -+fi -+ - c11_atomics=0 - case "$data" in - *HAVE_C11*) -@@ -350,6 +373,7 @@ done - - [ "$makefile" = "-" ] && { - [ "$no_rv64gv" -eq 1 ] && printf "NO_RV64GV=1\n" -+ [ "$no_lasx" -eq 1 ] && printf "NO_LASX=1\n" - [ "$no_avx512" -eq 1 ] && printf "NO_AVX512=1\n" - [ "$no_avx2" -eq 1 ] && printf "NO_AVX2=1\n" - [ "$oldgcc" -eq 1 ] && printf "OLDGCC=1\n" -@@ -380,6 +404,7 @@ done - printf "MSA_FLAGS=%s\n" "$msa_flags" - } - [ "$no_rv64gv" -eq 1 ] && printf "NO_RV64GV=1\n" -+ [ "$no_lasx" -eq 1 ] && printf "NO_LASX=1\n" - [ "$no_avx512" -eq 1 ] && printf "NO_AVX512=1\n" - [ "$no_avx2" -eq 1 ] && printf "NO_AVX2=1\n" - [ "$oldgcc" -eq 1 ] && printf "OLDGCC=1\n" -diff --git a/kernel/loongarch64/KERNEL.LOONGSON3R5 b/kernel/loongarch64/KERNEL.LOONGSON3R5 -index cda3590402..79b57d1e4d 100644 ---- a/kernel/loongarch64/KERNEL.LOONGSON3R5 -+++ b/kernel/loongarch64/KERNEL.LOONGSON3R5 -@@ -1,3 +1,7 @@ -+ifeq ($(NO_LASX), 1) -+# No LASX support in compiler, unable to consume the optimized version -+# leave out DGEMMKERNEL to pull in the generic version -+else - DGEMMKERNEL = dgemm_kernel_16x4.S - DGEMMINCOPY = dgemm_ncopy_16.S - DGEMMITCOPY = dgemm_tcopy_16.S -@@ -7,6 +11,7 @@ DGEMMINCOPYOBJ = dgemm_incopy$(TSUFFIX).$(SUFFIX) - DGEMMITCOPYOBJ = dgemm_itcopy$(TSUFFIX).$(SUFFIX) - DGEMMONCOPYOBJ = dgemm_oncopy$(TSUFFIX).$(SUFFIX) - DGEMMOTCOPYOBJ = dgemm_otcopy$(TSUFFIX).$(SUFFIX) -+endif - - DTRSMKERNEL_LN = ../generic/trsm_kernel_LN.c - DTRSMKERNEL_LT = ../generic/trsm_kernel_LT.c - -From 699c57d3767c9a5a5a69262a4b70a1f80e0bb2e2 Mon Sep 17 00:00:00 2001 -From: WANG Xuerui <xen0n@gentoo.org> -Date: Fri, 13 May 2022 16:23:46 +0800 -Subject: [PATCH 3/3] Fix ABI CFLAGS setting on new-world LoongArch - -See: https://bugs.gentoo.org/844013 ---- - Makefile.loongarch64 | 13 +++++++++++-- - Makefile.system | 1 + - c_check | 14 ++++++++++++++ - 3 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/Makefile.loongarch64 b/Makefile.loongarch64 -index fced1a9462..d6cbe848cd 100644 ---- a/Makefile.loongarch64 -+++ b/Makefile.loongarch64 -@@ -1,4 +1,13 @@ - ifeq ($(CORE), LOONGSON3R5) --CCOMMON_OPT += -march=loongarch64 -mabi=lp64 --FCOMMON_OPT += -march=loongarch64 -mabi=lp64 -+CCOMMON_OPT += -march=loongarch64 -+FCOMMON_OPT += -march=loongarch64 -+ -+ifeq ($(LOONGARCH_CC_FLAVOR), NEW) -+CCOMMON_OPT += -mabi=lp64d -+FCOMMON_OPT += -mabi=lp64d -+endif -+ifeq ($(LOONGARCH_CC_FLAVOR), OLD) -+CCOMMON_OPT += -mabi=lp64 -+FCOMMON_OPT += -mabi=lp64 -+endif - endif -diff --git a/Makefile.system b/Makefile.system -index b86aafbddb..4360a861cb 100644 ---- a/Makefile.system -+++ b/Makefile.system -@@ -1702,6 +1702,7 @@ export TARGET_CORE - export NO_AVX512 - export NO_AVX2 - export BUILD_BFLOAT16 -+export LOONGARCH_CC_FLAVOR - export NO_LASX - - export SBGEMM_UNROLL_M -diff --git a/c_check b/c_check -index a37e91f82c..573f0e52fd 100755 ---- a/c_check -+++ b/c_check -@@ -240,8 +240,19 @@ if [ "$architecture" = "riscv64" ]; then - rm -rf "$tmpd" - fi - -+loongarch_cc_flavor="" - no_lasx=0 - if [ "$architecture" = "loongarch64" ]; then -+ # Currently there are only 2 flavors: new-world and old-world. -+ # They differ in ABI names accepted, so check it to avoid creating temp -+ # files. -+ loongarch_cc_flavor="NEW" -+ { -+ $compiler_name -mabi=lp64d -E -o - /dev/null >/dev/null 2>&1 -+ } || { -+ loongarch_cc_flavor="OLD" -+ } -+ - tmpd=`mktemp -d` - tmpf="$tmpd/a.c" - # Old-world assembly flavor: LASX registers named "$xrNN", different -@@ -260,6 +271,7 @@ if [ "$architecture" = "loongarch64" ]; then - } || { - no_lasx=1 - } -+ - rm -rf "$tmpd" - fi - -@@ -377,6 +389,7 @@ done - [ "$no_avx512" -eq 1 ] && printf "NO_AVX512=1\n" - [ "$no_avx2" -eq 1 ] && printf "NO_AVX2=1\n" - [ "$oldgcc" -eq 1 ] && printf "OLDGCC=1\n" -+ [ -n "$loongarch_cc_flavor" ] && printf "LOONGARCH_CC_FLAVOR=%s\n" "$loongarch_cc_flavor" - exit 0 - } - -@@ -408,6 +421,7 @@ done - [ "$no_avx512" -eq 1 ] && printf "NO_AVX512=1\n" - [ "$no_avx2" -eq 1 ] && printf "NO_AVX2=1\n" - [ "$oldgcc" -eq 1 ] && printf "OLDGCC=1\n" -+ [ -n "$loongarch_cc_flavor" ] && printf "LOONGARCH_CC_FLAVOR=%s\n" "$loongarch_cc_flavor" - } >> "$makefile" - - os=`echo "$os" | tr '[[:lower:]]' '[[:upper:]]'/ ` diff --git a/sci-libs/openblas/files/openblas-0.3.23-parallel-make.patch b/sci-libs/openblas/files/openblas-0.3.23-parallel-make.patch deleted file mode 100644 index ce0487a6b2c0..000000000000 --- a/sci-libs/openblas/files/openblas-0.3.23-parallel-make.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 281e834566a06f1c756d262dc31e809faaf8933f Mon Sep 17 00:00:00 2001 -From: Guillaume Horel <guillaume.horel@gmail.com> -Date: Thu, 30 Mar 2023 15:15:25 -0400 -Subject: [PATCH 1/2] do not pass -j flag to the MAKE variable - ---- - getarch.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/getarch.c b/getarch.c -index 937a8db68c..87384c0840 100644 ---- a/getarch.c -+++ b/getarch.c -@@ -1930,15 +1930,15 @@ printf("ELF_VERSION=2\n"); - - #ifdef MAKE_NB_JOBS - #if MAKE_NB_JOBS > 0 -- printf("MAKE += -j %d\n", MAKE_NB_JOBS); -+ printf("MAKEFLAGS += -j %d\n", MAKE_NB_JOBS); - #else - // Let make use parent -j argument or -j1 if there - // is no make parent - #endif - #elif NO_PARALLEL_MAKE==1 -- printf("MAKE += -j 1\n"); -+ printf("MAKEFLAGS += -j 1\n"); - #else -- printf("MAKE += -j %d\n", get_num_cores()); -+ printf("MAKEFLAGS += -j %d\n", get_num_cores()); - #endif - - break; - -From 397108fba299c87ce17957452d57469af914f516 Mon Sep 17 00:00:00 2001 -From: Guillaume Horel <guillaume.horel@gmail.com> -Date: Fri, 31 Mar 2023 09:22:40 -0400 -Subject: [PATCH 2/2] serialize shared prerequisites - ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 144b3400db..3c4b8948af 100644 ---- a/Makefile -+++ b/Makefile -@@ -40,9 +40,9 @@ LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test - - .PHONY : all libs netlib $(RELA) test ctest shared install --.NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test -+.NOTPARALLEL : shared - --all :: libs netlib $(RELA) tests shared -+all :: tests - @echo - @echo " OpenBLAS build complete. ($(LIB_COMPONENTS))" - @echo -@@ -150,7 +150,7 @@ ifeq ($(OSNAME), CYGWIN_NT) - endif - endif - --tests : libs netlib $(RELA) shared -+tests : shared - ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) - touch $(LIBNAME) - ifndef NO_FBLAS diff --git a/sci-libs/openblas/openblas-0.3.21-r1.ebuild b/sci-libs/openblas/openblas-0.3.25-r1.ebuild index c5a1707e33da..da08897df4c6 100644 --- a/sci-libs/openblas/openblas-0.3.21-r1.ebuild +++ b/sci-libs/openblas/openblas-0.3.25-r1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit fortran-2 toolchain-funcs +inherit flag-o-matic fortran-2 toolchain-funcs +MY_P=OpenBLAS-${PV} DESCRIPTION="Optimized BLAS library based on GotoBLAS2" HOMEPAGE="https://github.com/xianyi/OpenBLAS" -SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/OpenBLAS-${PV} +SRC_URI="https://github.com/OpenMathLib/OpenBLAS/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" @@ -26,9 +27,7 @@ RDEPEND=" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch" - "${FILESDIR}/${PN}-0.3.21-fix-loong.patch" - "${FILESDIR}/${P}-clang16.patch" + "${FILESDIR}/${PN}-0.3.23-shared-blas-lapack.patch" ) pkg_pretend() { @@ -50,83 +49,84 @@ pkg_pretend() { } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + fortran-2_pkg_setup +} + +src_prepare() { + default + + # TODO: Unbundle lapack like Fedora does? + # https://src.fedoraproject.org/rpms/openblas/blob/rawhide/f/openblas-0.2.15-system_lapack.patch + + # Don't build the tests as part of "make all". We'll do + # it explicitly later if the test phase is enabled. + sed -i -e "/^all :: tests/s: tests::g" Makefile || die - # List of most configurable options - Makefile.rule + # If 64bit-index is needed, create second library with LIBPREFIX=libopenblas64 + if use index-64bit; then + cp -aL "${S}" "${S}-index-64bit" || die + fi +} + +src_configure() { + # List of most configurable options is in Makefile.rule. + + # Not an easy fix, https://github.com/xianyi/OpenBLAS/issues/4128 + filter-lto - # https://github.com/xianyi/OpenBLAS/pull/2663 tc-export CC FC LD AR AS RANLIB # HOSTCC is used for scripting export HOSTCC="$(tc-getBUILD_CC)" - # threading options - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - USE_THREAD=0 + # Threading options + export USE_THREAD=0 + export USE_OPENMP=0 if use openmp; then - USE_THREAD=1; USE_OPENMP=1; + USE_THREAD=1 + USE_OPENMP=1 elif use pthread; then - USE_THREAD=1; USE_OPENMP=0; + USE_THREAD=1 + USE_OPENMP=0 fi - export USE_THREAD USE_OPENMP - # disable submake with -j and default optimization flags - # in Makefile.system + # Disable submake with -j and default optimization flags in Makefile.system # Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT... - export MAKE_NB_JOBS=-1 \ - COMMON_OPT=" " \ - FCOMMON_OPT=" " - - # Target CPU ARCH options - # generally detected automatically from cross toolchain - use dynamic && \ - export DYNAMIC_ARCH=1 \ - NO_AFFINITY=1 \ - TARGET=GENERIC - - export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \ - NUM_THREADS=${OPENBLAS_NTHREAD:-64} - - # setting OPENBLAS_TARGET to override auto detection - # in case the toolchain is not enough to detect + export MAKE_NB_JOBS=-1 COMMON_OPT=" " FCOMMON_OPT=" " + + # Target CPU ARCH options generally detected automatically from cross toolchain + # + # TODO: Rename USE=dynamic -> USE=cpudetection like dev-libs/gmp, media-video/ffmpeg? + # (may want to then restrict bindist w/ USE=-cpudetection.) + if use dynamic ; then + export DYNAMIC_ARCH=1 NO_AFFINITY=1 TARGET=GENERIC + fi + + export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} NUM_THREADS=${OPENBLAS_NTHREAD:-64} + + # Allow setting OPENBLAS_TARGET to override auto detection in case the + # toolchain is not enough to detect. # https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then export TARGET="${OPENBLAS_TARGET}" fi export NO_STATIC=1 - - BUILD_RELAPACK=1 - if ! use relapack; then - BUILD_RELAPACK=0 - fi - - export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK -} - -src_prepare() { - default - - # Don't build the tests as part of "make all". We'll do - # it explicitly later if the test phase is enabled. - sed -e "/^all ::/s/tests //" -i Makefile || die - - # if 64bit-index is needed, create second library - # with LIBPREFIX=libopenblas64 - if use index-64bit; then - cp -aL "${S}" "${S}-index-64bit" || die - fi + export BUILD_RELAPACK=$(usex relapack 1 0) + export PREFIX="${EPREFIX}/usr" } src_compile() { - default - cd interface || die - emake shared-blas-lapack + emake shared + + use eselect-ldso && emake -C interface shared-blas-lapack if use index-64bit; then - emake -C"${S}-index-64bit" \ + emake -C "${S}-index-64bit" \ INTERFACE64=1 \ - LIBPREFIX=libopenblas64 + LIBPREFIX=libopenblas64 shared fi } @@ -136,8 +136,8 @@ src_test() { src_install() { emake install DESTDIR="${D}" \ - OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \ - OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) + OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \ + OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) dodoc GotoBLAS_*.txt *.md Changelog.txt @@ -148,15 +148,15 @@ src_install() { if use eselect-ldso; then insinto /usr/$(get_libdir)/blas/openblas/ doins interface/libblas.so.3 - dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so + dosym -r /usr/$(get_libdir)/libblas.so.3 /usr/$(get_libdir)/blas/openblas/libblas.so doins interface/libcblas.so.3 - dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so + dosym -r /usr/$(get_libdir)/libcblas.so.3 /usr/$(get_libdir)/blas/openblas/libcblas.so insinto /usr/$(get_libdir)/lapack/openblas/ doins interface/liblapack.so.3 - dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so + dosym -r /usr/$(get_libdir)/liblapack.so.3 /usr/$(get_libdir)/lapack/openblas/liblapack.so doins interface/liblapacke.so.3 - dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so + dosym -r /usr/$(get_libdir)/liblapacke.so.3 /usr/$(get_libdir)/lapack/openblas/liblapacke.so fi } diff --git a/sci-libs/openblas/openblas-0.3.26-r1.ebuild b/sci-libs/openblas/openblas-0.3.26-r1.ebuild new file mode 100644 index 000000000000..9bd2045ad974 --- /dev/null +++ b/sci-libs/openblas/openblas-0.3.26-r1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic fortran-2 toolchain-funcs + +MY_P=OpenBLAS-${PV} +DESCRIPTION="Optimized BLAS library based on GotoBLAS2" +HOMEPAGE="https://github.com/xianyi/OpenBLAS" +SRC_URI="https://github.com/OpenMathLib/OpenBLAS/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD" +SLOT="0" +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 )" + +RDEPEND=" + eselect-ldso? ( + >=app-eselect/eselect-blas-0.2 + >=app-eselect/eselect-lapack-0.2 + ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-0.3.23-shared-blas-lapack.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + elog "This software has a massive number of options that" + elog "are configurable and it is *impossible* for all of" + elog "those to fit inside any manageable ebuild." + elog "The Gentoo provided package has enough to build" + elog "a fully optimized library for your targeted CPU." + elog "You can set the CPU target using the environment" + elog "variable - OPENBLAS_TARGET or it will be detected" + elog "automatically from the target toolchain (supports" + elog "cross compilation toolchains)." + elog "You can control the maximum number of threads" + elog "using OPENBLAS_NTHREAD, default=64 and number of " + elog "parallel calls to allow before further calls wait" + elog "using OPENBLAS_NPARALLEL, default=8." +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + fortran-2_pkg_setup +} + +src_prepare() { + default + + # TODO: Unbundle lapack like Fedora does? + # https://src.fedoraproject.org/rpms/openblas/blob/rawhide/f/openblas-0.2.15-system_lapack.patch + + # Don't build the tests as part of "make all". We'll do + # it explicitly later if the test phase is enabled. + sed -i -e "/^all :: tests/s: tests::g" Makefile || die + + # If 64bit-index is needed, create second library with LIBPREFIX=libopenblas64 + if use index-64bit; then + cp -aL "${S}" "${S}-index-64bit" || die + fi +} + +src_configure() { + # List of most configurable options is in Makefile.rule. + + # Not an easy fix, https://github.com/xianyi/OpenBLAS/issues/4128 + filter-lto + + tc-export CC FC LD AR AS RANLIB + + # HOSTCC is used for scripting + export HOSTCC="$(tc-getBUILD_CC)" + + # Threading options + export USE_THREAD=0 + export USE_OPENMP=0 + if use openmp; then + USE_THREAD=1 + USE_OPENMP=1 + elif use pthread; then + USE_THREAD=1 + USE_OPENMP=0 + fi + + # Disable submake with -j and default optimization flags in Makefile.system + # Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT... + export MAKE_NB_JOBS=-1 COMMON_OPT=" " FCOMMON_OPT=" " + + # Target CPU ARCH options generally detected automatically from cross toolchain + # + # TODO: Rename USE=dynamic -> USE=cpudetection like dev-libs/gmp, media-video/ffmpeg? + # (may want to then restrict bindist w/ USE=-cpudetection.) + if use dynamic ; then + export DYNAMIC_ARCH=1 NO_AFFINITY=1 TARGET=GENERIC + fi + + export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} NUM_THREADS=${OPENBLAS_NTHREAD:-64} + + # Allow setting OPENBLAS_TARGET to override auto detection in case the + # toolchain is not enough to detect. + # https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt + if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then + export TARGET="${OPENBLAS_TARGET}" + fi + + export NO_STATIC=1 + export BUILD_RELAPACK=$(usex relapack 1 0) + export PREFIX="${EPREFIX}/usr" +} + +src_compile() { + emake shared + + use eselect-ldso && emake -C interface shared-blas-lapack + + if use index-64bit; then + emake -C "${S}-index-64bit" \ + INTERFACE64=1 \ + LIBPREFIX=libopenblas64 shared + fi +} + +src_test() { + emake tests +} + +src_install() { + emake install DESTDIR="${D}" \ + OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \ + OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) + + dodoc GotoBLAS_*.txt *.md Changelog.txt + + if use index-64bit; then + dolib.so "${S}-index-64bit"/libopenblas64*.so* + fi + + if use eselect-ldso; then + insinto /usr/$(get_libdir)/blas/openblas/ + doins interface/libblas.so.3 + dosym -r /usr/$(get_libdir)/blas/openblas/libblas.so.3 /usr/$(get_libdir)/blas/openblas/libblas.so + doins interface/libcblas.so.3 + dosym -r /usr/$(get_libdir)/blas/openblas/libcblas.so.3 /usr/$(get_libdir)/blas/openblas/libcblas.so + + insinto /usr/$(get_libdir)/lapack/openblas/ + doins interface/liblapack.so.3 + dosym -r /usr/$(get_libdir)/lapack/openblas/liblapack.so.3 /usr/$(get_libdir)/lapack/openblas/liblapack.so + doins interface/liblapacke.so.3 + dosym -r /usr/$(get_libdir)/lapack/openblas/liblapacke.so.3 /usr/$(get_libdir)/lapack/openblas/liblapacke.so + fi +} + +pkg_postinst() { + use eselect-ldso || return + local libdir=$(get_libdir) me="openblas" + + # check blas + eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me} + local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) + if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then + eselect blas set ${libdir} ${me} + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + else + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + elog "To use blas [${me}] implementation, you have to issue (as root):" + elog "\t eselect blas set ${libdir} ${me}" + fi + + # check lapack + eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me} + local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2) + if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then + eselect lapack set ${libdir} ${me} + elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]." + else + elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]." + elog "To use lapack [${me}] implementation, you have to issue (as root):" + elog "\t eselect lapack set ${libdir} ${me}" + fi +} + +pkg_postrm() { + if use eselect-ldso; then + eselect blas validate + eselect lapack validate + fi +} diff --git a/sci-libs/openblas/openblas-0.3.23.ebuild b/sci-libs/openblas/openblas-0.3.26.ebuild index 7664d34d5737..428b2378aba7 100644 --- a/sci-libs/openblas/openblas-0.3.23.ebuild +++ b/sci-libs/openblas/openblas-0.3.26.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic fortran-2 toolchain-funcs +MY_P=OpenBLAS-${PV} DESCRIPTION="Optimized BLAS library based on GotoBLAS2" HOMEPAGE="https://github.com/xianyi/OpenBLAS" -SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/OpenBLAS-${PV} +SRC_URI="https://github.com/OpenMathLib/OpenBLAS/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" @@ -27,8 +28,6 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-0.3.23-shared-blas-lapack.patch" - "${FILESDIR}/${PN}-0.3.21-fix-loong.patch" - "${FILESDIR}/${PN}-0.3.23-parallel-make.patch" ) pkg_pretend() { @@ -50,85 +49,84 @@ pkg_pretend() { } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + fortran-2_pkg_setup +} - # List of most configurable options - Makefile.rule +src_prepare() { + default + + # TODO: Unbundle lapack like Fedora does? + # https://src.fedoraproject.org/rpms/openblas/blob/rawhide/f/openblas-0.2.15-system_lapack.patch + + # Don't build the tests as part of "make all". We'll do + # it explicitly later if the test phase is enabled. + sed -i -e "/^all :: tests/s: tests::g" Makefile || die - # not an easy fix, https://github.com/xianyi/OpenBLAS/issues/4128 + # If 64bit-index is needed, create second library with LIBPREFIX=libopenblas64 + if use index-64bit; then + cp -aL "${S}" "${S}-index-64bit" || die + fi +} + +src_configure() { + # List of most configurable options is in Makefile.rule. + + # Not an easy fix, https://github.com/xianyi/OpenBLAS/issues/4128 filter-lto - # https://github.com/xianyi/OpenBLAS/pull/2663 tc-export CC FC LD AR AS RANLIB # HOSTCC is used for scripting export HOSTCC="$(tc-getBUILD_CC)" - # threading options - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - USE_THREAD=0 + # Threading options + export USE_THREAD=0 + export USE_OPENMP=0 if use openmp; then - USE_THREAD=1; USE_OPENMP=1; + USE_THREAD=1 + USE_OPENMP=1 elif use pthread; then - USE_THREAD=1; USE_OPENMP=0; + USE_THREAD=1 + USE_OPENMP=0 fi - export USE_THREAD USE_OPENMP - # disable submake with -j and default optimization flags - # in Makefile.system + # Disable submake with -j and default optimization flags in Makefile.system # Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT... - export MAKE_NB_JOBS=-1 \ - COMMON_OPT=" " \ - FCOMMON_OPT=" " - - # Target CPU ARCH options - # generally detected automatically from cross toolchain - use dynamic && \ - export DYNAMIC_ARCH=1 \ - NO_AFFINITY=1 \ - TARGET=GENERIC - - export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \ - NUM_THREADS=${OPENBLAS_NTHREAD:-64} - - # setting OPENBLAS_TARGET to override auto detection - # in case the toolchain is not enough to detect + export MAKE_NB_JOBS=-1 COMMON_OPT=" " FCOMMON_OPT=" " + + # Target CPU ARCH options generally detected automatically from cross toolchain + # + # TODO: Rename USE=dynamic -> USE=cpudetection like dev-libs/gmp, media-video/ffmpeg? + # (may want to then restrict bindist w/ USE=-cpudetection.) + if use dynamic ; then + export DYNAMIC_ARCH=1 NO_AFFINITY=1 TARGET=GENERIC + fi + + export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} NUM_THREADS=${OPENBLAS_NTHREAD:-64} + + # Allow setting OPENBLAS_TARGET to override auto detection in case the + # toolchain is not enough to detect. # https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then export TARGET="${OPENBLAS_TARGET}" fi export NO_STATIC=1 - - BUILD_RELAPACK=1 - if ! use relapack; then - BUILD_RELAPACK=0 - fi - - export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK -} - -src_prepare() { - default - - # Don't build the tests as part of "make all". We'll do - # it explicitly later if the test phase is enabled. - sed -e "/^all ::/s/tests //" -i Makefile || die - - # if 64bit-index is needed, create second library - # with LIBPREFIX=libopenblas64 - if use index-64bit; then - cp -aL "${S}" "${S}-index-64bit" || die - fi + export BUILD_RELAPACK=$(usex relapack 1 0) + export PREFIX="${EPREFIX}/usr" } src_compile() { emake shared + use eselect-ldso && emake -C interface shared-blas-lapack if use index-64bit; then - emake -C"${S}-index-64bit" \ + emake -C "${S}-index-64bit" \ INTERFACE64=1 \ - LIBPREFIX=libopenblas64 + LIBPREFIX=libopenblas64 shared fi } @@ -138,8 +136,8 @@ src_test() { src_install() { emake install DESTDIR="${D}" \ - OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \ - OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) + OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \ + OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) dodoc GotoBLAS_*.txt *.md Changelog.txt @@ -150,15 +148,15 @@ src_install() { if use eselect-ldso; then insinto /usr/$(get_libdir)/blas/openblas/ doins interface/libblas.so.3 - dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so + dosym -r /usr/$(get_libdir)/libblas.so.3 /usr/$(get_libdir)/blas/openblas/libblas.so doins interface/libcblas.so.3 - dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so + dosym -r /usr/$(get_libdir)/libcblas.so.3 /usr/$(get_libdir)/blas/openblas/libcblas.so insinto /usr/$(get_libdir)/lapack/openblas/ doins interface/liblapack.so.3 - dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so + dosym -r /usr/$(get_libdir)/liblapack.so.3 /usr/$(get_libdir)/lapack/openblas/liblapack.so doins interface/liblapacke.so.3 - dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so + dosym -r /usr/$(get_libdir)/liblapacke.so.3 /usr/$(get_libdir)/lapack/openblas/liblapacke.so fi } diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index af71bb8b4462..fa54d19c63f2 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,2 +1,6 @@ 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.7.0-jemalloc-lib-type.patch b/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch new file mode 100644 index 000000000000..c80d9946b7c6 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch @@ -0,0 +1,27 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> + +Only try to find the jemalloc libs we are going to use + +diff --git a/adm/cmake/jemalloc.cmake b/adm/cmake/jemalloc.cmake +index b37d5d276..deef66d6c 100644 +--- a/adm/cmake/jemalloc.cmake ++++ b/adm/cmake/jemalloc.cmake +@@ -128,6 +128,7 @@ endmacro() + # Reset CSF variable + set (CSF_MMGR "") + ++if(BUILD_LIBRARY_TYPE EQUAL "Static") + # find static jemalloc lib + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a") + if (WIN32) +@@ -137,7 +138,10 @@ elseif(NOT WIN32) + SET(CMAKE_FIND_LIBRARY_SUFFIXES "" "so") + JEMALLOC_LIB_SEARCH ("jemalloc.so.2" "SHARED") + endif() ++endif() + ++if(BUILD_LIBRARY_TYPE EQUAL "Shared") + # find shared jemalloc lib + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".so") + JEMALLOC_LIB_SEARCH ("jemalloc" "SHARED") ++endif() diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch b/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch new file mode 100644 index 000000000000..c93b009a9da6 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch @@ -0,0 +1,53 @@ +From: Fabio Rossi <rossi.f@inwind.it> +See-Also: https://tracker.dev.opencascade.org/view.php?id=33612 +Fix tbb detection + +--- ./adm/cmake/tbb.cmake 2022-11-11 23:19:44.000000000 +0100 ++++ ./adm/cmake/tbb.cmake.new 2024-02-24 18:59:32.267165878 +0100 +@@ -56,13 +56,17 @@ + list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR) + endif() + ++ # Get installed configuration of tbb ++ get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS) ++ list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF) ++ + separate_arguments (CSF_TBB) + foreach (LIB IN LISTS CSF_TBB) + string(TOLOWER "${LIB}" LIB_LOWER) + string(TOUPPER "${LIB}" LIB_UPPER) + + # Achive *.lib files and directory containing it. +- get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_RELEASE) ++ get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF}) + # Reserve cache variable for *.lib. + if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY) + set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)") +@@ -89,7 +93,7 @@ + endif() + + # Achive *.dll files and directory containing it. +- get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE) ++ get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF}) + # Reserve cache variable for *.dll. + if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL) + set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)") +@@ -185,13 +189,17 @@ + list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR) + endif() + ++ # Get installed configuration of tbb ++ get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS) ++ list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF) ++ + separate_arguments (CSF_TBB) + foreach (LIB IN LISTS CSF_TBB) + string(TOLOWER "${LIB}" LIB_LOWER) + string(TOUPPER "${LIB}" LIB_UPPER) + + # Achive *.so files and directory containing it. +- get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE) ++ get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF}) + # Reserve cache variable for *.so. + if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY) + set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)") diff --git a/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch b/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch new file mode 100644 index 000000000000..b0a9d026f34e --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch @@ -0,0 +1,14 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> + +Bump cmake minimum version to remove warning + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 88d34f0..232c643 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.1 FATAL_ERROR) ++cmake_minimum_required (VERSION 3.5 FATAL_ERROR) + + set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/adm/cmake") + diff --git a/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch new file mode 100644 index 000000000000..2c4a98f5a1fd --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch @@ -0,0 +1,13 @@ +diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx +index bb06de7..f73164f 100644 +--- a/src/Standard/Standard.cxx ++++ b/src/Standard/Standard.cxx +@@ -28,7 +28,7 @@ + #elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64))) + #include <mm_malloc.h> + #else +-extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize); ++extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize) throw (); + #endif + + namespace diff --git a/sci-libs/opencascade/files/opencascade-7.8.0-tests.patch b/sci-libs/opencascade/files/opencascade-7.8.0-tests.patch new file mode 100644 index 000000000000..cf45ca5ce246 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.8.0-tests.patch @@ -0,0 +1,19 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> + +Fix test harness script + +diff --git a/adm/templates/draw.sh b/adm/templates/draw.sh +index 02e6043..c7347e0 100755 +--- a/adm/templates/draw.sh ++++ b/adm/templates/draw.sh +@@ -4,7 +4,8 @@ aCurrentPath="$PWD" + aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD"; + + source "${aScriptPath}/env.sh" "$1" ++shift + + echo 'Hint: use "pload ALL" command to load standard commands' +-cd ${aCurrentPath} +-DRAWEXE ++cd "${aCurrentPath}" ++DRAWEXE "$@" diff --git a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch new file mode 100644 index 000000000000..03a6277c6fa8 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch @@ -0,0 +1,24 @@ +diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake +index 7d25a37..79257d1 100644 +--- a/adm/cmake/vtk.cmake ++++ b/adm/cmake/vtk.cmake +@@ -60,7 +60,18 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}") + set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}") + endif() + +-find_package(VTK QUIET) ++find_package(VTK ++ COMPONENTS ++ CommonCore ++ FiltersGeneral ++ IOImage ++ ImagingCore ++ InteractionStyle ++ RenderingCore ++ RenderingFreeType ++ RenderingGL2PSOpenGL2 ++ RenderingOpenGL2 ++) + + if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}") + set (ENV{VTK_DIR} ${CACHED_VTK_DIR}) diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml index d1b713a48a87..cf700b6db37e 100644 --- a/sci-libs/opencascade/metadata.xml +++ b/sci-libs/opencascade/metadata.xml @@ -2,37 +2,26 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> - <email>waebbl-gentoo@posteo.net</email> - <name>Bernd Waibel</name> + <email>negril.nx+gentoo@gmail.com</email> + <name>Paul Zander</name> </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <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="gles2"> - Use OpenGL ES 2.0 - </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 unless - tbb USE flag is set. - </flag> - <flag name="tbb"> - Enable multithreading with the Intel Threads Building Block - <pkg>dev-cpp/tbb</pkg> - </flag> - <flag name="vtk"> - Enable Visualization Toolkit support via <pkg>sci-libs/vtk</pkg> - </flag> + <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> + <flag name="testprograms">Indicates whether non-regression OCCT test scripts should be installed</flag> + <flag name="vtk">Enable Visualization Toolkit support via <pkg>sci-libs/vtk</pkg></flag> </use> +<upstream> + <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 index 0ea3c5736c42..2e561ce32b79 100644 --- a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild +++ b/sci-libs/opencascade/opencascade-7.6.3-r2.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 @@ -27,7 +27,6 @@ RESTRICT="test" # ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5 RDEPEND=" - !app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl @@ -58,7 +57,7 @@ DEPEND=" vtk? ( dev-libs/utfcpp ) " BDEPEND=" - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) examples? ( dev-qt/linguist-tools:5 ) " diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild index 87f8035f70d2..9db1978c27a0 100644 --- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild +++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# 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 +inherit cmake flag-o-matic MY_SLOT="$(ver_cut 1-2)" MY_PV="$(ver_rs 3 '-')" @@ -17,7 +17,7 @@ S="${WORKDIR}/occt-185d29b" LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" SLOT="0/${MY_SLOT}" -KEYWORDS="amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" IUSE="doc examples ffmpeg freeimage gles2 json optimize tbb vtk" REQUIRED_USE="?? ( optimize tbb )" @@ -28,7 +28,6 @@ RESTRICT="test" # ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871 RDEPEND=" - !app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig @@ -54,7 +53,7 @@ DEPEND=" vtk? ( dev-libs/utfcpp ) " BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) examples? ( dev-qt/linguist-tools:5 ) " @@ -83,6 +82,11 @@ src_prepare() { } 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) diff --git a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild new file mode 100644 index 000000000000..f3c88aa3ab89 --- /dev/null +++ b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild @@ -0,0 +1,362 @@ +# 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 + ) + opengl? ( + media-libs/libglvnd + ) + 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 new file mode 100644 index 000000000000..94a2d018ce23 --- /dev/null +++ b/sci-libs/opencascade/opencascade-7.8.1.ebuild @@ -0,0 +1,376 @@ +# 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.8.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}.tar.xz ) +" + +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 jemalloc 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 + ) + opengl? ( + media-libs/libglvnd + ) + 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 + ) + jemalloc? ( dev-libs/jemalloc ) + 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.7.0-jemalloc-lib-type.patch" + "${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch" + "${FILESDIR}/${PN}-7.8.0-tests.patch" + "${FILESDIR}/${PN}-7.8.0-jemalloc-noexcept.patch" + "${FILESDIR}/${PN}-7.8.1-vtk_components.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.xz" + 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)" + ) + + # Select using memory manager tool. + if ! use jemalloc && ! use tbb; then + mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE ) + elif use jemalloc && ! use tbb; then + mycmakeargs+=( + -DUSE_MMGR_TYPE=JEMALLOC + -D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc" + ) + elif ! use jemalloc && use tbb; then + mycmakeargs+=( -DUSE_MMGR_TYPE=TBB ) + elif use jemalloc && use tbb; then + mycmakeargs+=( -DUSE_MMGR_TYPE=FLEXIBLE ) + fi + + 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' + + '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-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild new file mode 100644 index 000000000000..94a2d018ce23 --- /dev/null +++ b/sci-libs/opencascade/opencascade-9999.ebuild @@ -0,0 +1,376 @@ +# 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.8.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}.tar.xz ) +" + +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 jemalloc 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 + ) + opengl? ( + media-libs/libglvnd + ) + 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 + ) + jemalloc? ( dev-libs/jemalloc ) + 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.7.0-jemalloc-lib-type.patch" + "${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch" + "${FILESDIR}/${PN}-7.8.0-tests.patch" + "${FILESDIR}/${PN}-7.8.0-jemalloc-noexcept.patch" + "${FILESDIR}/${PN}-7.8.1-vtk_components.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.xz" + 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)" + ) + + # Select using memory manager tool. + if ! use jemalloc && ! use tbb; then + mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE ) + elif use jemalloc && ! use tbb; then + mycmakeargs+=( + -DUSE_MMGR_TYPE=JEMALLOC + -D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc" + ) + elif ! use jemalloc && use tbb; then + mycmakeargs+=( -DUSE_MMGR_TYPE=TBB ) + elif use jemalloc && use tbb; then + mycmakeargs+=( -DUSE_MMGR_TYPE=FLEXIBLE ) + fi + + 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' + + '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/orocos-bfl/orocos-bfl-0.8.0.ebuild b/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild index ad5ae2e60d63..303009dda3e2 100644 --- a/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild +++ b/sci-libs/orocos-bfl/orocos-bfl-0.8.0.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 @@ -21,7 +21,7 @@ DEPEND="${RDEPEND} BDEPEND=" virtual/pkgconfig doc? ( - app-doc/doxygen + app-text/doxygen virtual/latex-base )" diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild index a0120f6e86a1..496d229c6a7c 100644 --- a/sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild +++ b/sci-libs/orocos_kdl/orocos_kdl-1.5.1.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=7 @@ -27,7 +27,7 @@ RESTRICT="!test? ( test )" RDEPEND="dev-cpp/eigen:3" DEPEND="${RDEPEND}" BDEPEND=" - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( dev-util/cppunit ) " diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild index bb20a06d821c..30eebff8b84d 100644 --- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild +++ b/sci-libs/orocos_kdl/orocos_kdl-9999.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=7 @@ -27,7 +27,7 @@ RESTRICT="!test? ( test )" RDEPEND="dev-cpp/eigen:3" DEPEND="${RDEPEND}" BDEPEND=" - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) test? ( dev-util/cppunit ) " diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index ec900fcf2092..dad0e7d950fa 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -1,3 +1,4 @@ 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.8.6-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8.6-fix_build_system.patch new file mode 100644 index 000000000000..02119d362415 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.6-fix_build_system.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 95013ba..6d10c7c 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) ++ + enable_testing() + + # --- user options +@@ -47,7 +49,10 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_BINARY_DIR}/include/ + TYPE INCLUDE + FILES_MATCHING PATTERN "*.h") + +-install(TARGETS p4est EXPORT ${PROJECT_NAME}-targets) ++install(TARGETS p4est EXPORT ${PROJECT_NAME}-targets ++ ARCHIVE DESTINATION ${library_reldir} ++ LIBRARY DESTINATION ${library_reldir} ++ ) + + #--- p8est + diff --git a/sci-libs/p4est/files/p4est-2.8.6-fix_cmake_path.patch b/sci-libs/p4est/files/p4est-2.8.6-fix_cmake_path.patch new file mode 100644 index 000000000000..55bd118d9a51 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.6-fix_cmake_path.patch @@ -0,0 +1,54 @@ +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/cmake/pkgconf.cmake b/cmake/pkgconf.cmake +index 590d7be..0c46f9d 100644 +--- a/cmake/pkgconf.cmake ++++ b/cmake/pkgconf.cmake +@@ -4,18 +4,8 @@ set(pc_req_private "ompi ompi-c orte zlib") + + set(pc_req_public "p4est sc") + +-set(pc_filename p4est-${git_version}.pc) ++set(pc_filename p4est.pc) + configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconf.pc.in ${pc_filename} @ONLY) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pc_filename} +- DESTINATION lib/pkgconfig) +- +-set(pc_target ${pc_filename}) +-set(pc_link ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/p4est.pc) +- +-install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ +- ${pc_target} \ +- ${pc_link} \ +- )" +- ) ++ DESTINATION ${library_reldir}/pkgconfig) diff --git a/sci-libs/p4est/files/p4est-2.8.6-set_version.patch b/sci-libs/p4est/files/p4est-2.8.6-set_version.patch new file mode 100644 index 000000000000..c37943e21c15 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.6-set_version.patch @@ -0,0 +1,48 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index 4718b8e..c2c594d 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,39 +1,6 @@ + # --- 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 ${PROJECT_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(PROJECT_MAJOR 2) ++set(PROJECT_MINOR 8) ++set(PROJECT_PATCH 6) ++set(PROJECT_VERSION 2.8.6) diff --git a/sci-libs/p4est/files/p4est-2.8.6-use_external_sc.patch b/sci-libs/p4est/files/p4est-2.8.6-use_external_sc.patch new file mode 100644 index 000000000000..b46f5882e6b8 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.6-use_external_sc.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index da1b21a..77fee88 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,9 +20,7 @@ message(STATUS "p4est ${PROJECT_VERSION} " + + # --- external libs + +-include(cmake/GitSubmodule.cmake) +-git_submodule("${PROJECT_SOURCE_DIR}/sc") +-add_subdirectory(sc) ++find_package(SC REQUIRED) + + # --- configure p4est + diff --git a/sci-libs/p4est/p4est-2.8.6.ebuild b/sci-libs/p4est/p4est-2.8.6.ebuild new file mode 100644 index 000000000000..ac7398a0b90a --- /dev/null +++ b/sci-libs/p4est/p4est-2.8.6.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 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 + "${FILESDIR}"/${P}-use_external_sc.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=( + -DP4EST_ENABLE_MPI="$(usex mpi)" + -Dlibrary_reldir="$(get_libdir)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + 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/pastix/metadata.xml b/sci-libs/pastix/metadata.xml index fb6e181aba8b..ae51b0d4ba30 100644 --- a/sci-libs/pastix/metadata.xml +++ b/sci-libs/pastix/metadata.xml @@ -17,7 +17,6 @@ block structure of the incomplete factors. </longdescription> <use> - <flag name="cuda">Enable GPU support using CUDA kernels</flag> <flag name="fortran">Install the Fortran interface</flag> <flag name="int64">Use 64- rather than 32-bit integer representation</flag> <flag name="metis">Enable matrix ordering with <pkg>sci-libs/metis</pkg></flag> diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild index e1b6ae05a5e4..4b0bafedefaf 100644 --- a/sci-libs/pastix/pastix-5.2.3.ebuild +++ b/sci-libs/pastix/pastix-5.2.3.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}_${PV}/src" LICENSE="CeCILL-C" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc int64 mpi +smp starpu static-libs" RDEPEND=" diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild index 8d0557f10591..f8535d36390e 100644 --- a/sci-libs/pastix/pastix-6.0.3.ebuild +++ b/sci-libs/pastix/pastix-6.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake fortran-2 python-single-r1 @@ -15,7 +15,7 @@ SRC_URI="https://files.inria.fr/pastix/releases/v$(ver_cut 1)/${P}.tar.gz" LICENSE="CeCILL-C" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda examples +fortran int64 metis mpi +python +scotch starpu test" RESTRICT="!test? ( test )" diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 0799e6bc9bbc..9b9b818237e4 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1 +1,2 @@ -DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b +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/metadata.xml b/sci-libs/pcl/metadata.xml index 2bb119042ee2..25c520b9ce19 100644 --- a/sci-libs/pcl/metadata.xml +++ b/sci-libs/pcl/metadata.xml @@ -6,7 +6,6 @@ <name>Alexis Ballier</name> </maintainer> <use> - <flag name="cuda">Adds support for NVIDIA CUDA.</flag> <flag name="openni">Adds support for Kinect-like 3D sensors devices with <pkg>dev-libs/OpenNI</pkg>.</flag> <flag name="openni2">Adds support for Kinect-like 3D sensors devices with <pkg>dev-libs/OpenNI2</pkg> (should be preferred over openni).</flag> <flag name="pcap">Adds pcap file capabilities in some drivers.</flag> diff --git a/sci-libs/pcl/pcl-1.12.1-r2.ebuild b/sci-libs/pcl/pcl-1.14.0.ebuild index ce701b54c21c..6fc89d2b0d70 100644 --- a/sci-libs/pcl/pcl-1.12.1-r2.ebuild +++ b/sci-libs/pcl/pcl-1.14.0.ebuild @@ -1,18 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" -fi +inherit cmake cuda -inherit ${SCM} cmake cuda - -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" +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" @@ -22,8 +17,8 @@ fi HOMEPAGE="https://pointclouds.org/" DESCRIPTION="2D/3D image and point cloud processing" LICENSE="BSD" -SLOT="0/1.12" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" +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" @@ -42,6 +37,13 @@ RDEPEND=" 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] ) @@ -52,7 +54,7 @@ DEPEND="${RDEPEND} " BDEPEND=" doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] virtual/latex-base ) tutorials? ( @@ -92,7 +94,6 @@ src_configure() { "-DWITH_OPENGL=$(usex opengl TRUE FALSE)" "-DWITH_PNG=$(usex png TRUE FALSE)" "-DWITH_QHULL=$(usex qhull TRUE FALSE)" - "-DWITH_QT=$(usex qt5 TRUE FALSE)" "-DWITH_VTK=$(usex vtk TRUE FALSE)" "-DWITH_PCAP=$(usex pcap TRUE FALSE)" "-DWITH_OPENNI=$(usex openni TRUE FALSE)" @@ -103,5 +104,13 @@ src_configure() { "-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.ebuild new file mode 100644 index 000000000000..46645bec9842 --- /dev/null +++ b/sci-libs/pcl/pcl-1.14.1.ebuild @@ -0,0 +1,116 @@ +# 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-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild index cc8d925c4502..46645bec9842 100644 --- a/sci-libs/pcl/pcl-9999.ebuild +++ b/sci-libs/pcl/pcl-9999.ebuild @@ -1,18 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" -fi +inherit cmake cuda -inherit ${SCM} cmake cuda - -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" +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" @@ -22,8 +17,8 @@ fi HOMEPAGE="https://pointclouds.org/" DESCRIPTION="2D/3D image and point cloud processing" LICENSE="BSD" -SLOT="0/1.12" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" +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" @@ -42,6 +37,13 @@ RDEPEND=" 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] ) @@ -52,7 +54,7 @@ DEPEND="${RDEPEND} " BDEPEND=" doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] virtual/latex-base ) tutorials? ( @@ -92,7 +94,6 @@ src_configure() { "-DWITH_OPENGL=$(usex opengl TRUE FALSE)" "-DWITH_PNG=$(usex png TRUE FALSE)" "-DWITH_QHULL=$(usex qhull TRUE FALSE)" - "-DWITH_QT=$(usex qt5 TRUE FALSE)" "-DWITH_VTK=$(usex vtk TRUE FALSE)" "-DWITH_PCAP=$(usex pcap TRUE FALSE)" "-DWITH_OPENNI=$(usex openni TRUE FALSE)" @@ -103,5 +104,13 @@ src_configure() { "-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/pdal/Manifest b/sci-libs/pdal/Manifest index 5df6933eface..e54e026b75ea 100644 --- a/sci-libs/pdal/Manifest +++ b/sci-libs/pdal/Manifest @@ -1,2 +1,2 @@ -DIST PDAL-2.4.3-src.tar.gz 100758279 BLAKE2B 7c157bb51416b24bd8896a62e71a186bc9a45b34d5ab58fadbe691cb1abc9595f598fcf92ec528c9103f646c21f940b26fbf199a998e707d17f1527eb2957a85 SHA512 ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386 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 diff --git a/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch b/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch deleted file mode 100644 index 0f72473bfe85..000000000000 --- a/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch +++ /dev/null @@ -1,29 +0,0 @@ -From https://github.com/hobuinc/laz-perf/commit/a7f0f4f5b2ca851079574d47918f4f7abc6cc785 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Tue, 13 Dec 2022 22:06:21 +0000 -Subject: [PATCH] Extractor.hpp: add missing <cstdint> header inclusion (#144) - -Without the change build fails on upcomit `gcc-13` as: - - In file included from cpp/lazperf/vlr.cpp:33: - cpp/lazperf/Extractor.hpp:185:31: error: 'uint8_t' has not been declared - 185 | LeExtractor& operator >> (uint8_t& v) - | ^~~~~~~ - -`gcc-13` cleaned header up a bit and `<string>` does not include -`<cstdint>` implicitly anymore. Let's use it explictly. ---- - cpp/lazperf/Extractor.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff -Nru PDAL-2.4.3-src-orig/vendor/lazperf/Extractor.hpp PDAL-2.4.3-src/vendor/lazperf/Extractor.hpp ---- PDAL-2.4.3-src-orig/vendor/lazperf/Extractor.hpp 2023-05-10 23:13:39.613501276 -0300 -+++ PDAL-2.4.3-src/vendor/lazperf/Extractor.hpp 2023-05-10 23:15:41.644241402 -0300 -@@ -34,6 +34,7 @@ - - #pragma once - -+#include <cstdint> - #include <cstring> - #include <vector> - diff --git a/sci-libs/pdal/files/pdal-2.4.3-fix-test.patch b/sci-libs/pdal/files/pdal-2.4.3-fix-test.patch deleted file mode 100644 index e49c2f129f11..000000000000 --- a/sci-libs/pdal/files/pdal-2.4.3-fix-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -From https://github.com/PDAL/PDAL/commit/88d6825751434a97795d0f65b28d66e3a986f2c4.patch Mon Sep 17 00:00:00 2001 -From: Howard Butler <hobu.inc@gmail.com> -Date: Fri, 16 Sep 2022 08:10:16 -0500 -Subject: [PATCH 01/39] relax WKT checking test now that PROJ 9+ adds AUTHORITY - bits to more things - ---- - test/unit/io/LasReaderTest.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/unit/io/LasReaderTest.cpp b/test/unit/io/LasReaderTest.cpp -index cbc8fab04d..5715039f90 100644 ---- a/test/unit/io/LasReaderTest.cpp -+++ b/test/unit/io/LasReaderTest.cpp -@@ -270,7 +270,7 @@ TEST(LasReaderTest, inspect) - // This string is common for WKT1 and WKT2. When we move to WKT2 - // completely, this can be fixed. - std::string testWkt { -- R"(GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433)" -+ R"(GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]])" - }; - - EXPECT_TRUE(Utils::startsWith(qi.m_srs.getWKT(), testWkt)); - diff --git a/sci-libs/pdal/pdal-2.4.3-r1.ebuild b/sci-libs/pdal/pdal-2.4.3-r1.ebuild deleted file mode 100644 index 81dd25d4f4bb..000000000000 --- a/sci-libs/pdal/pdal-2.4.3-r1.ebuild +++ /dev/null @@ -1,63 +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.gz" - -LICENSE="BSD" -SLOT="0/14" -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}/${P}-fix-test.patch" - "${FILESDIR}/${P}-fix-gcc13.patch" - "${FILESDIR}/${P}-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)' - --output-on-failure - -j1 - ) - - cmake_src_test -} diff --git a/sci-libs/pdal/pdal-2.5.3-r1.ebuild b/sci-libs/pdal/pdal-2.5.3-r1.ebuild index 24dfef6f560b..a3c13fdd4978 100644 --- a/sci-libs/pdal/pdal-2.5.3-r1.ebuild +++ b/sci-libs/pdal/pdal-2.5.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar LICENSE="BSD" SLOT="0/15" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="postgres test" RESTRICT="!test? ( test )" diff --git a/sci-libs/pdal/pdal-2.5.3.ebuild b/sci-libs/pdal/pdal-2.5.3.ebuild deleted file mode 100644 index 25213a057df0..000000000000 --- a/sci-libs/pdal/pdal-2.5.3.ebuild +++ /dev/null @@ -1,57 +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" - -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.4.3.ebuild b/sci-libs/pdal/pdal-2.6.2.ebuild index cd19216c8dd2..a5c701ad7ee0 100644 --- a/sci-libs/pdal/pdal-2.4.3.ebuild +++ b/sci-libs/pdal/pdal-2.6.2.ebuild @@ -1,18 +1,18 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +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.gz" +SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.bz2" LICENSE="BSD" -SLOT="0/14" +SLOT="0/16" KEYWORDS="amd64 ~arm ~arm64 ~x86" -IUSE="postgres test" +IUSE="debug postgres test" RESTRICT="!test? ( test )" BDEPEND=" @@ -26,10 +26,11 @@ RDEPEND=" dev-libs/openssl:= sci-libs/gdal:= sci-libs/libgeotiff:= - sys-libs/libunwind:= sys-libs/zlib + debug? ( sys-libs/libunwind:= ) postgres? ( dev-db/postgresql:*[xml] ) " + DEPEND=" test? ( sci-libs/gdal[geos,jpeg,png] ) ${RDEPEND} @@ -37,14 +38,21 @@ DEPEND=" S="${WORKDIR}/PDAL-${PV}-src" -PATCHES=( - "${FILESDIR}/${P}-fix-test.patch" -) - 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 @@ -52,7 +60,7 @@ 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)' + --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 ) diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild index 07e406e2d678..64ee3a5011c8 100644 --- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild +++ b/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit fortran-2 flag-o-matic toolchain-funcs @@ -11,8 +11,8 @@ DESCRIPTION="FORTRAN/C device-independent scientific graphic library" HOMEPAGE="https://www.astro.caltech.edu/~tjp/pgplot/" SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz" -SLOT="0" LICENSE="free-noncomm" +SLOT="0" KEYWORDS="amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc motif static-libs tk" @@ -21,9 +21,12 @@ RDEPEND=" x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs/motif:= ) - tk? ( dev-lang/tk:= )" -DEPEND="${RDEPEND} - doc? ( virtual/latex-base )" + tk? ( dev-lang/tk:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( virtual/latex-base ) +" S="${WORKDIR}/${PN}" @@ -66,6 +69,12 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862918 + # + # Upstream contact method is email. I have sent one. + filter-lto + # GCC 10 workaround # bug #722190 append-fflags $(test-flags-FC -fallow-argument-mismatch) diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 782cbdef89d3..114740b9cb03 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1 +1,2 @@ DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8 +DIST plplot_5.15.0+dfsg2-6.debian.tar.xz 73416 BLAKE2B 2f0a9be0aea6d77b2c538f53a509636a6edca59eb930b7885da7ba915a0324d3cbe0e4b0ffe33a2a552ec7b8b679931e9eaa3e4810372b05ac3c0901ea9c6ee9 SHA512 0d64352eb08cb5bb003e8eac11c73533f6ecd08ad542cce002474d20ba4a899fd54b77f96b5e53656b551180fa693da820e7c40b18d6d43e20ea2c7377c36c69 diff --git a/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch b/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch deleted file mode 100644 index 5a3605168e61..000000000000 --- a/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- plplot-5.12.0.old/examples/ocaml/x20.ml 2017-01-29 01:50:35.000000000 +0000 -+++ plplot-5.12.0/examples/ocaml/x20.ml 2017-11-18 12:10:33.476409441 +0000 -@@ -59,7 +59,7 @@ - let w, h = Scanf.sscanf w_h_line "%d %d" (fun w h -> w, h) in - let num_col = Scanf.sscanf num_col_line "%d" (fun n -> n) in - -- let img = String.make (w * h) ' ' in -+ let img = Bytes.make (w * h) ' ' in - let imf = Array.make_matrix w h 0.0 in - - (* Note that under 32bit OCaml, this will only work when reading strings up -@@ -72,7 +72,7 @@ - for j = 0 to h - 1 do - imf.(i).(j) <- - (* flip image up-down *) -- float_of_int (int_of_char (img.[(h - 1 - j ) * w + i])); -+ float_of_int (int_of_char (Bytes.get img ((h - 1 - j ) * w + i))); - done - done; - imf, w, h, num_col diff --git a/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch b/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch deleted file mode 100644 index 3c6b85b1714e..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/qt.h -+++ b/include/qt.h -@@ -67,6 +67,7 @@ - #include <QMainWindow> - #include <QPicture> - #include <QMutex> -+#include <QPainterPath> - - #include "plDevs.h" - #include "plplotP.h" diff --git a/sci-libs/plplot/files/plplot-5.15.0-ieee.patch b/sci-libs/plplot/files/plplot-5.15.0-ieee.patch deleted file mode 100644 index 065f59a52dfd..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-ieee.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake.ieee plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake ---- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake.ieee 2018-09-19 20:31:11.333168883 -0600 -+++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake 2018-09-19 20:31:56.323728783 -0600 -@@ -27,15 +27,6 @@ option(WITH_CSA "Enable use of the csa l - # expanded to a lot more cases as we gain platform experience. - set(NAN_CFLAGS ${CMAKE_C_FLAGS}) - if(PL_HAVE_QHULL OR WITH_CSA) -- if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER MATCHES "gcc") -- set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp") -- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*") -- if(CMAKE_C_COMPILER MATCHES "gcc") -- set(NAN_CFLAGS "${NAN_CFLAGS} -mieee") -- else(CMAKE_C_COMPILER MATCHES "gcc") -- set(NAN_CFLAGS "${NAN_CFLAGS} -ieee") -- endif(CMAKE_C_COMPILER MATCHES "gcc") -- endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER MATCHES "gcc") - if(NOT DEFINED NaNAwareCCompiler) - message(STATUS "Check for NaN awareness in C compiler") - try_run(RUN_RESULT COMPILE_RESULT diff --git a/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch deleted file mode 100644 index 4fc5b0b43d9e..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up plplot-5.15.0/examples/c/Makefile.examples.in.multiarch plplot-5.15.0/examples/c/Makefile.examples.in ---- plplot-5.15.0/examples/c/Makefile.examples.in.multiarch 2019-09-17 21:47:24.535984257 -0600 -+++ plplot-5.15.0/examples/c/Makefile.examples.in 2019-09-17 21:50:37.029009186 -0600 -@@ -23,9 +23,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --install_tree_c_RPATHCMD = @install_tree_c_RPATHCMD@ -- - @extXdrawable_true@extXdrawable_EXECUTABLES_list = \ - @extXdrawable_true@ extXdrawable_demo$(EXEEXT) - -diff -up plplot-5.15.0/examples/c++/Makefile.examples.in.multiarch plplot-5.15.0/examples/c++/Makefile.examples.in ---- plplot-5.15.0/examples/c++/Makefile.examples.in.multiarch 2019-09-17 21:47:24.536984262 -0600 -+++ plplot-5.15.0/examples/c++/Makefile.examples.in 2019-09-17 21:50:18.672911449 -0600 -@@ -23,15 +23,10 @@ SHELL = @SH_EXECUTABLE@ - CXX = @CXX@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --install_tree_cxx_RPATHCMD = @install_tree_cxx_RPATHCMD@ -- --@wxwidgets_true@install_tree_wxwidgets_RPATHCMD = @install_tree_wxwidgets_RPATHCMD@ - @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \ - @wxwidgets_true@ @wxdemo_name@$(EXEEXT) - - @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ --@qt_gui_true@install_tree_qt_RPATHCMD = @install_tree_qt_RPATHCMD@ - @qt_gui_true@qt_gui_EXECUTABLES_list = \ - @qt_gui_true@ qt_example$(EXEEXT) - -diff -up plplot-5.15.0/examples/fortran/Makefile.examples.in.multiarch plplot-5.15.0/examples/fortran/Makefile.examples.in ---- plplot-5.15.0/examples/fortran/Makefile.examples.in.multiarch 2019-09-17 21:47:24.537984268 -0600 -+++ plplot-5.15.0/examples/fortran/Makefile.examples.in 2019-09-17 21:48:01.062178741 -0600 -@@ -24,7 +24,6 @@ SHELL = @SH_EXECUTABLE@ - Fortran = @FC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - install_tree_fortran_RPATHCMD = @install_tree_fortran_RPATHCMD@ - - EXECUTABLES_list = \ -diff -up plplot-5.15.0/examples/tk/Makefile.examples.in.multiarch plplot-5.15.0/examples/tk/Makefile.examples.in ---- plplot-5.15.0/examples/tk/Makefile.examples.in.multiarch 2019-09-17 21:47:24.538984273 -0600 -+++ plplot-5.15.0/examples/tk/Makefile.examples.in 2019-09-17 21:50:00.816816375 -0600 -@@ -24,9 +24,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --install_tree_tk_RPATHCMD = @install_tree_tk_RPATHCMD@ -- - EXECUTABLES_list = xtk01$(EXEEXT) - # Second and fourth examples depend on itk. - @itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT) diff --git a/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch b/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch deleted file mode 100644 index f3fe04d84a7c..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch +++ /dev/null @@ -1,166 +0,0 @@ -commit 6b215267e7baeae83906bec8dab72a549aeda6c8 -Author: Alan W. Irwin <airwin@users.sourceforge.net> -Date: Mon Sep 23 17:39:31 2019 -0700 - - Build system: Fix ocaml examples core build for -DUSE_RPATH=OFF case - - Thanks to Orion Poplawski for reporting this issue which is that the - *core build_tree* rpath manipulations for the ocaml examples were - being (incorrectly) skipped for the -DUSE_RPATH=OFF case. The fix for - this issue required non-trivial CMake logic changes so was extensively - tested (see below). - - Tested by: Alan W. Irwin <airwin@users.sourceforge.net> on Linux - (Debian Buster = Stable) with the following steps: - - # Choose these prefixes to assure that the source, build, and install - # trees have blanks in their pathnames (to test those cases during - # this comprehensive test) - COMPREHENSIVE_TEST_PREFIX="/home/software/plplot/HEAD/comprehensive_test_disposeable blank" - SOURCE_PREFIX="/home/software/plplot/HEAD/plplot blank .git" - - # Set CMAKE_PREFIX_PATH to access local versions of lua and libLASi to - # avoid important bugs in the Debian Testing versions of those - # packages. Also access a local version of libqhull to test that - # additional rpath possibility. - - # Put a local build of CMake-3.15.20190829-g3ec986c first on the PATH to thoroughly - # test our build system for a locally built CMake version that includes an - # essential fix so that D language support works properly for the ldc2 and dmd compilers. - - # For this particular test use the gdc D compiler if D enabled (which it was not, see below). - - # Use the -DUSE_INCRTCL_VERSION_4=ON option to help CMake find Tcl/Tk - # components. (This step will not be necessary as soon as the PLplot - # build system is modified to make Tcl/Tk/Itcl/Itk/Iwidgets finding - # more robust.) - - # Use -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig to test - # swig-4.0.0 that I built for myself. - - # To save time, constrain the test to just the ocaml binding and svg device. - - # To save a lot of babysitting of this test, constrain the test by dropping - # the interactive component. - - time (nice -19 env CMAKE_PREFIX_PATH=/home/software/lua/install-5.3.5:/home/software/lasi_svn/install:/home/software/qhull/install PATH=/home/software/cmake/install-3ec986ce8e/bin:"$PATH" DC=gdc "$SOURCE_PREFIX"/scripts/comprehensive_test.sh --prefix "$COMPREHENSIVE_TEST_PREFIX" --cmake_added_options "-DUSE_INCRTCL_VERSION_4=ON -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig -DDEFAULT_NO_BINDINGS=ON -DENABLE_ocaml=ON -DDEFAULT_NO_DEVICES=ON -DPLD_svg=ON " --build_command "make -j18" --ctest_command "ctest -j18" --do_test_interactive no) - - The time result on my Ryzen 7 1700 system with 16 hardware threads was - - real 4m12.625s - user 4m22.128s - sys 0m58.076s - - The above test was repeated with the following changes: - - # Specify LD_LIBRARY_PATH to workaround the lack of special rpath - # support for external local versions of software - - # Use the -DUSE_RPATH=OFF cmake option to drop all install-tree - # rpath support (and to ignore any special rpath support for - # external local versions of software). - - # Further constrain the test to be performed just for the core build tree - # since -DUSE_RPATH=OFF will obviously give bad results for the install - # tree for this non-standard installation location. - - time (nice -19 env CMAKE_PREFIX_PATH=/home/software/lua/install-5.3.5:/home/software/lasi_svn/install:/home/software/qhull/install PATH=/home/software/cmake/install-3ec986ce8e/bin:"$PATH" DC=gdc LD_LIBRARY_PATH=/home/software/lasi_svn/install/lib:/home/software/qhull/install/lib "$SOURCE_PREFIX"/scripts/comprehensive_test.sh --prefix "$COMPREHENSIVE_TEST_PREFIX" --cmake_added_options "-DUSE_INCRTCL_VERSION_4=ON -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig -DDEFAULT_NO_BINDINGS=ON -DENABLE_ocaml=ON -DDEFAULT_NO_DEVICES=ON -DPLD_svg=ON -DUSE_RPATH=OFF" --build_command "make -j18" --ctest_command "ctest -j18" --do_test_interactive no --do_test_install_tree no --do_test_traditional_install_tree no) - - The time result on my Ryzen 7 1700 system with 16 hardware threads was - - real 1m57.888s - user 1m42.156s - sys 0m26.478s - - Both these comprehensive tests (one which tests that the default - -DUSE_RPATH=ON still works for the ocaml case and one similar to - Orion's test case which tests that -DUSER_RPATH=OFF works for the - ocaml case in the core build tree) ran without issues (e.g., there - were no hangs or other obvious errors) and was followed up by the - evaluation procedure documented in doc/wiki_source/Testing_PLplot. - Those evaluations showed no configure, build, or obvious run-time - errors (i.e., no non-zero return codes for any of the steps in these - comprehensive tests), and the difference test results (done with the - default svg device) were perfect as well. - -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 93cb01b..5bcbceb 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -343,27 +343,24 @@ if(CORE_BUILD) - # Extra layer of -Wl indirection required for the nagfor compiler - string(REPLACE "-Wl," "-Wl,-Wl,," install_tree_fortran_RPATHCMD ${install_tree_fortran_RPATHCMD}) - endif(install_tree_fortran_RPATHCMD AND CMAKE_Fortran_COMPILER MATCHES "nagfor") -+ endif(USE_RPATH AND NOT WIN32_OR_CYGWIN) -+ -+ # ocaml is a special case not handled by the above logic for other languages -+ # because the (unofficial) CMake language support is -+ # implemented with low-level add_custom commands/targets so that rpath -+ # must be specified for 3 cases (the traditional build of the installed -+ # examples, and the CMake-based build of the build-tree and install-tree examples). -+ # Furthermore, the rpath syntax is different for ocaml. -+ if(ENABLE_ocaml) -+ set(language ocaml) - -- # ocaml is a special case because the (unofficial) CMake language support is -- # implemented with low-level add_custom commands/targets so that rpath -- # must be specified for 3 cases (the traditional build of the installed -- # examples, and the CMake-based build of the build-tree and install-tree examples). -- # Furthermore, the rpath syntax is different for ocaml. -- if(ENABLE_ocaml) -- set(language ocaml) -+ if(USE_RPATH AND NOT WIN32_OR_CYGWIN) - # Each of the installed examples that are built depend on a library installed in ${LIB_DIR}. - set(install_tree_${language}_RPATH ${LIB_DIR}) -- # The ocaml examples depend on the plplot library -+ # The ocaml examples depend on the plplot library so use INSTALL_RPATH -+ # property of that library target. - set(tll_arguments PLPLOT::plplot) - process_rpath(install_tree_${language}_RPATH "${tll_arguments}") -- -- # Special case of the ocaml build-tree examples. -- # Must be done before ${install_tree_${language}_RPATH gets transformed -- # from official CMake list to colon-separated form. -- set(build_tree_${language}_RPATH ${install_tree_${language}_RPATH}) -- list(REMOVE_ITEM build_tree_${language}_RPATH ${LIB_DIR}) -- list(APPEND build_tree_${language}_RPATH ${CMAKE_BINARY_DIR}/src) -- - # Transform from semicolon- to colon-separated list. (Quotes - # for last argument required to process whole argument as string - # containing semicolons rather than as the concatanated elements -@@ -372,19 +369,30 @@ if(CORE_BUILD) - # install- and build-tree versions of CMake-based build of ocaml - # examples - string(REGEX REPLACE ";" ":" install_tree_${language}_RPATH "${install_tree_${language}_RPATH}") -- string(REGEX REPLACE ";" ":" build_tree_${language}_RPATH "${build_tree_${language}_RPATH}") - string(REPLACE " " "\\ " install_tree_${language}_RPATH_ESCAPED "${install_tree_${language}_RPATH}") -- string(REPLACE " " "\\ " build_tree_${language}_RPATH_ESCAPED "${build_tree_${language}_RPATH}") -- - # install_tree_ocaml_RPATHCMD needed in configured traditional - # Makefile for the ocaml subdirectory. - # Ocaml compiler requires -ccopt in front of every -Wl option: - set(install_tree_${language}_RPATHCMD "-ccopt -Wl,-rpath -ccopt -Wl,\"${install_tree_${language}_RPATH_ESCAPED}\"") -+ endif(USE_RPATH AND NOT WIN32_OR_CYGWIN) - -- endif(ENABLE_ocaml) -+ # Special case of the ocaml build-tree examples. -+ # Follow above process_rpath logic but with some changes -+ # appropriate for the core build of the ocaml examples. -+ set(build_tree_${language}_RPATH ${CMAKE_BINARY_DIR}/src) -+ set(tll_arguments PLPLOT::plplot) -+ process_rpath(build_tree_${language}_RPATH "${tll_arguments}") - -+ # Get rid of any mention of ${LIB_DIR} for the core build version -+ # of the examples. -+ # Must be done before ${build_tree_${language}_RPATH gets transformed -+ # from official CMake list to colon-separated form. -+ list(REMOVE_ITEM build_tree_${language}_RPATH ${LIB_DIR}) - -- endif(USE_RPATH AND NOT WIN32_OR_CYGWIN) -+ string(REGEX REPLACE ";" ":" build_tree_${language}_RPATH "${build_tree_${language}_RPATH}") -+ string(REPLACE " " "\\ " build_tree_${language}_RPATH_ESCAPED "${build_tree_${language}_RPATH}") -+ -+ endif(ENABLE_ocaml) - - # Install Chloe.pgm in installed examples directory so that all implementations - # of example 20 in the various examples subdirectories can conveniently diff --git a/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch b/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch deleted file mode 100644 index 6f0827f334e5..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt.ocaml plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt ---- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt.ocaml 2018-09-19 17:38:53.000000000 -0600 -+++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt 2018-09-19 20:32:29.884146436 -0600 -@@ -326,11 +326,11 @@ if(ENABLE_ocaml) - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo - ) - -- # ocamlc -a -custom builds a *.cma library from *.cmo -+ # ocamlc -a builds a *.cma library from *.cmo - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma -- COMMAND ${OCAMLC} -a -custom -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS} -+ COMMAND ${OCAMLC} -a -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -@@ -341,7 +341,7 @@ if(ENABLE_ocaml) - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.cma -- COMMAND ${OCAMLC} -a -custom -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS} -+ COMMAND ${OCAMLC} -a -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt.ocaml plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt ---- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt.ocaml 2018-09-19 20:32:29.884146436 -0600 -+++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt 2018-09-19 20:33:18.389750080 -0600 -@@ -91,11 +91,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO) - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.ml - ) - -- # ocamlc -a -custom builds a *.cma library from *.cmo -+ # ocamlc -a builds a *.cma library from *.cmo - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -l${WRITEABLE_TARGET}plplot -dllpath ${CMAKE_BINARY_DIR}/src -+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -l${WRITEABLE_TARGET}plplot -dllpath ${CMAKE_BINARY_DIR}/src - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch b/sci-libs/plplot/files/plplot-5.15.0_p6-configure-c99.patch index 1f72da24ffb0..60bb7aaf4501 100644 --- a/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch +++ b/sci-libs/plplot/files/plplot-5.15.0_p6-configure-c99.patch @@ -1,4 +1,4 @@ -https://bugs.gentoo.org/898258 +https://bugs.gentoo.org/879761 https://sourceforge.net/p/plplot/patches/37/ Avoid implicitly declaring exit. Future compilers will not support diff --git a/sci-libs/plplot/files/plplot-5.9.6-python.patch b/sci-libs/plplot/files/plplot-5.9.6-python.patch deleted file mode 100644 index d62ece2ec416..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.6-python.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt -index 7599164..8457490 100644 ---- a/examples/python/CMakeLists.txt -+++ b/examples/python/CMakeLists.txt -@@ -214,7 +214,7 @@ if(CORE_BUILD) - @ONLY - ) - -- set(python_location1 ${PYTHON_INSTDIR}) -+ set(python_location1) - set(python_location2) - set(python_location3) - set(python_location4) diff --git a/sci-libs/plplot/plplot-5.15.0-r105.ebuild b/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild index f6506f7c5103..9ea598c98339 100644 --- a/sci-libs/plplot/plplot-5.15.0-r105.ebuild +++ b/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -WX_GTK_VER=3.0-gtk3 +WX_GTK_VER=3.2-gtk3 FORTRAN_NEEDED=fortran LUA_COMPAT=( lua5-1 ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) # fails with ninja, due to USE=java missing swig output dependencies CMAKE_MAKEFILE_GENERATOR=emake @@ -14,7 +14,9 @@ inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 DESCRIPTION="Multi-language scientific plotting library" HOMEPAGE="https://plplot.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_p*}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}+dfsg2-${PV/*_p}.debian.tar.xz" +S="${WORKDIR}/${P/_p*}" LICENSE="LGPL-2" SLOT="0/14" # SONAME of libplplot.so @@ -103,19 +105,6 @@ DEPEND="${RDEPEND} ) " -PATCHES=( - "${FILESDIR}"/${PN}-5.9.6-python.patch - - # Fedora patches - "${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch - "${FILESDIR}"/${PN}-5.15.0-ieee.patch - "${FILESDIR}"/${PN}-5.15.0-multiarch.patch - "${FILESDIR}"/${PN}-5.15.0-ocaml.patch - "${FILESDIR}"/${PN}-5.12.0-safe-string.patch - "${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.patch - "${FILESDIR}"/${PN}-5.15.0-configure-clang16.patch -) - pkg_setup() { use python && python-single-r1_pkg_setup use lua && lua-single_pkg_setup @@ -127,6 +116,12 @@ src_prepare() { use wxwidgets && setup-wxwidgets cmake_src_prepare + # Debian patches + for p in $(<"${WORKDIR}"/debian/patches/series) ; do + eapply -p1 "${WORKDIR}/debian/patches/${p}" + done + eapply "${FILESDIR}"/${PN}-5.15.0_p6-configure-c99.patch + # avoid installing license sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die diff --git a/sci-libs/primegen/primegen-0.97-r3.ebuild b/sci-libs/primegen/primegen-0.97-r3.ebuild index 5ee9dfed93fb..743c5440098e 100644 --- a/sci-libs/primegen/primegen-0.97-r3.ebuild +++ b/sci-libs/primegen/primegen-0.97-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/primegen/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" PATCHES=( "${FILESDIR}"/${P}-man.patch diff --git a/sci-libs/profnet/profnet-1.0.22.ebuild b/sci-libs/profnet/profnet-1.0.22.ebuild index ba10260fc635..dfc60db98e74 100644 --- a/sci-libs/profnet/profnet-1.0.22.ebuild +++ b/sci-libs/profnet/profnet-1.0.22.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=7 @@ -24,6 +24,12 @@ src_prepare() { } src_compile() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862921 + # No upstream bug. Upstream link seemingly doesn't provide any information + # about this specific project. + filter-lto + append-fflags $(test-flags-FC -fallow-argument-mismatch) emake \ F77="$(tc-getF77)" \ diff --git a/sci-libs/proj/files/proj-geotiff.patch b/sci-libs/proj/files/proj-geotiff.patch new file mode 100644 index 000000000000..cef1faa4628f --- /dev/null +++ b/sci-libs/proj/files/proj-geotiff.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/917393 +https://github.com/OSGeo/PROJ/pull/3970 + +From afccfb609db16524b602216d9dc2b55c154403bb Mon Sep 17 00:00:00 2001 +From: Marco Genasci <fedeliallalinea@gmail.com> +Date: Sun, 26 Nov 2023 08:40:45 +0100 +Subject: [PATCH] Database: added ability to install *.tif if present in data + +--- + data/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 4cb89e7849..85ed6ba8d4 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -38,6 +38,8 @@ set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES}) + + file(GLOB SCHEMA_FILES *.json) + ++file(GLOB GEOTIFF_FILES *.tif) ++ + set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in") + set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db") + include(sql_filelist.cmake) +@@ -107,6 +109,7 @@ set(ALL_DATA_FILE + ${GRIDSHIFT_FILES} + ${PROJ_DB} + ${SCHEMA_FILES} ++ ${GEOTIFF_FILES} + ) + install( + FILES ${ALL_DATA_FILE} diff --git a/sci-libs/proj/proj-9.2.1.ebuild b/sci-libs/proj/proj-9.2.1-r1.ebuild index ac5e5df3f04d..50bbae86a419 100644 --- a/sci-libs/proj/proj-9.2.1.ebuild +++ b/sci-libs/proj/proj-9.2.1-r1.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 @@ -31,6 +31,10 @@ DEPEND=" test? ( dev-cpp/gtest ) " +PATCHES=( + "${FILESDIR}"/${PN}-geotiff.patch +) + src_unpack() { unpack ${P}.tar.gz diff --git a/sci-libs/proj/proj-9.3.0.ebuild b/sci-libs/proj/proj-9.3.0-r1.ebuild index d161662887a4..f605561280c2 100644 --- a/sci-libs/proj/proj-9.3.0.ebuild +++ b/sci-libs/proj/proj-9.3.0-r1.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 @@ -31,6 +31,10 @@ DEPEND=" test? ( dev-cpp/gtest ) " +PATCHES=( + "${FILESDIR}"/${PN}-geotiff.patch +) + src_unpack() { unpack ${P}.tar.gz diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild index e22230669491..0577c9eef733 100644 --- a/sci-libs/punc/punc-1.5.ebuild +++ b/sci-libs/punc/punc-1.5.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=7 @@ -31,7 +31,7 @@ BDEPEND=" virtual/pkgconfig doc? ( media-gfx/graphviz - app-doc/doxygen + app-text/doxygen )" PATCHES=( diff --git a/sci-libs/pyshp/pyshp-2.3.1-r1.ebuild b/sci-libs/pyshp/pyshp-2.3.1-r2.ebuild index 813c53e427ef..18fbf87fe491 100644 --- a/sci-libs/pyshp/pyshp-2.3.1-r1.ebuild +++ b/sci-libs/pyshp/pyshp-2.3.1-r2.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..11} ) +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/pytest[${PYTHON_USEDEP}] )" diff --git a/sci-libs/pyshp/pyshp-2.3.1.ebuild b/sci-libs/pyshp/pyshp-2.3.1.ebuild deleted file mode 100644 index ea574d22cb02..000000000000 --- a/sci-libs/pyshp/pyshp-2.3.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="Pure Python read/write support for ESRI Shapefile format" -HOMEPAGE="https://pypi.org/project/pyshp/" -# pypi tarballs are missing test data -#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -SRC_URI="https://github.com/GeospatialPython/${PN}/archive/${PV}.tar.gz -> ${P}..gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -python_test() { - epytest test_shapefile.py -m "not network" || die -} diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 0ee75499ccbe..246ab4d21a1a 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -1,3 +1,3 @@ -DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 -DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14 -DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43 +DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0 +DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c +DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587 diff --git a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch deleted file mode 100644 index 640d061fcc59..000000000000 --- a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2db381644c..2241a33015 100644 ---- a/setup.py -+++ b/setup.py -@@ -363,13 +363,6 @@ def build_deps(): - check_submodules() - check_pydep('yaml', 'pyyaml') - -- build_caffe2(version=version, -- cmake_python_library=cmake_python_library, -- build_python=True, -- rerun_cmake=RERUN_CMAKE, -- cmake_only=CMAKE_ONLY, -- cmake=cmake) -- - if CMAKE_ONLY: - report('Finished running cmake. Run "ccmake build" or ' - '"cmake-gui build" to adjust build options and ' diff --git a/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch b/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch deleted file mode 100644 index 1479354b7f7a..000000000000 --- a/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/setup.py 2023-03-24 22:36:50.361860100 +0100 -+++ b/setup.py 2023-03-24 22:36:57.384752383 +0100 -@@ -922,12 +922,6 @@ - name=str('caffe2.python.caffe2_pybind11_state_hip'), - sources=[]), - ) -- if cmake_cache_vars['BUILD_FUNCTORCH']: -- extensions.append( -- Extension( -- name=str('functorch._C'), -- sources=[]), -- ) - - cmdclass = { - 'bdist_wheel': wheel_concatenate, diff --git a/sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch b/sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch deleted file mode 100644 index 4f414be67a29..000000000000 --- a/sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch +++ /dev/null @@ -1,23 +0,0 @@ -Don't hardcode the library path. Leave it to the dynamic loader. - -Index: pytorch-1.13.1/torch/__init__.py -=================================================================== ---- a/torch/__init__.py 2023-02-15 20:27:51.747853677 +0100 -+++ b/torch/__init__.py 2023-02-15 20:28:23.506341918 +0100 -@@ -169,14 +169,14 @@ - 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 of wheel with cublas as PYPI deps - # As PyTorch is not purelib, but nvidia-cublas-cu11 is - if 'libcublas.so.11' not in err.args[0]: - raise err - _preload_cuda_deps() -- 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.0.0-emptyso.patch b/sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch deleted file mode 100644 index e4703894308a..000000000000 --- a/sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/setup.py 2023-04-05 11:23:00.713405789 +0200 -+++ b/setup.py 2023-04-05 11:23:36.900876249 +0200 -@@ -960,12 +960,6 @@ - name=str('caffe2.python.caffe2_pybind11_state_hip'), - sources=[]), - ) -- if cmake_cache_vars['BUILD_FUNCTORCH']: -- extensions.append( -- Extension( -- name=str('functorch._C'), -- sources=[]), -- ) - if cmake_cache_vars['BUILD_NVFUSER']: - extensions.append( - Extension( diff --git a/sci-libs/pytorch/files/pytorch-2.1.1-dontbuildagain.patch b/sci-libs/pytorch/files/pytorch-2.1.1-dontbuildagain.patch new file mode 100644 index 000000000000..f031a7345c69 --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-2.1.1-dontbuildagain.patch @@ -0,0 +1,17 @@ +--- 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 @@ + check_submodules() + check_pydep("yaml", "pyyaml") + +- build_caffe2( +- version=version, +- cmake_python_library=cmake_python_library, +- build_python=True, +- rerun_cmake=RERUN_CMAKE, +- cmake_only=CMAKE_ONLY, +- cmake=cmake, +- ) + + if CMAKE_ONLY: + report( diff --git a/sci-libs/pytorch/files/pytorch-2.2.1-emptyso.patch b/sci-libs/pytorch/files/pytorch-2.2.1-emptyso.patch new file mode 100644 index 000000000000..2b4839baec5b --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-2.2.1-emptyso.patch @@ -0,0 +1,13 @@ +--- a/setup.py 2024-03-08 19:34:42.148677983 +0100 ++++ b/setup.py 2024-03-08 19:34:52.402558423 +0100 +@@ -1019,10 +1019,6 @@ + extensions.append( + Extension(name="caffe2.python.caffe2_pybind11_state_hip", sources=[]), + ) +- if cmake_cache_vars["BUILD_FUNCTORCH"]: +- extensions.append( +- Extension(name="functorch._C", sources=[]), +- ) + + cmdclass = { + "bdist_wheel": wheel_concatenate, diff --git a/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild b/sci-libs/pytorch/pytorch-2.2.2.ebuild index 11f7d447a1e1..75fbde095842 100644 --- a/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild +++ b/sci-libs/pytorch/pytorch-2.2.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_EXT=1 inherit distutils-r1 prefix @@ -36,12 +36,12 @@ DEPEND="${RDEPEND} src_prepare() { eapply \ - "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \ + "${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.0.0-emptyso.patch \ + "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \ # Set build dir for pytorch's setup sed -i \ @@ -53,15 +53,14 @@ src_prepare() { hprefixify tools/setup_helpers/env.py } -src_compile() { +python_compile() { PYTORCH_BUILD_VERSION=${PV} \ PYTORCH_BUILD_NUMBER=0 \ USE_SYSTEM_LIBS=ON \ CMAKE_BUILD_DIR="${BUILD_DIR}" \ - BUILD_DIR= \ - distutils-r1_src_compile develop sdist + distutils-r1_python_compile develop sdist } -src_install() { - USE_SYSTEM_LIBS=ON distutils-r1_src_install +python_install() { + USE_SYSTEM_LIBS=ON distutils-r1_python_install } diff --git a/sci-libs/pytorch/pytorch-2.0.0.ebuild b/sci-libs/pytorch/pytorch-2.3.0.ebuild index 506f1889b280..75fbde095842 100644 --- a/sci-libs/pytorch/pytorch-2.0.0.ebuild +++ b/sci-libs/pytorch/pytorch-2.3.0.ebuild @@ -1,12 +1,13 @@ -# Copyright 2022-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 +DISTUTILS_EXT=1 +inherit distutils-r1 prefix DESCRIPTION="Tensors and Dynamic neural networks in Python" HOMEPAGE="https://pytorch.org/" @@ -35,12 +36,12 @@ DEPEND="${RDEPEND} src_prepare() { eapply \ - "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \ + "${FILESDIR}"/${PN}-2.1.1-dontbuildagain.patch \ "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ - "${FILESDIR}"/${P}-global-dlopen.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}"/${P}-emptyso.patch \ + "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \ # Set build dir for pytorch's setup sed -i \ @@ -48,17 +49,18 @@ src_prepare() { tools/setup_helpers/env.py \ || die distutils-r1_src_prepare + + hprefixify tools/setup_helpers/env.py } -src_compile() { +python_compile() { PYTORCH_BUILD_VERSION=${PV} \ PYTORCH_BUILD_NUMBER=0 \ USE_SYSTEM_LIBS=ON \ CMAKE_BUILD_DIR="${BUILD_DIR}" \ - BUILD_DIR= \ - distutils-r1_src_compile + distutils-r1_python_compile develop sdist } -src_install() { - USE_SYSTEM_LIBS=ON distutils-r1_src_install +python_install() { + USE_SYSTEM_LIBS=ON distutils-r1_python_install } diff --git a/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild b/sci-libs/pytorch/pytorch-2.3.1.ebuild index f93b9a108820..75fbde095842 100644 --- a/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild +++ b/sci-libs/pytorch/pytorch-2.3.1.ebuild @@ -1,12 +1,13 @@ -# Copyright 2022-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 +DISTUTILS_EXT=1 +inherit distutils-r1 prefix DESCRIPTION="Tensors and Dynamic neural networks in Python" HOMEPAGE="https://pytorch.org/" @@ -24,6 +25,7 @@ RDEPEND=" ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' dev-python/typing-extensions[${PYTHON_USEDEP}] + dev-python/sympy[${PYTHON_USEDEP}] ') " DEPEND="${RDEPEND} @@ -34,12 +36,12 @@ DEPEND="${RDEPEND} src_prepare() { eapply \ - "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \ + "${FILESDIR}"/${PN}-2.1.1-dontbuildagain.patch \ "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ - "${FILESDIR}"/${P}-global-dlopen.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}"/${P}-emptyso.patch \ + "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \ # Set build dir for pytorch's setup sed -i \ @@ -47,17 +49,18 @@ src_prepare() { tools/setup_helpers/env.py \ || die distutils-r1_src_prepare + + hprefixify tools/setup_helpers/env.py } -src_compile() { +python_compile() { PYTORCH_BUILD_VERSION=${PV} \ PYTORCH_BUILD_NUMBER=0 \ USE_SYSTEM_LIBS=ON \ CMAKE_BUILD_DIR="${BUILD_DIR}" \ - BUILD_DIR= \ - distutils-r1_src_compile + distutils-r1_python_compile develop sdist } -src_install() { - USE_SYSTEM_LIBS=ON distutils-r1_src_install +python_install() { + USE_SYSTEM_LIBS=ON distutils-r1_python_install } diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild index 5efab6e07eaf..44408ee4b883 100644 --- a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild +++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.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 @@ -7,7 +7,7 @@ inherit fortran-2 flag-o-matic multilib toolchain-funcs DESCRIPTION="Library for updating of QR and Cholesky decompositions" HOMEPAGE="https://sourceforge.net/projects/qrupdate" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -25,6 +25,9 @@ PATCHES=( src_prepare() { default + # bug #878989 + filter-lto + # GCC 10 workaround # bug #741524 append-fflags $(test-flags-FC -fallow-argument-mismatch) diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index e067ceef0a6c..ca306e9c9efb 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -2,3 +2,5 @@ DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fc DIST rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz 1057686 BLAKE2B aa755595bbcd48775713f1d94c18b9bfa6464cae97653dd5beda9e4ed600802b62c4159e6edef7fbd4c92e629bbda1c284e6c48e096c7eaf22bbaad86bdcdace SHA512 cdc928528e7ce5bcc3ae32ec18e3aee48533f24e77c1e42f6e0398858eefebd52b8812caabe01a0ef7fa552e00118b862e025f1675a9642b009f1e38efbcdd53 DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4 +DIST rocm-rocBLAS-5.7.1.tar.gz 55389700 BLAKE2B 9e58b1d29c8a04aa58ce17fdd9b0c2504934261851619dc5b696a04e8c6a79e7c44d86a6db7a9c76a434d76593de8c191cba6f163cf398d01cfc001e5fa32b5a SHA512 cfc73f6c490595a3c153c2ac2a3cb5926c48c2c19baa07ff3dcdf3a7ccaed82cfdff64ed5a3be64c349cb43d654d4b104d9090e2ec9f2061049d6a4921c07722 +DIST rocm-rocBLAS-6.1.1.tar.gz 100103895 BLAKE2B df89a21e47730714b80c62717a86d65ac0d819c2d33b2a3c6252b60b8d7cc9eb5f8f1db27159b0a8dfc87aba7ccad97e2f832bc0044e92d0b69c526d382c745a SHA512 74e847c4ddee16cae7f41e268a815ea03875519c365abe7dfce313a9545df245baa73301b432f64a36cc988281fec7530629a0d72583e9ea287c98ec8a0b3907 diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.7.1-expand-isa-compatibility.patch b/sci-libs/rocBLAS/files/rocBLAS-5.7.1-expand-isa-compatibility.patch new file mode 100644 index 000000000000..c5c5d4750393 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-5.7.1-expand-isa-compatibility.patch @@ -0,0 +1,132 @@ +Allow rocBLAS to load the compatible kernels when running on +architectures compatible with those ISAs. + +Based on patch from Cordell Bloor <cgmb@slerp.xyz> +https://salsa.debian.org/rocm-team/rocblas/-/blob/master/debian/patches/0012-expand-isa-compatibility.patch + +--- a/library/src/handle.cpp ++++ b/library/src/handle.cpp +@@ -21,6 +21,7 @@ + * ************************************************************************ */ + #include "handle.hpp" + #include <cstdarg> ++#include <cstring> + #include <limits> + #ifdef WIN32 + #include <windows.h> +@@ -77,6 +78,31 @@ static inline int getActiveArch(int deviceId) + { + hipDeviceProp_t deviceProperties; + hipGetDeviceProperties(&deviceProperties, deviceId); ++ // coerce to compatible arch ++ switch(deviceProperties.gcnArch) ++ { ++ case 902: ++ case 909: ++ case 912: ++ deviceProperties.gcnArch = 900; ++ std::strcpy(deviceProperties.gcnArchName, "gfx900"); ++ break; ++ case 1011: ++ case 1012: ++ case 1013: ++ deviceProperties.gcnArch = 1010; ++ std::strcpy(deviceProperties.gcnArchName, "gfx1010"); ++ break; ++ case 1031: ++ case 1032: ++ case 1033: ++ case 1034: ++ case 1035: ++ case 1036: ++ deviceProperties.gcnArch = 1030; ++ std::strcpy(deviceProperties.gcnArchName, "gfx1030"); ++ break; ++ } + return deviceProperties.gcnArch; + } + +--- a/library/src/rocblas_auxiliary.cpp ++++ b/library/src/rocblas_auxiliary.cpp +@@ -24,6 +24,7 @@ + #include "logging.hpp" + #include "rocblas-auxiliary.h" + #include <cctype> ++#include <cstring> + #include <cstdlib> + #include <memory> + #include <string> +@@ -1285,6 +1286,31 @@ std::string rocblas_internal_get_arch_name() + hipGetDevice(&deviceId); + hipDeviceProp_t deviceProperties; + hipGetDeviceProperties(&deviceProperties, deviceId); ++ // coerce to compatible arch ++ switch(deviceProperties.gcnArch) ++ { ++ case 902: ++ case 909: ++ case 912: ++ deviceProperties.gcnArch = 900; ++ std::strcpy(deviceProperties.gcnArchName, "gfx900"); ++ break; ++ case 1011: ++ case 1012: ++ case 1013: ++ deviceProperties.gcnArch = 1010; ++ std::strcpy(deviceProperties.gcnArchName, "gfx1010"); ++ break; ++ case 1031: ++ case 1032: ++ case 1033: ++ case 1034: ++ case 1035: ++ case 1036: ++ deviceProperties.gcnArch = 1030; ++ std::strcpy(deviceProperties.gcnArchName, "gfx1030"); ++ break; ++ } + return ArchName<hipDeviceProp_t>{}(deviceProperties); + } + +--- a/library/src/tensile_host.cpp ++++ b/library/src/tensile_host.cpp +@@ -45,6 +45,7 @@ extern "C" void rocblas_shutdown(); + #include <Tensile/hip/HipUtils.hpp> + #include <atomic> + #include <complex> ++#include <cstring> + #include <exception> + #include <future> + #include <iomanip> +@@ -837,6 +838,31 @@ namespace + + hipDeviceProp_t prop; + HIP_CHECK_EXC(hipGetDeviceProperties(&prop, deviceId)); ++ // coerce to compatible arch ++ switch(prop.gcnArch) ++ { ++ case 902: ++ case 909: ++ case 912: ++ prop.gcnArch = 900; ++ std::strcpy(prop.gcnArchName, "gfx900"); ++ break; ++ case 1011: ++ case 1012: ++ case 1013: ++ prop.gcnArch = 1010; ++ std::strcpy(prop.gcnArchName, "gfx1010"); ++ break; ++ case 1031: ++ case 1032: ++ case 1033: ++ case 1034: ++ case 1035: ++ case 1036: ++ prop.gcnArch = 1030; ++ std::strcpy(prop.gcnArchName, "gfx1030"); ++ break; ++ } + + m_deviceProp = std::make_shared<hipDeviceProp_t>(prop); + diff --git a/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch b/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch new file mode 100644 index 000000000000..ca895c4b4ff5 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch @@ -0,0 +1,96 @@ +--- a/library/src/handle.cpp ++++ b/library/src/handle.cpp +@@ -21,6 +21,7 @@ + * ************************************************************************ */ + #include "handle.hpp" + #include <cstdarg> ++#include <cstring> + #include <limits> + #ifdef WIN32 + #include <windows.h> +@@ -80,6 +81,20 @@ static Processor getActiveArch(int deviceId) + // strip out xnack/ecc from name + std::string deviceFullString(deviceProperties.gcnArchName); + std::string deviceString = deviceFullString.substr(0, deviceFullString.find(":")); ++ // coerce to compatible arch ++ int gcnArch = deviceString.substr(0, 3) == "gfx" ? std::stoi(deviceString.substr(3)) : 0; ++ switch(gcnArch) ++ { ++ case 902: case 909: case 912: ++ std::strcpy(deviceProperties.gcnArchName, "gfx900"); ++ break; ++ case 1013: ++ std::strcpy(deviceProperties.gcnArchName, "gfx1010"); ++ break; ++ case 1031: case 1032: case 1033: case 1034: case 1035: case 1036: ++ std::strcpy(deviceProperties.gcnArchName, "gfx1030"); ++ break; ++ } + + if(deviceString.find("gfx803") != std::string::npos) + { +--- a/library/src/rocblas_auxiliary.cpp ++++ b/library/src/rocblas_auxiliary.cpp +@@ -24,6 +24,7 @@ + #include "logging.hpp" + #include "rocblas-auxiliary.h" + #include <cctype> ++#include <cstring> + #include <cstdlib> + #include <memory> + #include <string> +@@ -1242,6 +1243,20 @@ std::string rocblas_internal_get_arch_name() + hipGetDevice(&deviceId); + hipDeviceProp_t deviceProperties; + hipGetDeviceProperties(&deviceProperties, deviceId); ++ // coerce to compatible arch ++ int gcnArch = strncmp(deviceProperties.gcnArchName, "gfx", 3) == 0 ? std::stoi(deviceProperties.gcnArchName + 3) : 0; ++ switch(gcnArch) ++ { ++ case 902: case 909: case 912: ++ std::strcpy(deviceProperties.gcnArchName, "gfx900"); ++ break; ++ case 1013: ++ std::strcpy(deviceProperties.gcnArchName, "gfx1010"); ++ break; ++ case 1031: case 1032: case 1033: case 1034: case 1035: case 1036: ++ std::strcpy(deviceProperties.gcnArchName, "gfx1030"); ++ break; ++ } + return ArchName<hipDeviceProp_t>{}(deviceProperties); + } + +--- a/library/src/tensile_host.cpp ++++ b/library/src/tensile_host.cpp +@@ -45,6 +45,7 @@ extern "C" void rocblas_shutdown(); + #include <Tensile/hip/HipUtils.hpp> + #include <atomic> + #include <complex> ++#include <cstring> + #include <exception> + #include <future> + #include <iomanip> +@@ -802,6 +803,23 @@ namespace + std::string deviceFullString(prop.gcnArchName); + std::string deviceString + = deviceFullString.substr(0, deviceFullString.find(":")); ++ // coerce to compatible arch ++ int gcnArch = deviceString.substr(0, 3) == "gfx" ? std::stoi(deviceString.substr(3)) : 0; ++ switch(gcnArch) ++ { ++ case 902: case 909: case 912: ++ std::strcpy(prop.gcnArchName, "gfx900"); ++ deviceString = prop.gcnArchName; ++ break; ++ case 1013: ++ std::strcpy(prop.gcnArchName, "gfx1010"); ++ deviceString = prop.gcnArchName; ++ break; ++ case 1031: case 1032: case 1033: case 1034: case 1035: case 1036: ++ std::strcpy(prop.gcnArchName, "gfx1030"); ++ deviceString = prop.gcnArchName; ++ break; ++ } + m_devicePropMap[deviceString] = std::make_shared<hipDeviceProp_t>(prop); + } + } diff --git a/sci-libs/rocBLAS/metadata.xml b/sci-libs/rocBLAS/metadata.xml index 066f5c749e3f..0e8f76b2a76e 100644 --- a/sci-libs/rocBLAS/metadata.xml +++ b/sci-libs/rocBLAS/metadata.xml @@ -12,6 +12,10 @@ <email>xgreenlandforwyy@gmail.com</email> <name>Yiyang Wu</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <use> <flag name="test">Perform rocblas-test to compare the result between rocBLAS and system BLAS.</flag> <flag name="benchmark">Build and install rocblas-bench.</flag> diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild index 94c7e5177af0..f8c6fd2a1367 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.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 @@ -23,7 +23,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}" RESTRICT="!test? ( test )" BDEPEND=" - dev-util/rocm-cmake + dev-build/rocm-cmake dev-util/Tensile:${SLOT} " diff --git a/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild index 417333c668f9..cc410094094f 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.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 @@ -23,7 +23,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}" RESTRICT="!test? ( test )" BDEPEND=" - >=dev-util/rocm-cmake-5.3 + >=dev-build/rocm-cmake-5.3 dev-util/Tensile:${SLOT} " diff --git a/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild new file mode 100644 index 000000000000..ed39ae5207d8 --- /dev/null +++ b/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="docs/.doxygen" +DOCS_DEPEND="media-gfx/graphviz" +ROCM_VERSION=${PV} +inherit cmake docs edo multiprocessing rocm + +DESCRIPTION="AMD's library for BLAS on ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="BSD" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +RESTRICT="!test? ( test )" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +BDEPEND=" + >=dev-build/rocm-cmake-5.3 + dev-util/Tensile:${SLOT} + dev-python/joblib + test? ( dev-cpp/gtest ) +" + +DEPEND=" + >=dev-cpp/msgpack-cxx-6.0.0 + =dev-util/hip-5* + test? ( + virtual/blas + dev-cpp/gtest + sys-libs/libomp + ) + benchmark? ( + virtual/blas + sys-libs/libomp + ) +" + +QA_FLAGS_IGNORED="/usr/lib64/rocblas/library/.*" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.2-cpp_lib_filesystem.patch + "${FILESDIR}"/${PN}-5.4.2-add-missing-header.patch + "${FILESDIR}"/${PN}-5.4.2-link-cblas.patch + "${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch + ) + +src_prepare() { + cmake_src_prepare + sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die +} + +src_configure() { + addpredict /dev/random + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=On + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DTensile_LOGIC="asm_full" + -DTensile_COMPILER="hipcc" + -DTensile_LIBRARY_FORMAT="msgpack" + -DTensile_CODE_OBJECT_VERSION="default" + -DTensile_ROOT="${EPREFIX}/usr/share/Tensile" + -DBUILD_WITH_TENSILE=ON + -DCMAKE_INSTALL_INCLUDEDIR="include/rocblas" + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + -DTensile_CPU_THREADS=$(makeopts_jobs) + -DBUILD_WITH_PIP=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_compile() { + docs_compile + cmake_src_compile +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library" + export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src" + edob ./${PN,,}-test +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dolib.a clients/librocblas_fortran_client.a + dobin clients/staging/rocblas-bench + fi + + # Stop llvm-strip from removing .strtab section from *.hsaco files, + # otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes + dostrip -x /usr/$(get_libdir)/rocblas/library/ +} diff --git a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild new file mode 100644 index 000000000000..26bfc2ada24d --- /dev/null +++ b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="docs/.doxygen" +DOCS_DEPEND="media-gfx/graphviz" +ROCM_VERSION=${PV} +inherit cmake docs edo multiprocessing rocm + +DESCRIPTION="AMD's library for BLAS on ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test video_cards_amdgpu" +RESTRICT="!test? ( test )" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +BDEPEND=" + >=dev-build/rocm-cmake-5.3 + video_cards_amdgpu? ( + dev-util/Tensile:${SLOT} + ) + test? ( dev-cpp/gtest ) +" + +DEPEND=" + >=dev-cpp/msgpack-cxx-6.0.0 + =dev-util/hip-6* + test? ( + virtual/blas + dev-cpp/gtest + sys-libs/libomp + ) + benchmark? ( + virtual/blas + sys-libs/libomp + ) +" + +QA_FLAGS_IGNORED="/usr/lib64/rocblas/library/.*" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.2-cpp_lib_filesystem.patch + "${FILESDIR}"/${PN}-5.4.2-add-missing-header.patch + "${FILESDIR}"/${PN}-5.4.2-link-cblas.patch + "${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch + ) + +src_prepare() { + cmake_src_prepare + sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die +} + +src_configure() { + addpredict /dev/random + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_WITH_TENSILE="$(usex video_cards_amdgpu)" + -DCMAKE_INSTALL_INCLUDEDIR="include/rocblas" + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_CLIENTS_TESTS="$(usex test)" + -DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark)" + -DBUILD_WITH_PIP=OFF + ) + + if usex video_cards_amdgpu; then + mycmakeargs+=( + -DTensile_LOGIC="asm_full" + -DTensile_COMPILER="hipcc" + -DTensile_LIBRARY_FORMAT="msgpack" + -DTensile_CODE_OBJECT_VERSION="default" + -DTensile_ROOT="${EPREFIX}/usr/share/Tensile" + -DTensile_CPU_THREADS="$(makeopts_jobs)" + ) + fi + + CXX=hipcc cmake_src_configure +} + +src_compile() { + docs_compile + cmake_src_compile +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library" + export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src" + edob "./${PN,,}-test" +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dolib.a clients/librocblas_fortran_client.a + dobin clients/staging/rocblas-bench + fi + + # Stop llvm-strip from removing .strtab section from *.hsaco files, + # otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes + dostrip -x "/usr/$(get_libdir)/rocblas/library/" +} diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest index f93c38954772..206e1b4ad564 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -1 +1,3 @@ DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43 +DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f +DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9 diff --git a/sci-libs/rocFFT/files/rocFFT-5.7.1-fix-rocm-link-path.patch b/sci-libs/rocFFT/files/rocFFT-5.7.1-fix-rocm-link-path.patch new file mode 100644 index 000000000000..03731516d8fb --- /dev/null +++ b/sci-libs/rocFFT/files/rocFFT-5.7.1-fix-rocm-link-path.patch @@ -0,0 +1,14 @@ +ld.lld with "-L/usr/lib -lhiprtc -ldl" fails in attempt to link +64-bit library to 32-bit /usr/lib/libdl.so.2 with: +"ld.lld: error: <...>/Scrt1.o is incompatible with elf32-i386" +--- a/library/src/CMakeLists.txt ++++ b/library/src/CMakeLists.txt +@@ -46,7 +46,7 @@ else() + if( WIN32 ) + set( ROCFFT_RTC_LINK_LIBS "${HIP_PATH}/lib/hiprtc.lib" ) + else() +- set( ROCFFT_RTC_LINK_LIBS -L${ROCM_PATH}/lib -lhiprtc -ldl ) ++ set( ROCFFT_RTC_LINK_LIBS -lhiprtc -ldl ) + endif() + endif() + diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml index 5774b6a548d7..ab2a20524390 100644 --- a/sci-libs/rocFFT/metadata.xml +++ b/sci-libs/rocFFT/metadata.xml @@ -9,11 +9,15 @@ <email>gentoo@holzke.net</email> <name>Wilfried Holzke</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/rocFFT</remote-id> + <remote-id type="github">ROCm/rocFFT</remote-id> </upstream> - <use> - <flag name="benchmark">Build and install [dyna-]rocfft-rider.</flag> - <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag> - </use> + <use> + <flag name="benchmark">Build and install rocfft benchmark tools.</flag> + <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild index 8d4bed88c3a0..60110fcd62fc 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.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..11} ) +PYTHON_COMPAT=( python3_{10..11} ) ROCM_VERSION=${PV} inherit cmake check-reqs edo multiprocessing python-r1 rocm @@ -35,8 +35,8 @@ DEPEND="dev-util/hip BDEPEND=" test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp ) - >=dev-util/cmake-3.22 - dev-util/rocm-cmake + >=dev-build/cmake-3.22 + dev-build/rocm-cmake " CHECKREQS_DISK_BUILD="7G" diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild new file mode 100644 index 000000000000..f4ddb494bf35 --- /dev/null +++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=${PV} + +inherit cmake check-reqs edo multiprocessing python-r1 rocm + +DESCRIPTION="Next generation FFT implementation for ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask +RDEPEND=" +perfscripts? ( + >=media-gfx/asymptote-2.61 + dev-texlive/texlive-latex + dev-tex/latexmk + sys-apps/texinfo + dev-python/sympy[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] ) +${PYTHON_DEPS}" + +DEPEND="=dev-util/hip-5* + ${PYTHON_DEPS} + benchmark? ( + dev-libs/boost + sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] + ) + test? ( + dev-cpp/gtest + dev-libs/boost + >=sci-libs/fftw-3 + sys-libs/libomp + sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] + ) +" + +BDEPEND=" + >=dev-build/cmake-3.22 + dev-build/rocm-cmake + dev-db/sqlite +" + +CHECKREQS_DISK_BUILD="7G" + +IUSE="benchmark perfscripts test" +REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/rocFFT-rocm-${PV}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch +) + +required_mem() { + if use test; then + echo "52G" + else + if [[ -n "${AMDGPU_TARGETS}" ]]; then + # count how many archs user specified in ${AMDGPU_TARGETS} + local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) + else + # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future. + local NARCH=7 + fi + echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required + fi +} + +pkg_pretend() { + return # leave the disk space check to pkg_setup phase +} + +pkg_setup() { + export CHECKREQS_MEMORY=$(required_mem) + check-reqs_pkg_setup + python_setup +} + +src_prepare() { + sed -e "s/PREFIX rocfft//" \ + -e "/rocm_install_symlink_subdir/d" \ + -i library/src/CMakeLists.txt || die + + sed -e "/rocm_install_symlink_subdir/d" \ + -e "$!N;s:PREFIX\n[ ]*rocfft:# PREFIX rocfft\n:;P;D" \ + -i library/src/device/CMakeLists.txt || die + + if use perfscripts; then + pushd scripts/perf || die + sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir + sed -e "/^top/,+1d" -i rocfft-perf suites.py || die + sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die + sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \ + -i perflib/pdf.py perflib/generators.py || die + popd + fi + + cmake_src_prepare +} + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=On + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -Wno-dev + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF) + -DSQLITE_USE_SYSTEM_PACKAGE=ON + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}/clients/staging" || die + export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device + edob ./${PN,,}-test + edob ./${PN,,}-selftest +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}"/clients/staging || die + dobin *rider + + if ! use perfscripts; then + # prevent collision with dev-util/perf + rm -rf "${ED}"/usr/bin/perf || die + fi + fi + + if use perfscripts; then + cd "${S}"/scripts/perf || die + python_foreach_impl python_doexe rocfft-perf + python_moduleinto ${PN}_perflib + python_foreach_impl python_domodule perflib/*.py + insinto /usr/share/${PN}-perflib + doins *.asy suites.py + fi +} diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild new file mode 100644 index 000000000000..4eef4ea268dc --- /dev/null +++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=${PV} + +inherit cmake check-reqs edo multiprocessing python-r1 rocm + +DESCRIPTION="Next generation FFT implementation for ROCm" +HOMEPAGE="https://github.com/ROCm/rocFFT" +SRC_URI="https://github.com/ROCm/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz" +S="${WORKDIR}/rocFFT-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask +RDEPEND=" +perfscripts? ( + >=media-gfx/asymptote-2.61 + dev-texlive/texlive-latex + dev-tex/latexmk + sys-apps/texinfo + dev-python/sympy[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] ) +${PYTHON_DEPS}" + +DEPEND="=dev-util/hip-6* + ${PYTHON_DEPS} + benchmark? ( + dev-libs/boost + sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] + ) + test? ( + dev-cpp/gtest + dev-libs/boost + >=sci-libs/fftw-3 + sys-libs/libomp + sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] + ) +" + +BDEPEND=" + >=dev-build/cmake-3.22 + dev-build/rocm-cmake + dev-db/sqlite +" + +CHECKREQS_DISK_BUILD="7G" + +IUSE="benchmark perfscripts test" +REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch +) + +required_mem() { + if use test; then + echo "52G" + else + if [[ -n "${AMDGPU_TARGETS}" ]]; then + # count how many archs user specified in ${AMDGPU_TARGETS} + local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) + else + # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future. + local NARCH=7 + fi + echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required + fi +} + +pkg_pretend() { + return # leave the disk space check to pkg_setup phase +} + +pkg_setup() { + export CHECKREQS_MEMORY=$(required_mem) + check-reqs_pkg_setup + python_setup +} + +src_prepare() { + if use perfscripts; then + pushd scripts/perf || die + sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir + sed -e "/^top/,+1d" -i rocfft-perf suites.py || die + sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die + sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \ + -i perflib/pdf.py perflib/generators.py || die + popd + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -Wno-dev + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCH=$(usex benchmark ON OFF) + -DSQLITE_USE_SYSTEM_PACKAGE=ON + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}/clients/staging" || die + export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device + edob ./${PN,,}-test + edob ./${PN,,}-selftest +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}"/clients/staging || die + dobin dyna-rocfft-bench rocfft-bench + dosym dyna-rocfft-bench /usr/bin/dyna-rocfft-rider + dosym rocfft-bench /usr/bin/dyna-rocfft-rider + + if ! use perfscripts; then + # prevent collision with dev-util/perf + rm -rf "${ED}"/usr/bin/perf || die + fi + fi + + if use perfscripts; then + cd "${S}"/scripts/perf || die + python_foreach_impl python_doexe rocfft-perf + python_moduleinto ${PN}_perflib + python_foreach_impl python_domodule perflib/*.py + insinto /usr/share/${PN}-perflib + doins *.asy suites.py + fi +} diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest index 37d940a49b1c..cf2bbede484f 100644 --- a/sci-libs/rocPRIM/Manifest +++ b/sci-libs/rocPRIM/Manifest @@ -1 +1,3 @@ DIST rocPRIM-5.1.3.tar.gz 374510 BLAKE2B ab6960e7bd2159ac7a0d72ba6d594684f8d47028eca0940eabd35b346ac3d432a734ec575ee71341f339a9d0dead10dfafe81fb651a3b7da681aa900a5132d0e SHA512 54e14f2b40795153b862a64c9b3d336f35feccfda725daad75fae356b0147c577735884b65218c26c370ebec710af0f84aeef3103067a50db077cf9e24d2b64a +DIST rocPRIM-5.7.1.tar.gz 535649 BLAKE2B 469bf59b5c92c37df96f58bac5a6559dc2cb879e5f82e539881d79bda57d23c25a9b114466042258e87862a88cd53d260155d7785c9a69a1800b0d05e931f56d SHA512 b2f0bc07dbc5cd111dd513f6c05dbc533908c52ea99caf77d6a4dd35db2b28f98c80006bd1f50a232873eab00b70e54231c38bfd1035c8845029d53690fd5e71 +DIST rocPRIM-6.1.1.tar.gz 611372 BLAKE2B 984df214179a6d2c90b31bd30ec9472a0b985d9d488ea195968f25df4cac97ce48bfa4c322f2d578771ac63caeafc2c69c9dae911bc3a9d920ab9558ba7d6e15 SHA512 298eebc8a5d3fd7da71ab98a22fd39183436b3d9e14945e450f0fb35e38ea8fb99c5f2b342f1f77f21899a14d506ce96a965fbdb24f106ec9638dcd6afe6ae98 diff --git a/sci-libs/rocPRIM/files/rocPRIM-5.7.1-expand-isa-compatibility.patch b/sci-libs/rocPRIM/files/rocPRIM-5.7.1-expand-isa-compatibility.patch new file mode 100644 index 000000000000..84e3e7875ee8 --- /dev/null +++ b/sci-libs/rocPRIM/files/rocPRIM-5.7.1-expand-isa-compatibility.patch @@ -0,0 +1,29 @@ +This patch allows to HSA_OVERRIDE_GFX_VERSION environment variable (library just crashes otherwise) +--- a/rocprim/include/rocprim/device/config_types.hpp ++++ b/rocprim/include/rocprim/device/config_types.hpp +@@ -197,15 +197,21 @@ constexpr bool prefix_equals(const char* lhs, const char* rhs, std::size_t n) + constexpr target_arch get_target_arch_from_name(const char* const arch_name, const std::size_t n) + { + constexpr const char* target_names[] +- = {"gfx803", "gfx900", "gfx906", "gfx908", "gfx90a", "gfx1030", "gfx1102"}; ++ = {"gfx803", ++ "gfx900", "gfx902", "gfx909", "gfx912", ++ "gfx906", ++ "gfx908", ++ "gfx90a", ++ "gfx1030", "gfx1031", "gfx1032", "gfx1033", "gfx1034", "gfx1035", "gfx1036", ++ "gfx1100", "gfx1101", "gfx1102", "gfx1103", "gfx1150", "gfx1151"}; + constexpr target_arch target_architectures[] = { + target_arch::gfx803, +- target_arch::gfx900, ++ target_arch::gfx900, target_arch::gfx900, target_arch::gfx900, target_arch::gfx900, + target_arch::gfx906, + target_arch::gfx908, + target_arch::gfx90a, +- target_arch::gfx1030, +- target_arch::gfx1102, ++ target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, ++ target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, + }; + static_assert(sizeof(target_names) / sizeof(target_names[0]) + == sizeof(target_architectures) / sizeof(target_architectures[0]), diff --git a/sci-libs/rocPRIM/metadata.xml b/sci-libs/rocPRIM/metadata.xml index 6d29bd1f8901..b98edd6a4e2b 100644 --- a/sci-libs/rocPRIM/metadata.xml +++ b/sci-libs/rocPRIM/metadata.xml @@ -9,10 +9,14 @@ <email>gentoo@holzke.net</email> <name>Wilfried Holzke</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/rocPRIM</remote-id> + <remote-id type="github">ROCm/rocPRIM</remote-id> </upstream> - <use> - <flag name="benchmark">Build and install benchmark programs.</flag> - </use> + <use> + <flag name="benchmark">Build and install benchmark programs.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild b/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild index c6fc2d52e88e..b95730533189 100644 --- a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild +++ b/sci-libs/rocPRIM/rocPRIM-5.1.3.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 @@ -19,8 +19,8 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}" RDEPEND="dev-util/hip benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )" -BDEPEND="dev-util/rocm-cmake - >=dev-util/cmake-3.22" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22" DEPEND="${RDEPEND}" S="${WORKDIR}/rocPRIM-rocm-${PV}" diff --git a/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild b/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild new file mode 100644 index 000000000000..34c46c1b401d --- /dev/null +++ b/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} +inherit cmake rocm + +DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocPRIM" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RDEPEND="dev-util/hip + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/rocPRIM-rocm-${PV}" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch ) + +src_prepare() { + # "hcc" is depcreated, new platform ist "rocclr" + sed -e "/HIP_PLATFORM STREQUAL/s,hcc,rocclr," -i cmake/VerifyCompiler.cmake || die + + # Install according to FHS + sed -e "/PREFIX rocprim/d" \ + -e "/INSTALL_INTERFACE/s,rocprim/include,include/rocprim," \ + -e "/DESTINATION/s,rocprim/include,include," \ + -e "/rocm_install_symlink_subdir(rocprim)/d" \ + -i rocprim/CMakeLists.txt || die + + # disable downloading googletest and googlebenchmark + sed -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die + + # remove GIT dependency + sed -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die + + # install benchmark files + if use benchmark; then + sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \ + -e "/add_executable/a\ install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die + fi + + eapply_user + cmake_src_prepare +} + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + # uses HMM to fit tests to default <512M iGPU VRAM + MAKEOPTS="-j1" ROCPRIM_USE_HMM="1" cmake_src_test +} diff --git a/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild new file mode 100644 index 000000000000..cd85f27b6500 --- /dev/null +++ b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} +inherit cmake rocm + +DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm" +HOMEPAGE="https://github.com/ROCm/rocPRIM" +SRC_URI="https://github.com/ROCm/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz" +S="${WORKDIR}/rocPRIM-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE=" + benchmark? ( ${ROCM_REQUIRED_USE} ) + test? ( ${ROCM_REQUIRED_USE} ) +" + +RDEPEND="dev-util/hip + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22" +DEPEND="${RDEPEND}" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch ) + +src_prepare() { + # install benchmark files + if use benchmark; then + sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \ + -e "/add_executable/a\ install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + # uses HMM to fit tests to default <512M iGPU VRAM + ROCPRIM_USE_HMM="1" cmake_src_test -j1 +} diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest index e49a7db31d6a..81980f21cb0e 100644 --- a/sci-libs/rocRAND/Manifest +++ b/sci-libs/rocRAND/Manifest @@ -1,3 +1,5 @@ DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894187455cf1da70c486e9efc336a01dc53589c56afe994858b2344c1e74e8d35260f70ad9cd80c5da1103dd9e98da6f5f2bf8e1ddf97023effc8a434a76ce SHA512 cdc70799ddca456c37c2a65875b98acff74800aa2b4f28d77b27c38c32428dd5edb2837bf88bfb6fcc32bdae7f2b27f1b547831bad98101b04959b7ba6b74a85 DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28 DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5 +DIST rocRAND-5.7.1.tar.gz 23189653 BLAKE2B c70ab6f3b718c2430394f63b93bee15fa72daae704883fdb203b98b0dc4763b46bc27886af64c48bf4ebe8da9b919158b8cd346f70f9b76bf0492ce3b2c1e20e SHA512 4d74bce9fbd3cb45e3f057d38df747270c6986fea7ad524f7a88109b6a53a4ea5dcd60d4bbf2364888501e9444245fb6898bb79fccad0e37b61e819e8c4ed863 +DIST rocRAND-6.1.1.tar.gz 26683143 BLAKE2B 4108584c6372adbf2f9ef887cf1aa08f5afdfa489ba0739d247e693628f3e23978fe023c2896e7bff666b8822b0011fd3f635338b013898f8d76b3f31ec21f6c SHA512 d8df0e6bf843719e59434c952ef56b112ada23d0c226bec9f2974ed762500202ac809f495de61a4086289e35c2f4b670f4ed7dcd7092a158c0a731c368950a44 diff --git a/sci-libs/rocRAND/files/rocRAND-5.7.1_fix_generator_alignment.patch b/sci-libs/rocRAND/files/rocRAND-5.7.1_fix_generator_alignment.patch new file mode 100644 index 000000000000..84b58266220c --- /dev/null +++ b/sci-libs/rocRAND/files/rocRAND-5.7.1_fix_generator_alignment.patch @@ -0,0 +1,16 @@ +Fix crashes due to unaligned allocations in heap with new of structs when AVX2 or AVX512 is used. +This patch takes the simplest approach just shifts responsibility to the standard. +Similar approach in Eigen is named defined as: EIGEN_HAS_CXX17_OVERALIGN. + +Upstream bug: https://github.com/ROCmSoftwarePlatform/rocRAND/issues/403 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,7 @@ endif() + option(DISABLE_WERROR "Disable building with Werror" ON) + + # Build CXX flags +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + if(DISABLE_WERROR) diff --git a/sci-libs/rocRAND/metadata.xml b/sci-libs/rocRAND/metadata.xml index 4add606d2dbe..1c9d7fffbee6 100644 --- a/sci-libs/rocRAND/metadata.xml +++ b/sci-libs/rocRAND/metadata.xml @@ -9,10 +9,14 @@ <email>gentoo@holzke.net</email> <name>Wilfried Holzke</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/rocRAND</remote-id> + <remote-id type="github">ROCm/rocRAND</remote-id> </upstream> - <use> - <flag name="benchmark">Build and install benchmark programs.</flag> - </use> + <use> + <flag name="benchmark">Build and install benchmark programs.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild index f5f90b407482..bb518842e253 100644 --- a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild +++ b/sci-libs/rocRAND/rocRAND-5.1.3.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 @@ -25,10 +25,10 @@ PATCHES=( "${FILESDIR}"/${PN}-5.1.3_stdint-gcc13.patch RDEPEND="dev-util/hip" DEPEND="${RDEPEND} -dev-util/rocm-cmake +dev-build/rocm-cmake test? ( dev-cpp/gtest )" -BDEPEND="dev-util/rocm-cmake ->=dev-util/cmake-3.22" +BDEPEND="dev-build/rocm-cmake +>=dev-build/cmake-3.22" S="${WORKDIR}/rocRAND-rocm-${PV}" diff --git a/sci-libs/rocRAND/rocRAND-5.6.0.ebuild b/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild index b7b4ac7cc950..cadf2c863445 100644 --- a/sci-libs/rocRAND/rocRAND-5.6.0.ebuild +++ b/sci-libs/rocRAND/rocRAND-5.6.0-r1.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 @@ -22,10 +22,11 @@ PATCHES=( "${FILESDIR}"/${PN}-5.4.2_stdint-gcc13.patch ) RDEPEND="dev-util/hip" DEPEND="${RDEPEND} -dev-util/rocm-cmake -test? ( dev-cpp/gtest )" -BDEPEND="dev-util/rocm-cmake ->=dev-util/cmake-3.22" + dev-build/rocm-cmake + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22" S="${WORKDIR}/rocRAND-rocm-${PV}" diff --git a/sci-libs/rocRAND/rocRAND-5.7.1.ebuild b/sci-libs/rocRAND/rocRAND-5.7.1.ebuild new file mode 100644 index 000000000000..262215396fe3 --- /dev/null +++ b/sci-libs/rocRAND/rocRAND-5.7.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="Generate pseudo-random and quasi-random numbers" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND" +SRC_URI="https://github.com/ROCmSoftwarePlatform/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.2_stdint-gcc13.patch + "${FILESDIR}"/${PN}-5.7.1_fix_generator_alignment.patch +) + +RDEPEND="dev-util/hip" +DEPEND="${RDEPEND} + dev-build/rocm-cmake + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22" + +S="${WORKDIR}/rocRAND-rocm-${PV}" + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_HIPRAND=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + export LD_LIBRARY_PATH="${BUILD_DIR}/library" + # uses HMM to fit tests to default <512M iGPU VRAM + MAKEOPTS="-j1" ROCRAND_USE_HMM="1" cmake_src_test +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}"/benchmark + dobin benchmark_rocrand_* + fi +} diff --git a/sci-libs/rocRAND/rocRAND-6.1.1.ebuild b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild new file mode 100644 index 000000000000..1cfbcdbd04f3 --- /dev/null +++ b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="Generate pseudo-random and quasi-random numbers" +HOMEPAGE="https://github.com/ROCm/rocRAND" +SRC_URI="https://github.com/ROCm/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/rocRAND-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.7.1_fix_generator_alignment.patch +) + +RDEPEND="dev-util/hip" +DEPEND="${RDEPEND} + dev-build/rocm-cmake + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22" + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + export LD_LIBRARY_PATH="${BUILD_DIR}/library" + # uses HMM to fit tests to default <512M iGPU VRAM + ROCRAND_USE_HMM="1" cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}"/benchmark + dobin benchmark_rocrand_* + fi +} diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest index 35de2a25db03..bdd119767929 100644 --- a/sci-libs/rocSOLVER/Manifest +++ b/sci-libs/rocSOLVER/Manifest @@ -1,2 +1,4 @@ DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753 DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6 +DIST rocSOLVER-5.7.1.tar.gz 1859403 BLAKE2B f7a40494deda9dd66f2fb2f57e13665688e89e1f82733701ec60a520bc4b9f7d5899ada618a37e73baa3a910757be4f11d5fced5d4d2ad82c56918b34d265511 SHA512 78e0a2b5b069378696afebf5e3e023449b3d7705aa79099eb7721c142d7525255825b41bf413324c33178091315e3909980a1bf0cbb66e0891c85e757858ee1c +DIST rocSOLVER-6.1.1.tar.gz 2971118 BLAKE2B 2611b6b65704e7cd64df682728013f07d20c6e17e6729cec7befb91dbed57aabaaed2887a252d4ae610fe0bcb336dfcd4b98d63c107694c22e35be06d06363db SHA512 a96901226cbe5b410fa2885023a080b5ca7dc4659be92b363c37e10eba97d3da09d97488ecdc040452a535ad3284017c64b3b68646f258655583302baa009f34 diff --git a/sci-libs/rocSOLVER/metadata.xml b/sci-libs/rocSOLVER/metadata.xml index 344dd1337031..97b4749ddd6d 100644 --- a/sci-libs/rocSOLVER/metadata.xml +++ b/sci-libs/rocSOLVER/metadata.xml @@ -12,8 +12,15 @@ <email>xgreenlandforwyy@gmail.com</email> <name>Yiyang Wu</name> </maintainer> - <use> - <flag name="test">Perform rocsolver-test to compare the result between rocSOLVER and system LAPACK.</flag> - <flag name="benchmark">Build and install rocsolver-bench.</flag> - </use> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> + <upstream> + <remote-id type="github">ROCm/rocSOLVER</remote-id> + </upstream> + <use> + <flag name="test">Perform rocsolver-test to compare the result between rocSOLVER and system LAPACK.</flag> + <flag name="benchmark">Build and install rocsolver-bench.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild index 11cedfb8deff..7af286e20569 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.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 @@ -24,7 +24,7 @@ RDEPEND="dev-util/hip benchmark? ( virtual/blas )" DEPEND="${RDEPEND}" BDEPEND="test? ( dev-cpp/gtest - >=dev-util/cmake-3.22 + >=dev-build/cmake-3.22 virtual/blas )" PATCHES=( diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild index 8088b8523a68..10fb52f40af2 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.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 @@ -24,7 +24,7 @@ RDEPEND="dev-util/hip benchmark? ( virtual/blas )" DEPEND="${RDEPEND}" BDEPEND="test? ( dev-cpp/gtest - >=dev-util/cmake-3.22 + >=dev-build/cmake-3.22 virtual/blas )" PATCHES=( "${FILESDIR}"/${PN}-5.4.2-libfmt9.patch ) diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild new file mode 100644 index 000000000000..5d8141a88c15 --- /dev/null +++ b/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake edo rocm + +DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +IUSE="test benchmark" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}] + dev-libs/libfmt + benchmark? ( virtual/blas )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-cpp/gtest + >=dev-build/cmake-3.22 + virtual/blas )" + +RESTRICT="!test? ( test )" + +S=${WORKDIR}/${PN}-rocm-${PV} + +src_configure() { + # avoid sandbox violation + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=On + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -Wno-dev + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_SAMPLES=NO + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dobin clients/staging/rocsolver-bench + fi +} diff --git a/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild new file mode 100644 index 000000000000..4fe2bbbdaca1 --- /dev/null +++ b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake edo rocm + +DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform" +HOMEPAGE="https://github.com/ROCm/rocSOLVER" +SRC_URI="https://github.com/ROCm/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz" +S=${WORKDIR}/${PN}-rocm-${PV} + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +IUSE="test benchmark" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}] + dev-libs/libfmt + benchmark? ( virtual/blas )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-cpp/gtest + >=dev-build/cmake-3.22 + virtual/blas )" + +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -Wno-dev + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_SAMPLES=NO + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dobin clients/staging/rocsolver-bench + fi +} diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest index d9c178411520..ad5d2e4c12ad 100644 --- a/sci-libs/rocSPARSE/Manifest +++ b/sci-libs/rocSPARSE/Manifest @@ -1,4 +1,6 @@ DIST rocSPARSE-5.1.3.tar.gz 943788 BLAKE2B f9d5fc34d74bc10f3e5bd0a18da41fe9b35a2f01aca3a74979960958fd0e7648fca96493ba9d767119a452dd75ede0733959d0d4bae84615b7a1ff212c8412a3 SHA512 735aa210bbdc3f31b0ed4defe0288606e255788e877f24ed25506d780552a779305fe5bfd692a3e720e9b286073894300fcbcf161d41e1b23abf2110a9536bf3 +DIST rocSPARSE-5.7.1.tar.gz 1167162 BLAKE2B 20ed88c87afbb041a31aa8bf867dca7ee670af093347c9c6a68b0750e70c796e7cfd599f84a58de2b8038f7681524bcb5909230fc340d1575dae3b72089ec650 SHA512 cd48884c51fcddcb26c42920cf477999160b3f06da4ab182f746a18d1fe54f697d89b1e470c550bd2330b26fb596d4a5baadf64366145e0d07f3fd8891f9af59 +DIST rocSPARSE-6.1.1.tar.gz 1367035 BLAKE2B fc981df5913ea527bb4a7d3eba69373ebc7b74319f387e9f42a94feb1ec029ecca15618ea2d5ff7a91cb6e8959f164ab4be57755ee17db5f155f3b0e373cc487 SHA512 f87bd724b92fdb35e1c70cafcf09d95ab65f514bacfe1c59c5f0a2a75a8bae7a7dca2ee093ecd2e05adf542cc00165c0f8bf0a67e98013e2c4c72145ba951db2 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0 DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256 diff --git a/sci-libs/rocSPARSE/metadata.xml b/sci-libs/rocSPARSE/metadata.xml index f4e399df67a8..0cc6b903bb24 100644 --- a/sci-libs/rocSPARSE/metadata.xml +++ b/sci-libs/rocSPARSE/metadata.xml @@ -9,10 +9,14 @@ <email>gentoo@holzke.net</email> <name>Wilfried Holzke</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/rocSPARSE</remote-id> + <remote-id type="github">ROCm/rocSPARSE</remote-id> </upstream> - <use> - <flag name="benchmark">Build and install rocblas-bench.</flag> - </use> + <use> + <flag name="benchmark">Build and install rocblas-bench.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild index 3c16b15085ac..31d07cee0a08 100644 --- a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild +++ b/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.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..11} ) +PYTHON_COMPAT=( python3_{10..11} ) ROCM_VERSION=${PV} inherit cmake edo python-any-r1 toolchain-funcs rocm @@ -50,7 +50,7 @@ RDEPEND="dev-util/hip DEPEND="${RDEPEND}" BDEPEND="test? ( dev-cpp/gtest - >=dev-util/cmake-3.22 + >=dev-build/cmake-3.22 $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') ) benchmark? ( app-admin/chrpath ) diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r2.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r2.ebuild new file mode 100644 index 000000000000..e370820ce9dc --- /dev/null +++ b/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r2.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=${PV} + +inherit cmake edo python-any-r1 toolchain-funcs rocm + +DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE" + +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz +test? ( +https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz +https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz +https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz +https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz +https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz +https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz +https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz +https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz +https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz +https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz +https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz +https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz +https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz +https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz +https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz +https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz +https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz +https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz +https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz +https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz +https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz +)" + +LICENSE="MIT" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="=dev-util/hip-5* + sci-libs/rocPRIM:${SLOT}" +DEPEND="${RDEPEND}" +BDEPEND="test? ( + dev-cpp/gtest + >=dev-build/cmake-3.22 + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') +) +benchmark? ( app-admin/chrpath ) +" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/rocSPARSE-rocm-${PV}" + +PATCHES=( +) + +python_check_deps() { + if use test; then + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + fi +} + +src_prepare() { + sed -e "s/PREFIX rocsparse//" \ + -e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \ + -e "/rocm_install_symlink_subdir(rocsparse)/d" \ + -e "s:rocsparse/include:include/rocsparse:" \ + -i "${S}/library/CMakeLists.txt" || die + + # remove GIT dependency + sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die + + # Fix install path + sed -i -e "s.set(CMAKE_INSTALL_LIBDIR.#set(CMAKE_INSTALL_LIBDIR." CMakeLists.txt || die + + # use python interpreter specifyied by python-any-r1 + sed -e "/COMMAND ..\/common\/rocsparse_gentest.py/s,COMMAND ,COMMAND ${EPYTHON} ," \ + -i clients/tests/CMakeLists.txt || die + + cmake_src_prepare + + # Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, + # unpack and convert them into csr format + # This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage. + if use test; then + mkdir -p "${BUILD_DIR}"/clients/matrices + # compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error! + edo $(tc-getCXX) deps/convert.cpp -o deps/convert + find "${WORKDIR}" -maxdepth 2 -regextype grep -E -regex ".*/(.*)/\1\.mtx" -print0 | + while IFS= read -r -d '' mtxfile; do + destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr + ebegin "Converting ${mtxfile} to ${destination}" + deps/convert ${mtxfile} ${destination} + eend $? + done + fi +} + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=On + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}/clients/staging" || die + LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./${PN,,}-test +} + +src_install() { + cmake_src_install + + # rm unwanted copy + rm -rf "${ED}/usr/rocsparse" || die + + if use benchmark; then + cd "${BUILD_DIR}" || die + dobin clients/staging/rocsparse-bench + fi +} diff --git a/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild new file mode 100644 index 000000000000..093273002e65 --- /dev/null +++ b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=${PV} + +inherit cmake edo python-any-r1 toolchain-funcs rocm + +DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation" +HOMEPAGE="https://github.com/ROCm/rocSPARSE" + +SRC_URI="https://github.com/ROCm/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz +test? ( +https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz +https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz +https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz +https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz +https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz +https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz +https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz +https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz +https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz +https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz +https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz +https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz +https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz +https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz +https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz +https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz +https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz +https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz +https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz +https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz +https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz +)" + +S="${WORKDIR}/rocSPARSE-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RDEPEND="=dev-util/hip-6* + sci-libs/rocPRIM:${SLOT}" +DEPEND="${RDEPEND}" +BDEPEND="test? ( + dev-cpp/gtest + >=dev-build/cmake-3.22 + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') +) +" + +RESTRICT="!test? ( test )" + +python_check_deps() { + if use test; then + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + fi +} + +src_prepare() { + # use python interpreter specifyied by python-any-r1 + sed -e "s/\${python}/${EPYTHON}/" \ + -i clients/tests/CMakeLists.txt || die + + cmake_src_prepare + + # Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, + # unpack and convert them into csr format + # This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage. + if use test; then + mkdir -p "${BUILD_DIR}"/clients/matrices + # compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error! + edo $(tc-getCXX) deps/convert.cpp -o deps/convert + find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 | + while IFS= read -r -d '' mtxfile; do + destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr + ebegin "Converting ${mtxfile} to ${destination}" + deps/convert ${mtxfile} ${destination} + eend $? + done + fi +} + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}/clients/staging" || die + LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./${PN,,}-test +} + +src_install() { + cmake_src_install + + # rm unwanted copy + rm -rf "${ED}/usr/rocsparse" || die + + if use benchmark; then + cd "${BUILD_DIR}" || die + dobin clients/staging/rocsparse-bench + fi +} diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest index 586b8f1b9260..3916366accb8 100644 --- a/sci-libs/rocThrust/Manifest +++ b/sci-libs/rocThrust/Manifest @@ -1 +1,3 @@ DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74 +DIST rocThrust-5.7.1.tar.gz 1122808 BLAKE2B 41a5d57d03c7f95baf861b772c9513c7fbc26eee8a2f388897eb9b9f9fad3cdad81e2a79932c5b9a6d88b4e1596bf64e59e01337943a036ddb792f7b352ecd31 SHA512 52a9640808f0ed78ae2d6f25e741af59ae4e977535a0431f16c0fa1ee9a395e6f389cf29e61c02ac274cf16fcd193e5df6fb2edc340059ab282ed7cd877fc8b4 +DIST rocThrust-6.1.1.tar.gz 1147635 BLAKE2B e71288a4666ba1f23cf85d2d269f61f9085efaeb2921b7f3142c5ce0808380b27a8c07945a44b6a651747046020b412838a667232b1ba65308fd7fd336b840b4 SHA512 30eeb6df73ee0dc2361879337faae09cf19cd151510c6e22d774c22b4be19272f9980cc6ba2b2e42f43738a1e475f49fcb4384d66b24639746a05685a90e37d4 diff --git a/sci-libs/rocThrust/metadata.xml b/sci-libs/rocThrust/metadata.xml index 61a33c63bbf4..03efe0482dfe 100644 --- a/sci-libs/rocThrust/metadata.xml +++ b/sci-libs/rocThrust/metadata.xml @@ -8,10 +8,14 @@ <email>gentoo@holzke.net</email> <name>Wilfried Holzke</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">ROCm-Developer-Tools/rocThrust</remote-id> + <remote-id type="github">ROCm/rocThrust</remote-id> </upstream> - <use> - <flag name="benchmark">Build and install benchmark binary.</flag> - </use> -</pkgmetadata> + <use> + <flag name="benchmark">Build and install benchmark binary.</flag> + </use> +</pkgmetadata>
\ No newline at end of file diff --git a/sci-libs/rocThrust/rocThrust-5.1.3.ebuild b/sci-libs/rocThrust/rocThrust-5.1.3.ebuild index c7ef0e87fa4a..6fa60fff62dc 100644 --- a/sci-libs/rocThrust/rocThrust-5.1.3.ebuild +++ b/sci-libs/rocThrust/rocThrust-5.1.3.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 @@ -23,7 +23,7 @@ RDEPEND="dev-util/hip sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] test? ( dev-cpp/gtest )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/cmake-3.22" +BDEPEND=">=dev-build/cmake-3.22" S="${WORKDIR}/rocThrust-rocm-${PV}" diff --git a/sci-libs/rocThrust/rocThrust-5.7.1.ebuild b/sci-libs/rocThrust/rocThrust-5.7.1.ebuild new file mode 100644 index 000000000000..eec7600d151e --- /dev/null +++ b/sci-libs/rocThrust/rocThrust-5.7.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="HIP back-end for the parallel algorithm library Thrust" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocThrust" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz" + +LICENSE="Apache-2.0" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/hip + sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] + test? ( dev-cpp/gtest )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-build/cmake-3.22" + +S="${WORKDIR}/rocThrust-rocm-${PV}" + +PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" ) + +src_prepare() { + sed -e "/PREFIX rocthrust/d" \ + -e "/DESTINATION/s:rocthrust/include/thrust:include/thrust:" \ + -e "/rocm_install_symlink_subdir(rocthrust)/d" \ + -e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/:" -i thrust/CMakeLists.txt || die + + sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/thrust:" \ + -e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die + + # disable downloading googletest and googlebenchmark + sed -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die + + # remove GIT dependency + sed -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die + + eapply_user + cmake_src_prepare +} + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARKS=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + # uses HMM to fit tests to default <512M iGPU VRAM + MAKEOPTS="-j1" ROCTHRUST_USE_HMM="1" cmake_src_test +} + +src_install() { + cmake_src_install + + use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench +} diff --git a/sci-libs/rocThrust/rocThrust-6.1.1.ebuild b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild new file mode 100644 index 000000000000..7a04d78cbe0f --- /dev/null +++ b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="HIP back-end for the parallel algorithm library Thrust" +HOMEPAGE="https://github.com/ROCm/rocThrust" +SRC_URI="https://github.com/ROCm/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz" +S="${WORKDIR}/rocThrust-rocm-${PV}" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE=" + benchmark? ( ${ROCM_REQUIRED_USE} ) + test? ( ${ROCM_REQUIRED_USE} ) +" + +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/hip + sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] + test? ( dev-cpp/gtest )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-build/cmake-3.22" + +PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" ) + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARKS=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + # uses HMM to fit tests to default <512M iGPU VRAM + ROCTHRUST_USE_HMM="1" cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench +} diff --git a/sci-libs/rocWMMA/Manifest b/sci-libs/rocWMMA/Manifest new file mode 100644 index 000000000000..7aeb9da75f6f --- /dev/null +++ b/sci-libs/rocWMMA/Manifest @@ -0,0 +1,2 @@ +DIST rocWMMA-5.7.1.tar.gz 3163060 BLAKE2B 47ca55c0cd388ca51ad3843e656a31ce04d9e07988c26bfb69a7c61bfe497609408cfd20dcbe9c6698bd79b800a114ab67d582ced43dc6f1c4db4072e2901d99 SHA512 92c9c634fdf1f5319d34fabbf691df45600abdc5285a76b40255e7d6d260553076f65baa1eda566a163725e2a0cec0a85372eb07add39c65368e84505c176f50 +DIST rocWMMA-6.1.1.tar.gz 3189782 BLAKE2B fd96d8f3ba8f21ee3544d532a59ffdefa1aefc94d73401f48d470f7f699e28771d5495e98c1ee316d8379167b70b945220be6670dee2757a62af162276a2fb0f SHA512 db2bfe805a4f33c48ee98c821efe0b261eca474af9e954843c83faa3335459bfe635326ba2cfc7b8b8ece2cf0f2c418f49ff6aa81537f8d3747cc729738a6b18 diff --git a/sci-libs/rocWMMA/files/rocWMMA-5.7.1-use-system-googletest.patch b/sci-libs/rocWMMA/files/rocWMMA-5.7.1-use-system-googletest.patch new file mode 100644 index 000000000000..f4f78d8d8ee6 --- /dev/null +++ b/sci-libs/rocWMMA/files/rocWMMA-5.7.1-use-system-googletest.patch @@ -0,0 +1,25 @@ +Add an option to use system PR +Upstream PR: https://github.com/ROCm/rocWMMA/pull/353 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -29,8 +29,12 @@ include( CMakeDependentOption ) + cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" ON "ROCWMMA_BUILD_TESTS" OFF ) + cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF ) + cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF ) ++cmake_dependent_option( ROCWMMA_USE_SYSTEM_GOOGLETEST "Use system Google Test library instead of downloading and building it" OFF "ROCWMMA_BUILD_TESTS" OFF ) + + # Test/benchmark requires additional dependencies ++if(ROCWMMA_USE_SYSTEM_GOOGLETEST) ++ find_package(GTest REQUIRED) ++else() + include( FetchContent ) + + FetchContent_Declare( +@@ -53,6 +57,7 @@ if(NOT googletest_POPULATED) + # Restore shared libs setting + set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE) + endif() ++endif() + + set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) + set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp diff --git a/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch b/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch new file mode 100644 index 000000000000..de29d5b70410 --- /dev/null +++ b/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch @@ -0,0 +1,28 @@ +Add an option to use system PR +Upstream PR: https://github.com/ROCm/rocWMMA/pull/353 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -29,11 +29,15 @@ include( CMakeDependentOption ) + cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" ON "ROCWMMA_BUILD_TESTS" OFF ) + cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF ) + cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF ) ++cmake_dependent_option( ROCWMMA_USE_SYSTEM_GOOGLETEST "Use system Google Test library instead of downloading and building it" OFF "ROCWMMA_BUILD_TESTS" OFF ) + + add_compile_options(-mcmodel=large) + add_link_options(-mcmodel=large) + + # Test/benchmark requires additional dependencies ++if(ROCWMMA_USE_SYSTEM_GOOGLETEST) ++ find_package(GTest 1.12.1 REQUIRED) ++else() + include( FetchContent ) + + FetchContent_Declare( +@@ -59,6 +63,7 @@ if(NOT googletest_POPULATED) + # Restore shared libs setting + set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE) + endif() ++endif() + + set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) + set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp diff --git a/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch b/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch new file mode 100644 index 000000000000..d4219baf3496 --- /dev/null +++ b/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch @@ -0,0 +1,25 @@ +Don't install tests into /usr/bin +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -114,11 +114,6 @@ function(add_rocwmma_test TEST_TARGET TEST_SOURCE) + add_test(NAME ${TEST_TARGET} COMMAND ${TEST_TARGET}) + set_property(TEST ${TEST_TARGET} PROPERTY SKIP_REGULAR_EXPRESSION "no ROCm-capable device" "unsupported host device") + +- rocm_install_targets( +- TARGETS ${TEST_TARGET} +- COMPONENT tests +- ) +- + get_target_property(EXE_NAME ${TEST_TARGET} RUNTIME_OUTPUT_NAME) + if(EXE_NAME STREQUAL "EXE_NAME-NOTFOUND") + get_target_property(EXE_NAME ${TEST_TARGET} OUTPUT_NAME) +@@ -148,9 +143,3 @@ add_subdirectory(gemm) + add_subdirectory(unit) + add_subdirectory(dlrm) + +-rocm_install( +- FILES "${INSTALL_TEST_FILE}" +- DESTINATION "${CMAKE_INSTALL_BINDIR}/${PROJECT_NAME}" +- COMPONENT tests +- RENAME "CTestTestfile.cmake" +-) diff --git a/sci-libs/scikit-optimize/metadata.xml b/sci-libs/rocWMMA/metadata.xml index d554e7c990fa..f5faee0f0220 100644 --- a/sci-libs/scikit-optimize/metadata.xml +++ b/sci-libs/rocWMMA/metadata.xml @@ -5,8 +5,11 @@ <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="pypi">scikit-optimize</remote-id> - <remote-id type="github">scikit-optimize/scikit-optimize</remote-id> + <remote-id type="github">ROCm/rocWMMA</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/rocWMMA/rocWMMA-5.7.1.ebuild b/sci-libs/rocWMMA/rocWMMA-5.7.1.ebuild new file mode 100644 index 000000000000..a2ca2b3404da --- /dev/null +++ b/sci-libs/rocWMMA/rocWMMA-5.7.1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +ROCM_SKIP_GLOBALS=1 + +inherit cmake rocm + +DESCRIPTION="library for accelerating mixed precision matrix multiply-accumulate operations" +HOMEPAGE="https://github.com/ROCm/rocWMMA" +SRC_URI="https://github.com/ROCm/rocWMMA/archive/rocm-${PV}.tar.gz -> rocWMMA-${PV}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +DEPEND="=dev-util/hip-5*" + +BDEPEND=" + test? ( + dev-cpp/gtest + ) + dev-build/rocm-cmake +" + +IUSE_TARGETS=( gfx908 gfx90a gfx1100 gfx1101 gfx1102 ) +IUSE_TARGETS=( "${IUSE_TARGETS[@]/#/amdgpu_targets_}" ) + +IUSE="${IUSE_TARGETS[@]/#/+} test" + +REQUIRED_USE="|| ( ${IUSE_TARGETS[*]} )" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/rocWMMA-rocm-${PV}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.7.1-use-system-googletest.patch +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DROCM_SYMLINK_LIBS=OFF + -DROCWMMA_BUILD_SAMPLES=OFF + -DROCWMMA_BUILD_TESTS=$(usex test ON OFF) + ) + use test && mycmakeargs+=(-DROCWMMA_USE_SYSTEM_GOOGLETEST=ON) + CC=hipcc CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cmake_src_test -j1 +} diff --git a/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild new file mode 100644 index 000000000000..a3f8d61463b1 --- /dev/null +++ b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_SKIP_GLOBALS=1 + +inherit cmake rocm flag-o-matic + +DESCRIPTION="library for accelerating mixed precision matrix multiply-accumulate operations" +HOMEPAGE="https://github.com/ROCm/rocWMMA" +SRC_URI="https://github.com/ROCm/rocWMMA/archive/rocm-${PV}.tar.gz -> rocWMMA-${PV}.tar.gz" +S="${WORKDIR}/rocWMMA-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +DEPEND="=dev-util/hip-6*" + +IUSE_TARGETS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 gfx1102 ) +IUSE_TARGETS=( "${IUSE_TARGETS[@]/#/amdgpu_targets_}" ) +ROCM_USEDEP_OPTFLAGS=${IUSE_TARGETS[*]/%/(-)?} +ROCM_USEDEP=${ROCM_USEDEP_OPTFLAGS// /,} +ROCM_REQUIRED_USE=" || ( ${IUSE_TARGETS[*]} )" + +BDEPEND=" + test? ( + dev-cpp/gtest + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + ) + dev-build/rocm-cmake +" + +IUSE="${IUSE_TARGETS[*]/#/+} test" + +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.0.2-use-system-googletest.patch + "${FILESDIR}"/${PN}-6.1.1-no-test-install.patch +) + +src_configure() { + # ld.lld bug https://github.com/llvm/llvm-project/issues/61101 + filter-lto + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DROCM_SYMLINK_LIBS=OFF + -DROCWMMA_BUILD_SAMPLES=OFF + -DROCWMMA_BUILD_TESTS="$(usex test)" + ) + use test && mycmakeargs+=(-DROCWMMA_USE_SYSTEM_GOOGLETEST=ON) + CC=hipcc CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cmake_src_test -j1 +} diff --git a/sci-libs/rpp/Manifest b/sci-libs/rpp/Manifest new file mode 100644 index 000000000000..322ed39e26ea --- /dev/null +++ b/sci-libs/rpp/Manifest @@ -0,0 +1 @@ +DIST rpp-6.1.1.tar.gz 37016755 BLAKE2B 884090ab50e0a4a3aed4e52c5bbd934a8c5b62eca310471c30cf4c5a7cafdd36fed7894320b4d5246620b3c47e90fafd0f8160a7d4ed0295c7668c8d147f4b18 SHA512 a7c10bdd08739eba08209783decf0f4fd7c12194b9ebc63bd16e4cb998645110c089833efb83a77d4bed7f8599cf3a320608be28633f0dc956079f9d70e765f8 diff --git a/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch b/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch new file mode 100644 index 000000000000..2253bb5aed67 --- /dev/null +++ b/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch @@ -0,0 +1,17 @@ +Skip installation of license: it will be installed by ebuild to correct place +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -343,13 +343,6 @@ install(FILES ${PROJECT_BINARY_DIR}/include/rpp_backend.h + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/utilities/test_suite/ DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test) + +-# set license information +-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime) +-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan COMPONENT asan) +-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-dev COMPONENT dev) +-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-test COMPONENT test) +- + # CTest - Needs RPP Installed + enable_testing() + include(CTest) diff --git a/sci-libs/rpp/metadata.xml b/sci-libs/rpp/metadata.xml new file mode 100644 index 000000000000..944efd183177 --- /dev/null +++ b/sci-libs/rpp/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> + <upstream> + <remote-id type="github">ROCm/rpp</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/rpp/rpp-6.1.1.ebuild b/sci-libs/rpp/rpp-6.1.1.ebuild new file mode 100644 index 000000000000..dc7d12f41604 --- /dev/null +++ b/sci-libs/rpp/rpp-6.1.1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake flag-o-matic rocm + +DESCRIPTION="AMD ROCm Performance Primitives (RPP) high-performance computer vision library" +HOMEPAGE="https://github.com/ROCm/rpp" +SRC_URI="https://github.com/ROCm/rpp/archive/refs/tags/rocm-${PV}.tar.gz -> rpp-${PV}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +# pkgcheck warning: RequiredUseDefaults +REQUIRED_USE=" + cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c + ${ROCM_REQUIRED_USE} +" + +RDEPEND=" + dev-util/hip:${SLOT} +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/cmake-3.22 + >=dev-libs/half-1.12.0-r1 + test? ( + dev-cpp/gtest + media-libs/opencv:= + ) +" + +IUSE="cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-skip-install-license.patch +) + +DOCS=( CHANGELOG.md LICENSE README.md ) + +rcc_test_wrapper() { + local S="${WORKDIR}/${PN}-rocm-${PV}/utilities/rpp-unittests/HIP_NEW" + local CMAKE_USE_DIR="${S}" + local BUILD_DIR="${BUILD_DIR}/utilities/rpp-unittests/HIP_NEW" + cd "${S}" || die + $@ +} + +src_prepare() { + sed -e "s:\${ROCM_PATH}/llvm/bin/clang++:hipcc:" \ + -i CMakeLists.txt || die + + cmake_src_prepare + if use test; then + local PATCHES=() + rcc_test_wrapper cmake_src_prepare + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DROCM_PATH=/usr + -DBACKEND=HIP + -DBUILD_WITH_AMD_ADVANCE=OFF + ) + + cmake_src_configure + + if use test; then + append-cxxflags -I"${S}/include" + append-ldflags -L"${BUILD_DIR}/lib64" + local mycmakeargs=(-DROCM_PATH=/usr) + use test && rcc_test_wrapper cmake_src_configure + fi +} + +src_compile() { + cmake_src_compile + use test && rcc_test_wrapper cmake_src_compile +} + +src_test() { + check_amdgpu + + cd "${BUILD_DIR}"/utilities/rpp-unittests/HIP_NEW || die + for params in "0 0" "0 1" "1 1" "2 1" "5 1" "0 2" "0 3" "0 4" "0 5" "0 8"; do + LD_LIBRARY_PATH="${BUILD_DIR}"/lib64 ./uniqueFunctionalities_hip $params || die + done +} diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index bcfb111fbf90..b333ecdd8776 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1 +1,2 @@ DIST rtabmap-0.20.23.tar.gz 21922099 BLAKE2B ed254beea19b635ffad6e09edd8ea8370eda633dacd3dfcc273b6b750685ac4dac8b57ee91d273eef21c23f4b057cc401354a8a18d2e93ec2f6564bb84c59c0f SHA512 bef7140d569cdb3a86d329b79d410feeb5fe3291263e3be68a62270f807c102b5911946d50fb2f084b8a76eaa7e486c5819dc29ef1c71ef80ac3d5ee41910942 +DIST rtabmap-0.21.3.tar.gz 21956462 BLAKE2B 41c3c95715bc165d339a4a63747e40db4357ffd1b5151630689008a6856c4721805ec8def9b47ea487ca428641b5d253dfa5b62b1bbb14027168bbc0e4c350d3 SHA512 0b9b2d2fdcfdef0324fcde54a74ecec75786372f2df0bd8d9383ae71c500098bff016465a68ce2a9328d0a2beee4bf9b0af6b21435589ce1e91503fe2aca5d01 diff --git a/sci-libs/rtabmap/rtabmap-0.21.3.ebuild b/sci-libs/rtabmap/rtabmap-0.21.3.ebuild new file mode 100644 index 000000000000..88c172c29ffb --- /dev/null +++ b/sci-libs/rtabmap/rtabmap-0.21.3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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 + +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" +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}" +fi + +DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" +HOMEPAGE="http://introlab.github.io/rtabmap/" +LICENSE="BSD" +SLOT="0" +IUSE="examples ieee1394 openni2 qt5" + +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:= + 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 + ) +" +DEPEND="${RDEPEND}" +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)" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + # Needed since we force ros crawling to be done only in + # /usr/share/ros_packages/ + insinto /usr/share/ros_packages/${PN} + doins "${ED}/usr/share/${PN}/package.xml" +} diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild index 86bb221427fb..88c172c29ffb 100644 --- a/sci-libs/rtabmap/rtabmap-9999.ebuild +++ b/sci-libs/rtabmap/rtabmap-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -11,13 +11,13 @@ fi inherit ${SCM} cmake multilib -VER_SUFFIX=rolling +VER_SUFFIX=noetic if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" else KEYWORDS="~amd64" - SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P}-${VER_SUFFIX}" fi @@ -47,8 +47,6 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/yamlcpp.patch" ) - src_configure() { local mycmakeargs=( "-DWITH_QT=$(usex qt5 ON OFF)" diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest deleted file mode 100644 index 9cc4d0715929..000000000000 --- a/sci-libs/rtree/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Rtree-1.0.0.tar.gz 48837 BLAKE2B 60e516155e7e48158494b7ea4720dc71ece2111fb94e320976a6dd691d2458b8586c2bf8109a37d86db211ac342d77877b435bdb54627a94c898642e8520a071 SHA512 9a414cd65b27ba35313dd7185dece83f5d7235867f6f0c72c2902d7ffd72808138dbf30d8fe11c8bbf0ec463072e5f6112d75b5fdd5a1dab7720c56d3632d576 diff --git a/sci-libs/rtree/metadata.xml b/sci-libs/rtree/metadata.xml deleted file mode 100644 index 34c930a0bce1..000000000000 --- a/sci-libs/rtree/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>3dprint@gentoo.org</email> - <name>Gentoo 3D Printer Project</name> - </maintainer> - <maintainer type="person"> - <email>andrewammerlaan@gentoo.org</email> - <name>Andrew Ammerlaan</name> - </maintainer> - <longdescription> - Rtree is a ctypes Python wrapper of libspatialindex that provides a number of advanced spatial indexing - features for the spatially curious Python user. - </longdescription> - <upstream> - <bugs-to>https://github.com/Toblerity/rtree/issues</bugs-to> - <remote-id type="github">Toblerity/rtree</remote-id> - <remote-id type="pypi">Rtree</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/rtree/rtree-1.0.0.ebuild b/sci-libs/rtree/rtree-1.0.0.ebuild deleted file mode 100644 index 6a3c861b0013..000000000000 --- a/sci-libs/rtree/rtree-1.0.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYPI_PN=${PN^} - -inherit distutils-r1 pypi - -DESCRIPTION="R-Tree spatial index for Python GIS" -HOMEPAGE="https://rtree.readthedocs.io" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" - -RDEPEND=" - sci-libs/libspatialindex - dev-python/typing-extensions[${PYTHON_USEDEP}] -" - -BDEPEND=" - test? ( dev-python/numpy[${PYTHON_USEDEP}] ) -" - -distutils_enable_sphinx docs/source -distutils_enable_tests pytest diff --git a/sci-libs/safetensors/Manifest b/sci-libs/safetensors/Manifest index e53939334466..b5b829b8af00 100644 --- a/sci-libs/safetensors/Manifest +++ b/sci-libs/safetensors/Manifest @@ -1,41 +1,41 @@ -DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8 -DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31 -DIST libc-0.2.141.crate 671145 BLAKE2B c0e37825ac3fba376e942a0e2c2aeefcab384b24c50a453d1948376cecb3f953d59735e37aef8a9ca7ae707fc6b4818823fae7330f213bf084e5460a82dd3ed5 SHA512 29d81f440d62fa1c9f7983c38138994e61f4897761a50a4f14abce1ced85a8994c6f0cc0ce86f77113b74495e36ddbebae6627f0b94c44621620a395a6723cdd -DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 -DIST memmap2-0.5.10.crate 26847 BLAKE2B 1cf50f710ffedcebade4f131b8c3103b036778b320da671305c0244077743c53da155d444bcc4d0eece294234bb6e86bffe67da67aaf12a116573c64ce0ebc50 SHA512 39bd2734ce4f16c7f5a5e771f9ef92272b26f511421d5f39dfd2aaca072400ee38f2cd38352005c0c8c359095131770ce1c14570790bfe19ce6a17f711deff8a -DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe -DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904 +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f +DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 +DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a +DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c -DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0 -DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03 -DIST pyo3-0.18.2.crate 418755 BLAKE2B a45c27639d9c4c5a4e017b7e8d7580aba285ee11295f344809e30ac23b70e4541f2cb765dfeee20fdf4d441e1449f5cad4bd6308a52822eea3595305081d4b77 SHA512 b97ebc10939418d7fe3d6219921875cc7253f3aa7cd9d06b1486f8757c6d102377eb851b3a669c670423af2c80e389b736f0ce04a6cecb716c952413d06fe434 -DIST pyo3-build-config-0.18.2.crate 29138 BLAKE2B ad37bacda5f0e5c8eaf382b3371de251b83c721dc2378a0bd3700462bb65273bcd4277589084f6af0a2959f17b370fe5e6a5699c8689107220333c57387bf0ae SHA512 01f544938d83a8283f5101f69673f8a39d2052186e7c712709be25c5ae17a11e7d68c2fd9b4bc7661fff9343ebf3ccc196c1259321061f048c59696692601ae1 -DIST pyo3-ffi-0.18.2.crate 62903 BLAKE2B 31e52b73705c1e5f44e419f314b1674a722a604fb52be5d5e5ff2ae9881ec9f204c1f51760570ed4c210ea530bd9295a27beaf9b5631ef02370d42d3e4c0be18 SHA512 495dcf45154ce89b8cd3a3fe193938e199465cf510df1713f7ad82e0a138ac2f8f1b73ec80f8af72f79a4ed26a9f4e4e93d52357ad4f41a213ec0c7b602734b9 -DIST pyo3-macros-0.18.2.crate 7173 BLAKE2B dfa5792be03b3b1164471ef9ff4ee672fe8e57d0fc169ca04da1542d86262e7e526be079e303b8a4899bfa4b0680d38604f80263c71b33ead5bf0a60871f473c SHA512 a2c367b4b1556b16304ef0da4ed8961cc760d259da9fbdabf791ac910de4f1e9f193227f10ea4215a52c701bd0ee92311dc91d272b9364017e2f6ebde5698f72 -DIST pyo3-macros-backend-0.18.2.crate 48722 BLAKE2B 662822ae71702cb7d173c1ac7ead49cecde0dc4545bc3f5f30fd9ef7fab5537c13509bc8f18b2a8d05d7fa7f6fc8d0378a44d67b85edadfdf6ca153fc698a7d4 SHA512 433d9287bf3cdf84291c8d04ca5b24ecab2186379db554d6b2cf271e8716a890dcdc0717b2a00267e85dc637520559ef8e883bde2e2b16dd8cd580c1468c2dc3 -DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5 -DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 -DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13 -DIST safetensors-0.3.1.gh.tar.gz 71846 BLAKE2B d32fcd6afa34550c4b7cec2d09d84f967c2fb1a589ef7e38d1e443c74b008d31476d458a3862064c0ad90f54c70f6bedd170e6903f290164beda24662deb4c58 SHA512 483f90f8a1377dbdcd0ac9488014474da2ff197a981cf41602758b002d87ce75fa68b221b94374501f108820ee59eeb70a53811b012150bcf224e880c6749b98 -DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST serde-1.0.160.crate 77010 BLAKE2B 45d2585bd7e5dcd368b72c29046bd595c577826da4aea6d019adaf07d23adc096db7aba952037dfdac9dbf08a1e92ababd44cc784ace557fe2cfe83beca446cf SHA512 b03eb453ac01a483843829952462de4e8f6d0fa4a244d38a6f476a911e2e991a508121265befd108134ae7cce8a7a40c4d217f80f3e025f9a612a0bf80862306 -DIST serde_derive-1.0.160.crate 55081 BLAKE2B 851cbd173bd758d46c9f545f05a17f65f7b0a2cd353cc75a985072e3772ca6d8395b63208d845dfba231d7cb5fcee97ec0df0bd0df010096577d618fad8bffb0 SHA512 14b2a2ad7131efa7ec95d5a6e7633a9d1e991b046c0b00cce9c3681edd73cb53ff477aa52a430d8465aa8b362696244ea80f12ffbf0e6f98e35605fe4c60f407 -DIST serde_json-1.0.95.crate 144618 BLAKE2B beb05d7c37fcbacf4cc7dc04380e818a144a81e20e09ac9aecf6488bc18b142713bd1e9c7bc2ff4d10dd2385ccd280207cd992380bde4616db54f0852141eb0f SHA512 ff9f3f9e9a0e07956923bbac02288915c31f5ee24fc618808bfd4aa4b36ec40ec8d0e4426d926bdbcd019c9a4a6608dff5a651bf92dc5663eaf69c7c060223ba -DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae -DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d -DIST syn-2.0.14.crate 240699 BLAKE2B 7807bf1dcf5c19dab814fad916a5b8167324627406b7113bff7501c12b3e460e803a0e6b06f08047979d2d6af103ac60aacb4e98c9258d12e0e693e44001500a SHA512 a1cb1a427f7fe5bc5f1d130be93aff673e933e9ce971324d010ad883bc1a91c81d3467641762498bb7cc4c1ee3d1aa2301bdb68e8b0e81b014f99d91b824039a -DIST target-lexicon-0.12.6.crate 24357 BLAKE2B 5d9aef958155bdc1b546b9940083cf81ba4c638525e2d46340e50c4274764b39ac19a12214f3ff64a6830524a2ecea9d555db3f07d5d7dbccd7dd809255c4499 SHA512 63ccc047d10ebff55c3b9be400e2deafcaba7beb28ee67bae6d5df58e7c08362b2c4e0004f6daa582928850701969015ad43714c7ad46df665474667ff4db58f -DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088 -DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a -DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47 -DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9 -DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1 -DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63 -DIST windows_i686_gnu-0.42.2.crate 736236 BLAKE2B 4ef0496462afc73d9d72af7e5da1e6d3506a92f8172930e88ae64ab97596ffd31c4f97fb969e9b677e30159c27f00a8e756deb006b630fb98ce83f03c8b762e2 SHA512 ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c -DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a9fe9d3d777130db9e592982660dbf9a96a0f5e723ca121465787aa11877d2d29a5a7d7cf066cdc8fa7e90d7ca7dcb7677f1 SHA512 c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804 -DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f -DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3 -DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788 +DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032 +DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c +DIST proc-macro2-1.0.80.crate 48227 BLAKE2B 1b4d2a1d613af8e03fab7a976707ed9ad4809ba50775992df54de10e5b8deabfcce423ca962fbce5c22090421cb0b8b26b8026d56562aa6569a8acfbb49d55de SHA512 d40181bbc4f83ee66be7721e8f89f9a08e368e12a8a0d4c1dcdb1c29cc72b1bcb8da598de1ad1a155a8182026ab7f8365f7a46fc76d589282fbffbd35aa228a0 +DIST pyo3-0.21.1.crate 503776 BLAKE2B a042478e4d4fbff9f40eac1b09c2a0fd4af54a751ca16d3bcbaaefc417ef88066c2cbf0cb758dcada9e36c378007081fb9ad0f6bb36afb2622fdf7b3ba36934e SHA512 6bf1c99b7c0c44ece16b3298f1090891cac2994e25730da8a82981f2296bc2d260b61df08897a2cd6c27c6e90deb70e4c08388fc70eeea6dea4b5cc451ed9598 +DIST pyo3-build-config-0.21.1.crate 30540 BLAKE2B 4019892096ee02c25ec6484eb56da12990fc84be5c5173f524e88e8b18e5b1b113d0db1962aff44253519bd1b5f3d4f01512ba86441927c19b04911d8282a039 SHA512 9eb4fbef1015deb1d7a414181926b6b4e44acc2347379783f2fe28e212986e62bb7e36d214d3bed613e9f213a9882084af9012042d9047846f7f4948f64112de +DIST pyo3-ffi-0.21.1.crate 66163 BLAKE2B 7d47e140d6e39d2622a77349c20466e9e161d3732b3df7a4fba258ac4b41b5bfa57e4af87dae8ab932a27c965bc9e3e10cd38195c9037cb78246e0ad10260fd1 SHA512 6d0f6d1c9d6af1255a1d709e1da6dee82c9948ddcd2c8b38c760e5fe23b6a65b050f030b46a38697aa82b5c1927fc9a20dff92cfabf1a03ca92099583a516c68 +DIST pyo3-macros-0.21.1.crate 7921 BLAKE2B 92e4323996bf6fce143d03597fb32caae16ba21591601712404d94a9bb15b37aec94b625bcc4bdb11d04876cad2a310bf41254e59285bda7719a9a27879a5e47 SHA512 4b0fdba474fec4ef4d143467425f1ad598be226a42c486adbf2d9c6dbdde8528a81222702962dd7ae63c79d3799048cb40a066d39cd538430d95b2135876ed45 +DIST pyo3-macros-backend-0.21.1.crate 57986 BLAKE2B 0ea13819dac723b1715a2bc3a7481a151cbcea477e7241d30791fb8d0459df375fd84229f5b2fd89e83ffae1f02f46fa20fc80bc86d5fea3fa878dd38092aebd SHA512 0529dded41726f51e51cb8f1967b8eb211814fa527fb7280e33a1e1f36e74b1b6b28e6a33041730f1edb8014239977f52095a2219cb606b519ab08e252884e2d +DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685 +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4 +DIST safetensors-0.4.3.gh.tar.gz 80509 BLAKE2B b864adea87cd9e5f22d32b54aa5b23ee01ded7cb962082d40c987dab9284949b7303727c7c1eb4af65b96671cb702e1a0d8f351108276e19d6cc69e02ab4a17b SHA512 278469d7bc8a4285519cf8020891d0f0e107d8124ad2c24686ca8a19ef2f210c49d9483c502bd5aa5d73940a775ac3eb5e3b90f62825dd7845c351bbdc8c82c3 +DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 +DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22 +DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 +DIST syn-2.0.59.crate 255393 BLAKE2B 872c6fdf55eef2f050c02fd054f383ede1793286e787f447d242a0436186e67151ce4f47a63c7ac8ab00a87d2fa9452ccc166a32cc7f1c1de2e0f2581c01d2ee SHA512 0e9e1529a0ce43afeec5e9847f8f4c86939ebb1fa0236d25aab73a9fc253b97ebc62f1c741e137a5a3173e2342b33d776a488210ccbdcd36177a1df31188afdc +DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 diff --git a/sci-libs/safetensors/safetensors-0.3.1-r2.ebuild b/sci-libs/safetensors/safetensors-0.4.3.ebuild index 20984e779dac..fd009b581914 100644 --- a/sci-libs/safetensors/safetensors-0.3.1-r2.ebuild +++ b/sci-libs/safetensors/safetensors-0.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,50 +6,50 @@ EAPI=8 DISTUTILS_EXT=1 CRATES=" - autocfg-1.1.0 - bitflags-1.3.2 - cfg-if-1.0.0 - indoc-1.0.9 - itoa-1.0.6 - libc-0.2.141 - lock_api-0.4.9 - memmap2-0.5.10 - memoffset-0.8.0 - once_cell-1.17.1 - parking_lot-0.12.1 - parking_lot_core-0.9.7 - proc-macro2-1.0.56 - pyo3-0.18.2 - pyo3-build-config-0.18.2 - pyo3-ffi-0.18.2 - pyo3-macros-0.18.2 - pyo3-macros-backend-0.18.2 - quote-1.0.26 - redox_syscall-0.2.16 - ryu-1.0.13 - scopeguard-1.1.0 - serde-1.0.160 - serde_derive-1.0.160 - serde_json-1.0.95 - smallvec-1.10.0 - syn-1.0.109 - syn-2.0.14 - target-lexicon-0.12.6 - unicode-ident-1.0.8 - unindent-0.1.11 - windows-sys-0.45.0 - windows-targets-0.42.2 - windows_aarch64_gnullvm-0.42.2 - windows_aarch64_msvc-0.42.2 - windows_i686_gnu-0.42.2 - windows_i686_msvc-0.42.2 - windows_x86_64_gnu-0.42.2 - windows_x86_64_gnullvm-0.42.2 - windows_x86_64_msvc-0.42.2 + autocfg@1.2.0 + bitflags@1.3.2 + cfg-if@1.0.0 + heck@0.4.1 + indoc@2.0.5 + itoa@1.0.11 + libc@0.2.153 + lock_api@0.4.11 + memmap2@0.9.4 + memoffset@0.9.1 + once_cell@1.19.0 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + portable-atomic@1.6.0 + proc-macro2@1.0.80 + pyo3-build-config@0.21.1 + pyo3-ffi@0.21.1 + pyo3-macros-backend@0.21.1 + pyo3-macros@0.21.1 + pyo3@0.21.1 + quote@1.0.36 + redox_syscall@0.4.1 + ryu@1.0.17 + scopeguard@1.2.0 + serde@1.0.197 + serde_derive@1.0.197 + serde_json@1.0.115 + smallvec@1.13.2 + syn@2.0.59 + target-lexicon@0.12.14 + unicode-ident@1.0.12 + unindent@0.2.3 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 " -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=maturin +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 cargo @@ -60,7 +60,10 @@ HOMEPAGE=" " SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz - $(cargo_crate_uris)" + ${CARGO_CRATE_URIS} +" + +S="${WORKDIR}"/${P}/bindings/python LICENSE="Apache-2.0" SLOT="0" @@ -69,8 +72,6 @@ KEYWORDS="~amd64" QA_FLAGS_IGNORED="usr/lib/.*" RESTRICT="test" #depends on single pkg ( pytorch ) -RDEPEND=" -" BDEPEND=" dev-python/setuptools-rust[${PYTHON_USEDEP}] test? ( @@ -80,8 +81,6 @@ BDEPEND=" distutils_enable_tests pytest -S="${WORKDIR}"/${P}/bindings/python - src_prepare() { distutils-r1_src_prepare rm tests/test_{tf,paddle,flax}_comparison.py || die diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest index 7d24374ac476..0f85a555538f 100644 --- a/sci-libs/scalapack/Manifest +++ b/sci-libs/scalapack/Manifest @@ -1,2 +1,3 @@ DIST scalapack-2.1.0-gcc10.patch 231026 BLAKE2B dacecca8307cd2bf7a20e6453fb17bc1f5a3f2926b6d8f3b89f7f8d34993368574804f0427f228de4525f2b2d73105de561588ba5a4d2fb609d5ed035f51ddc9 SHA512 a11057599639c167e907f8e4d45204174fd326e2ffb9e2d05533db23d8e2dd8cfc1d37f06d5502baa3d5714092fbf4638cf4d9fea84ca9d4fb150e21cc57861e DIST scalapack-2.1.0.tgz 5307441 BLAKE2B 4aea055fc3e437bce7108d1555e93c50109bcfe84354903fd711509eedbe686349fda4030e2fa70faf1a9e7e3255e46e48c32b96a2916af6812b8aebceb750c2 SHA512 0e77fb535ebcc28e2d97499ef4bd5161f76ca0ba4a3e308c26ce5071cfc4be4f3814262f3fb38f378ce0b5b31c0913432fea00a1e9e3f7717b853d1182bdf5b4 +DIST scalapack-2.2.0_p20240704.tar.gz 4776451 BLAKE2B 927f6af5196c350cb48bdc0e2a6af40e8212045150b976367852926decabafa13dd5a9b680ad4aa1fce051b5fe3987ee9c034042ffdbba7fde4175847313f96b SHA512 ddd37cd4291f00fbdd9c27d23849238d2f32807b0fba86301cb73a6463f1b4feaf97a5c492ab6ac1c01139f0d1d7d06af898ec90366e5812b6524538812a53ea diff --git a/sci-libs/scalapack/scalapack-2.1.0.ebuild b/sci-libs/scalapack/scalapack-2.1.0-r1.ebuild index e102c27d3b80..192ee312b7ca 100644 --- a/sci-libs/scalapack/scalapack-2.1.0.ebuild +++ b/sci-libs/scalapack/scalapack-2.1.0-r1.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=7 -inherit cmake fortran-2 toolchain-funcs +inherit cmake flag-o-matic fortran-2 toolchain-funcs GCC10_PATCH_HASH="bc6cad585362aa58e05186bb85d4b619080c45a9" @@ -23,7 +23,8 @@ RESTRICT="!test? ( test )" BDEPEND="virtual/pkgconfig" RDEPEND=" virtual/lapack - virtual/mpi" + virtual/mpi[fortran] +" DEPEND="${RDEPEND}" PATCHES=( "${DISTDIR}/${P}-gcc10.patch" ) @@ -39,6 +40,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862924 + # https://github.com/Reference-ScaLAPACK/scalapack/issues/95 + # + # Do not trust it for LTO either. + append-flags -fno-strict-aliasing + filter-lto + scalapack_configure() { local mycmakeargs=( -DUSE_OPTIMIZED_LAPACK_BLAS=ON diff --git a/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild b/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild new file mode 100644 index 000000000000..ce98c63fc31a --- /dev/null +++ b/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic fortran-2 toolchain-funcs + +# 2024/07/04 master branch containing 45 commits on top of 2.2.0 +COMMIT_HASH="0234af94c6578c53ac4c19f2925eb6e5c4ad6f0f" + +DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing" +HOMEPAGE="https://www.netlib.org/scalapack/" +SRC_URI="https://github.com/Reference-ScaLAPACK/${PN}//archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT_HASH}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + virtual/lapack + virtual/mpi[fortran] +" +DEPEND="${RDEPEND}" + +PATCHES=( ) + +src_prepare() { + cmake_src_prepare + + if use static-libs; then + mkdir "${WORKDIR}/${PN}_static" || die + fi + # mpi does not have a pc file + sed -i -e 's/mpi//' scalapack.pc.in || die +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862924 + # https://github.com/Reference-ScaLAPACK/scalapack/issues/95 + # + # Do not trust it for LTO either. + append-flags -fno-strict-aliasing + filter-lto + + scalapack_configure() { + local mycmakeargs=( + -DUSE_OPTIMIZED_LAPACK_BLAS=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + -DBUILD_TESTING=$(usex test) + $@ + ) + cmake_src_configure + } + + scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \ + -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON +} + +src_compile() { + cmake_src_compile + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_compile +} + +src_install() { + cmake_src_install + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_install + + insinto /usr/include/blacs + doins BLACS/SRC/*.h + + insinto /usr/include/scalapack + doins PBLAS/SRC/*.h +} diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest deleted file mode 100644 index 66003042df98..000000000000 --- a/sci-libs/scikit-image/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scikit-image-0.19.3.tar.gz 22232287 BLAKE2B 855584be0e69ac6e0dc7a17a68a1bca6843b471073e63d098b4933bc301eab5246d4cd2b444960de7fcd37012b66f7ba8cd6030ac485a7ab3aa1d36501aef0c7 SHA512 cda1699200e19155da13e313eb129771b7bb895913e552b959a3374267fe4f73c33d5e6e2fa2d49326903c901925797e46b9f05342a78c5332df1c266d37471a diff --git a/sci-libs/scikit-image/metadata.xml b/sci-libs/scikit-image/metadata.xml deleted file mode 100644 index 132691d57cb8..000000000000 --- a/sci-libs/scikit-image/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - This SciKit (toolkit for SciPy) includes useful image processing - algorithms for use with Python and NumPy. While SciPy’s ndimage - provides low-level manipulation, scikits.image centres around - algorithms and applications. - </longdescription> - <upstream> - <remote-id type="pypi">scikit-image</remote-id> - <remote-id type="github">scikit-image/scikit-image</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/scikit-image/scikit-image-0.19.3-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.19.3-r1.ebuild deleted file mode 100644 index 625518acb25e..000000000000 --- a/sci-libs/scikit-image/scikit-image-0.19.3-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 optfeature pypi - -DESCRIPTION="Image processing routines for SciPy" -HOMEPAGE=" - https://scikit-image.org/ - https://github.com/scikit-image/scikit-image/ - https://pypi.org/project/scikit-image/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -RESTRICT="test" - -RDEPEND=" - dev-python/imageio[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pywavelets[${PYTHON_USEDEP}] - dev-python/scipy[sparse(+),${PYTHON_USEDEP}] - dev-python/tifffile[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] -" - -DOCS=( CONTRIBUTORS.txt RELEASE.txt ) - -distutils_enable_tests pytest -# There is a programmable error in your configuration file: -#distutils_enable_sphinx doc/source dev-python/numpydoc dev-python/myst-parser - -python_test() { - # This needs to be run in the install dir - cd "${WORKDIR}/${P}-${EPYTHON//./_}/install/usr/lib/${EPYTHON}/site-packages/skimage" || die - distutils-r1_python_test -} - -pkg_postinst() { - optfeature "FITS io capability" dev-python/astropy - optfeature "GTK" dev-python/pygtk - optfeature "Parallel computation" dev-python/dask - optfeature "io plugin providing most standard formats" dev-python/imread - # not in portage yet - #optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk -} diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest deleted file mode 100644 index 9751f4cfb522..000000000000 --- a/sci-libs/scikit-learn/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scikit-learn-1.1.2.gh.tar.gz 7104556 BLAKE2B e67e1deddf5a1134b57a146e8271a406cb257ffc92c9719e90f5b9d98e711b68bc67e3367660ecaad61aaec1794bb8999b4dd00b7d56e21eca8fcb2ee72cc9aa SHA512 58789c1e607d7de3339fa3b8928553ca96cef93e8da8fd13612aa78e5ebde8e6a55e3bf7845f9a45b78ed77da6a219d08d2c26318b602f937e0e3debd239293e diff --git a/sci-libs/scikit-learn/metadata.xml b/sci-libs/scikit-learn/metadata.xml deleted file mode 100644 index 8700c73ecc29..000000000000 --- a/sci-libs/scikit-learn/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - sklearn is a python library for machine learning. It aims to - implement classic machine learning algorithms while remaining simple - and efficient. - </longdescription> - <upstream> - <remote-id type="pypi">scikit-learn</remote-id> - <remote-id type="github">scikit-learn/scikit-learn</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild b/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild deleted file mode 100644 index 8ec24c955368..000000000000 --- a/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 - -DESCRIPTION="Machine learning library for Python" -HOMEPAGE="https://scikit-learn.org/stable/" -SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos" -IUSE="examples" - -# Fatal Python error: Segmentation fault -RESTRICT="test" - -DEPEND=" - virtual/blas:= - virtual/cblas:= -" -RDEPEND=" - ${DEPEND} - dev-python/wheel[${PYTHON_USEDEP}] - dev-python/joblib[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/threadpoolctl[${PYTHON_USEDEP}] -" -# <cython-3: https://bugs.gentoo.org/911369 -BDEPEND=" - <dev-python/cython-3[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest -# For some reason this wants to use urllib to fetch things from the internet -# distutils_enable_sphinx doc \ -# dev-python/matplotlib \ -# dev-python/memory-profiler \ -# dev-python/numpydoc \ -# dev-python/pandas \ -# dev-python/pillow \ -# dev-python/seaborn \ -# dev-python/sphinx-gallery \ -# dev-python/sphinx-prompt \ -# sci-libs/scikit-image - -python_test() { - # This needs to be run in the install dir - cd "${WORKDIR}/${P}-${EPYTHON//./_}/install/usr/lib/${EPYTHON}/site-packages/sklearn" || die - distutils-r1_python_test -} - -python_install_all() { - find "${S}" -name \*LICENSE.txt -delete || die - distutils-r1_python_install_all - use examples && dodoc -r examples -} diff --git a/sci-libs/scikit-optimize/Manifest b/sci-libs/scikit-optimize/Manifest deleted file mode 100644 index 460f16a85cb6..000000000000 --- a/sci-libs/scikit-optimize/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scikit-optimize-0.9.0.tar.gz 275570 BLAKE2B ab481bf1cfc2b8c7cff213ae0ce2fa937de8f6269b491cf63ae115eea5c936c8a5c26b7fb339fa6cd2927c5105068635c008d6dc8b3f99b4b5d3abfed1a1c5a2 SHA512 a4c1bd589686dbbabcc5de38a4eb581c040cc2c3f83bc250ddcbe66314f03fc68b7b12d7679049da34c42445b446e1af3873f7ce90bec2a5361f0077ff3e9b74 diff --git a/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild b/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild deleted file mode 100644 index 644fcd2382dc..000000000000 --- a/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 pypi - -DESCRIPTION="Sequential model-based optimization library" -HOMEPAGE="https://scikit-optimize.github.io/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - >=dev-python/joblib-0.11[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/matplotlib-2.0.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.13.3[${PYTHON_USEDEP}] - >=dev-python/scipy-0.19.1[${PYTHON_USEDEP}] - >=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest -# No such file or directory: image/logo.png -#distutils_enable_sphinx doc \ -# dev-python/numpydoc \ -# dev-python/sphinx-issues \ -# dev-python/sphinx-gallery diff --git a/sci-libs/scotch/scotch-7.0.1-r1.ebuild b/sci-libs/scotch/scotch-7.0.1-r1.ebuild index 39afc59e85ee..2c9d51f1b1e0 100644 --- a/sci-libs/scotch/scotch-7.0.1-r1.ebuild +++ b/sci-libs/scotch/scotch-7.0.1-r1.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 @@ -66,7 +66,6 @@ src_prepare() { -e "s/-O3/${CFLAGS} -pthread/" \ -e "s/= ar$/= $(tc-getAR)/" \ -e "s/= ranlib$/= $(tc-getRANLIB)/" \ - -e "s/= ranlib$/= $(tc-getRANLIB)/" \ -e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \ src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die } diff --git a/sci-libs/seqeval/seqeval-1.2.2-r2.ebuild b/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild index 45724618a3f8..15490e06935d 100644 --- a/sci-libs/seqeval/seqeval-1.2.2-r2.ebuild +++ b/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Python framework for sequence labeling evaluation" @@ -21,7 +21,7 @@ KEYWORDS="~amd64" RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] " BDEPEND="test? ( dev-python/setuptools-scm[${PYTHON_USEDEP}] diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest index ff4f4c34ead8..f6d1ed67d993 100644 --- a/sci-libs/shapelib/Manifest +++ b/sci-libs/shapelib/Manifest @@ -1 +1,2 @@ DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721 +DIST shapelib-1.6.0.tar.gz 528882 BLAKE2B 02561b947ede10dcbb04ebe4d007b99ac2421ab56251a981e0bf4033b33bc5ae3a09a919c295a41797e7c295424d027a5f650848196f945918f7d6aeea177f89 SHA512 cc0b5841da5039c0467291994b9cd3aa99bebe70adf8db01719336a0eb2f0d7362395806f99228ba1f7ec68f0c5ecf9f7f5f1018093cf8dad9e06f0ae147c3fc diff --git a/sci-libs/shapelib/shapelib-1.6.0.ebuild b/sci-libs/shapelib/shapelib-1.6.0.ebuild new file mode 100644 index 000000000000..576d2163972f --- /dev/null +++ b/sci-libs/shapelib/shapelib-1.6.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library for manipulating ESRI Shapefiles" +HOMEPAGE="http://shapelib.maptools.org/" +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" +IUSE="doc static-libs" + +src_prepare() { + default + rm -f m4/* || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --includedir="${EPREFIX}"/usr/include/libshp + --prefix="${EPREFIX}"/usr + ) + econf "${myeconfargs[@]}" +} + +src_install() { + use doc && HTML_DOCS=( web/. ) + default + + if ! use static-libs; then + find "${ED}" \( -name '*.la' -o -name '*.a' \) -delete || die + fi +} diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest index f860b2cafed1..a2470626ee06 100644 --- a/sci-libs/silo/Manifest +++ b/sci-libs/silo/Manifest @@ -1 +1,2 @@ DIST silo-4.11-bsd.tgz 13298515 BLAKE2B fcf2e7912381e57d1a64644d3cee4dea50302c12704eaf0ee9e2569b7bc29b1d5c9df66878744ffc2cc04e16834fdf1cd4d677983af36005e4ecf0918c6283d5 SHA512 f642dd21dacffa147aea54d6f8669c704772d5640d6eb7eeff1d7e5e5d37ddbde250d78bad30e9478dcfec63a86863243d7a56cd9b692eaefdd7a89b34df35d0 +DIST silo-4.11.1-bsd.tar.xz 4581480 BLAKE2B 577bb9e367cae08496ec2062ce7b1fc6ebd04a8221bfb304585ea8b338502793a8ba43c14dbf8a7fd1f61b3c8a3a7886da1e9a7f9a1972d2a9cb69d5e36362e3 SHA512 e4ecfc434b43ea0bd2e3cda469f5e232b0bdfd25a44da04e77f2213ff20fd4158bc085d16b10de22d9a4be0ce822899e2b7f20c53b4d4bd941f92357a873c4a2 diff --git a/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch b/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch new file mode 100644 index 000000000000..1e729ee74e32 --- /dev/null +++ b/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch @@ -0,0 +1,45 @@ +https://github.com/LLNL/Silo/pull/371 + +From f0737787eb02093defc30de05a731ffe63c4c6f4 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 17 Mar 2024 07:35:36 +0000 +Subject: [PATCH] tests: add missing header for `difftime` +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With GCC 14, which makes implicit function declarations an error by default: +``` +TestReadMask.c: In function ‘ElapsedTime’: +TestReadMask.c:746:15: error: implicit declaration of function ‘difftime’ [-Wimplicit-function-declaration] + 746 | ms = (int)difftime(end_time.tv_sec, start_time.tv_sec); + | ^~~~~~~~ +TestReadMask.c:62:1: note: ‘difftime’ is defined in header ‘<time.h>’; this is probably fixable by adding ‘#include <time.h>’ + 61 | #include <std.c> + +++ |+#include <time.h> + 62 | +``` + +Fix the include guards and include <time.h> unconditionally (for difftime) and <string.h> +unconditionally too (for memcpy). + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/tests/TestReadMask.c ++++ b/tests/TestReadMask.c +@@ -51,13 +51,12 @@ product endorsement purposes. + */ + #include <stdio.h> + #include <silo.h> ++#include <string.h> + #ifndef WIN32 + #include <sys/time.h> +-#else +-#include <string.h> +-#include <time.h> + #endif + #include <sys/timeb.h> ++#include <time.h> + #include <std.c> + + /* To compile this program on hyper, here is the command: + diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml index ebaabb67af86..a60d491c0107 100644 --- a/sci-libs/silo/metadata.xml +++ b/sci-libs/silo/metadata.xml @@ -16,4 +16,7 @@ <email>cluster@gentoo.org</email> <name>Gentoo Cluster Project</name> </maintainer> + <upstream> + <remote-id type="github">LLNL/Silo</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/silo/silo-4.11-r1.ebuild b/sci-libs/silo/silo-4.11-r2.ebuild index bfae9dec06c8..6031d9f47ae3 100644 --- a/sci-libs/silo/silo-4.11-r1.ebuild +++ b/sci-libs/silo/silo-4.11-r2.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 @@ -22,7 +22,7 @@ RDEPEND=" dev-qt/qtwidgets:5 net-dialup/lrzsz virtual/szip - hdf5? ( sci-libs/hdf5 ) + hdf5? ( sci-libs/hdf5:= ) " DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5" diff --git a/sci-libs/silo/silo-4.11.1-r1.ebuild b/sci-libs/silo/silo-4.11.1-r1.ebuild new file mode 100644 index 000000000000..7028cae194f0 --- /dev/null +++ b/sci-libs/silo/silo-4.11.1-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic fortran-2 qmake-utils + +DESCRIPTION="A mesh and field I/O library and scientific database" +HOMEPAGE="https://software.llnl.gov/Silo/" +SRC_URI="https://github.com/LLNL/Silo/releases/download/${PV}/${P}-bsd.tar.xz" +S="${WORKDIR}/${P}-bsd" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="browser +hdf5 +silex" + +# see bugs 656432 and 741741 +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + net-dialup/lrzsz + virtual/szip + hdf5? ( sci-libs/hdf5:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}"/${PN}-4.11-test-disable-largefile.patch + "${FILESDIR}"/${PN}-4.11-tests.patch + "${FILESDIR}"/${PN}-4.11-testsuite-python-write.patch + "${FILESDIR}"/${PN}-4.11-widgets.patch + "${FILESDIR}"/${PN}-4.11-qtbindir.patch + "${FILESDIR}"/${PN}-4.11.1-gcc14-tests.patch +) + +src_configure() { + # bug #862927 and https://github.com/LLNL/Silo/issues/248 + append-flags -fno-strict-aliasing + filter-lto + + # add fflags for fixing test bug on matf77.f + # see https://github.com/LLNL/Silo/issues/234 + append-fflags $(test-flags-F77 -fallow-argument-mismatch) + + CONFIG_SHELL="${BROOT}"/bin/bash \ + QMAKE=$(qt5_get_bindir)/qmake \ + QT_BIN_DIR=$(qt5_get_bindir) \ + econf \ + --enable-install-lite-headers \ + --enable-shared \ + $(use_enable silex silex ) \ + $(use_enable browser browser ) \ + $(use_with hdf5 hdf5 "${EPREFIX}"/usr/include,"${EPREFIX}"/usr/$(get_libdir) ) +} + +src_test() { + # see https://github.com/LLNL/Silo/issues/236 + # some tests are skipped by default so we are gonna drop them directly + emake ATARGS="1-34 36-44 50-51 66-76 78-81" -C tests check +} diff --git a/sci-libs/spr/spr-3.3.2.ebuild b/sci-libs/spr/spr-3.3.2-r2.ebuild index 3b639a0e109b..519166e048fa 100644 --- a/sci-libs/spr/spr-3.3.2.ebuild +++ b/sci-libs/spr/spr-3.3.2-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="Statistical analysis and machine learning library" HOMEPAGE="https://statpatrec.sourceforge.net/" -SRC_URI="mirror://sourceforge/statpatrec/${P^^}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/statpatrec/${P^^}.tar.gz" +S="${WORKDIR}/${P^^}" LICENSE="GPL-2" SLOT="0" @@ -18,7 +19,6 @@ IUSE="root static-libs" DEPEND="root? ( sci-physics/root )" RDEPEND="${DEPEND}" -S=${WORKDIR}/${P^^} PATCHES=( "${FILESDIR}"/${P}-autotools.patch "${FILESDIR}"/${P}-gcc46.patch @@ -37,3 +37,10 @@ src_configure() { $(use_enable static-libs static) \ $(use_with root) } + +src_install() { + default + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi +} diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest index f84b5d7e357c..c75842ef8603 100644 --- a/sci-libs/stellarsolver/Manifest +++ b/sci-libs/stellarsolver/Manifest @@ -1,2 +1,2 @@ -DIST stellarsolver-2.4.tar.gz 23402982 BLAKE2B 6eb9dafdf2a209afba10c09f7e7c0f6832a4399cd67c6ed3e4eb87ba98f2163ee8cbb342490314246c77d13581d1c0547817b6ab3c292685f3c496fa305f320d SHA512 f397ddafd3bb4774ac89e95673f67c4fef40ea0be842555608d95978ee26949b21b16cc984e00e936eda2ceca316f604b784b44844cf37ad1e44a5ef8d7e75f8 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 new file mode 100644 index 000000000000..eaae908db774 --- /dev/null +++ b/sci-libs/stellarsolver/files/stellarsolver-2.5-compiler-warning.patch @@ -0,0 +1,26 @@ +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 new file mode 100644 index 000000000000..72acd2adc9c6 --- /dev/null +++ b/sci-libs/stellarsolver/files/stellarsolver-2.5-qsort-warning.patch @@ -0,0 +1,291 @@ +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.4.ebuild b/sci-libs/stellarsolver/stellarsolver-2.5-r1.ebuild index 1473c730ee95..c287cbf520bb 100644 --- a/sci-libs/stellarsolver/stellarsolver-2.4.ebuild +++ b/sci-libs/stellarsolver/stellarsolver-2.5-r1.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 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver" HOMEPAGE="https://github.com/rlancaste/stellarsolver" @@ -25,3 +25,13 @@ RDEPEND=" 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.5.ebuild b/sci-libs/stellarsolver/stellarsolver-2.6.ebuild index 0f99bc4fa47b..e257a6f5826b 100644 --- a/sci-libs/stellarsolver/stellarsolver-2.5.ebuild +++ b/sci-libs/stellarsolver/stellarsolver-2.6.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 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver" HOMEPAGE="https://github.com/rlancaste/stellarsolver" @@ -25,3 +25,15 @@ RDEPEND=" sci-astronomy/wcslib:= " DEPEND="${RDEPEND}" + +src_configure() { + # bug #862930 + filter-lto + + local mycmakeargs=( + -DUSE_QT5=ON # future TODO: check if Qt6 can be enabled safely + -DBUILD_CLI=OFF # nothing is installed (yet?) + ) + + cmake_src_configure +} diff --git a/sci-libs/suitesparse/metadata.xml b/sci-libs/suitesparse/metadata.xml index 998b507d95c4..0982900cf6db 100644 --- a/sci-libs/suitesparse/metadata.xml +++ b/sci-libs/suitesparse/metadata.xml @@ -29,9 +29,6 @@ * SSMULT: sparse matrix times sparse matrix </longdescription> <use> - <flag name="cuda"> - Enable nvidia cuda toolkit for speeding up computations - </flag> <flag name="partition"> Enable graph partitioning and graph-partition-based orderings through <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg> diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest index dc635448d6f7..b8b9223f233c 100644 --- a/sci-libs/sundials/Manifest +++ b/sci-libs/sundials/Manifest @@ -1,3 +1,4 @@ DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b DIST sundials-6.5.0.tar.gz 89142911 BLAKE2B 3605686f813928fe55e5aafd409c478cf782411b5d2e510121fe15cc15eae84a5d0fe7470c7c0c976fbe11e7f0fd0e9fb449ae45b4c34aa077ac1acb25255cf5 SHA512 30ad3d3f998df6a6381a14b0c8fe247a5507e386ed1b9b55afae87b976f15026d7b4e8609c3cf8423ad79e1b55bade40dc66b274dc3422e040cb12fec981d502 +DIST sundials-7.0.0.tar.gz 91813927 BLAKE2B 5fab34e674473078812e9a7be43d19ac2595adf7d6f7b71f90375546578eaf42f7e45d1d6297dbedbbc454fb84f741c4e5a4e43766dfc2774ac5dadfcb3295d7 SHA512 4f818124985d6083c6c1a9d34ae2f7d8e6f9a5ca1c1c01e8d00d2b516fdd34eb634c9e601c8a0d1515f198a70d3c1f11118da99a48b4d067464312b02d8265a9 diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild index 517e32342ded..53665c56e14f 100644 --- a/sci-libs/sundials/sundials-5.8.0.ebuild +++ b/sci-libs/sundials/sundials-5.8.0.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 @@ -57,6 +57,12 @@ src_prepare() { } src_configure() { + # undefined reference to `psolve' + # undefined reference to `psetup' + # https://bugs.gentoo.org/862933 + # https://github.com/LLNL/sundials/issues/97 + filter-lto + mycmakeargs+=( -DBUILD_FORTRAN77_INTERFACE=$(usex fortran) -DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran) diff --git a/sci-libs/sundials/sundials-6.2.0.ebuild b/sci-libs/sundials/sundials-6.2.0.ebuild index 6c7c190fc0c7..d7351c6df946 100644 --- a/sci-libs/sundials/sundials-6.2.0.ebuild +++ b/sci-libs/sundials/sundials-6.2.0.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 @@ -58,6 +58,12 @@ src_prepare() { } src_configure() { + # undefined reference to `psolve' + # undefined reference to `psetup' + # https://bugs.gentoo.org/862933 + # https://github.com/LLNL/sundials/issues/97 + filter-lto + mycmakeargs+=( -DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran) -DBUILD_SHARED_LIBS=ON diff --git a/sci-libs/sundials/sundials-6.5.0.ebuild b/sci-libs/sundials/sundials-6.5.0.ebuild index 3c5b1fe76979..d98b371af267 100644 --- a/sci-libs/sundials/sundials-6.5.0.ebuild +++ b/sci-libs/sundials/sundials-6.5.0.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 @@ -58,6 +58,12 @@ src_prepare() { } src_configure() { + # undefined reference to `psolve' + # undefined reference to `psetup' + # https://bugs.gentoo.org/862933 + # https://github.com/LLNL/sundials/issues/97 + filter-lto + mycmakeargs+=( -DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran) -DBUILD_SHARED_LIBS=ON diff --git a/sci-libs/sundials/sundials-7.0.0.ebuild b/sci-libs/sundials/sundials-7.0.0.ebuild new file mode 100644 index 000000000000..e3baf22eb43e --- /dev/null +++ b/sci-libs/sundials/sundials-7.0.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR="emake" +FORTRAN_NEEDED=fortran +FORTRAN_STANDARD="77 90 2003" +# if FFLAGS and FCFLAGS are set then should be equal + +inherit cmake flag-o-matic fortran-2 toolchain-funcs + +DESCRIPTION="Suite of nonlinear solvers" +HOMEPAGE="https://computing.llnl.gov/projects/sundials" +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" +IUSE="doc fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads" +REQUIRED_USE=" + fortran? ( static-libs ) + hypre? ( mpi ) +" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + lapack? ( virtual/lapack ) + mpi? ( + sci-libs/hypre:=[fortran?,mpi?] + virtual/mpi[fortran?] + ) + sparse? ( sci-libs/klu ) + superlumt? ( sci-libs/superlu_mt:=[int64=] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.8.0-fix-license-install-path.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + # bug #707240 + append-cflags -fcommon + use threads && append-ldflags -pthread + + cmake_src_prepare +} + +src_configure() { + # undefined reference to `psolve' + # undefined reference to `psetup' + # https://bugs.gentoo.org/862933 + # https://github.com/LLNL/sundials/issues/97 + filter-lto + + mycmakeargs+=( + -DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran) + -DBUILD_SHARED_LIBS=ON + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DENABLE_HYPRE=$(usex hypre) + -DENABLE_KLU=$(usex sparse) + -DENABLE_LAPACK=$(usex lapack) + -DENABLE_MPI=$(usex mpi) + -DENABLE_OPENMP=$(usex openmp) + -DENABLE_PTHREAD=$(usex threads) + -DENABLE_SUPERLUMT=$(usex superlumt) + -DEXAMPLES_INSTALL=ON + -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples" + -DSUNDIALS_INDEX_SIZE="$(usex int64 64 32)" + -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt" + -DSUPERLUMT_LIBRARY="-lsuperlu_mt" + ) + + if use fortran; then + mycmakeargs+=( + -DFortran_INSTALL_MODDIR="${EPREFIX}/usr/$(get_libdir)/fortran" + ) + fi + + if use hypre; then + mycmakeargs+=( + -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre" + -DHYPRE_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libHYPRE.so" + ) + fi + + if use sparse; then + mycmakeargs+=( + -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + use doc && dodoc doc/*/*.pdf +} diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest index d6758bec7bc4..94cdf67fc5f3 100644 --- a/sci-libs/symengine/Manifest +++ b/sci-libs/symengine/Manifest @@ -1,2 +1,2 @@ -DIST symengine-0.10.1.tar.gz 898206 BLAKE2B 88182a7facaf0d9ac90de8acaf549a3fd3cb65f0ae12e0ba3d9a1ae477d193b312cebfca99e626815789d8746822f0d1e256db6836a1ce265f65951880f486f3 SHA512 e73f62a87d20b676cac66ce82ac93308b688ed2ac18ebdb6884bae1ae66868e1033e33908e797f86a1906f91b975e8607a02e8932db8550a677f6b41373b7934 -DIST symengine-0.9.0.tar.gz 878574 BLAKE2B 32c37ca6575b3f7e37184c80c2df74ebf7bb7846537e951be6c888994b8dc049c1ed2a6f51da1c1cfb038e0a47393b18acff60cfef665c5a5e714beb9b0ecb12 SHA512 dceca49ddb6e2ac7c4f8ecb73ce19824cbaa3eff41ad0f50008e403498121184b4e9dc660628dbd8e4db979f8c16b83a709a40540f7834954ab01f9854e12caa +DIST symengine-0.11.1.tar.gz 898181 BLAKE2B ef14e09ceb7e9783711ca7f9f06a59362c40222e7f85de5545be834ecd79bbf41fcd34141bb3a63c106ee45067dd0b957377f937097183ffd5b93c6943976571 SHA512 076aac35428589c5b3524a46bd939a3a3a7da44b1c866b5f71487678b27b6e48b4da034029f1630881d7713a9252e905411a04b8016c9ec56a608b6de23365ac +DIST symengine-0.12.0.tar.gz 898768 BLAKE2B 81bca3f59e864d2e37598a058cb4db97b1f9c8536ee841c10df6f01c6322fa744281ecdeb338e5bf33bf599ead66adcaaa724650535df9b3d4bd7f07e22a3ad2 SHA512 fbc73a75299c19155a09f1854888a5050150aaad5bc3df683d43e8036af8005f8152a36ae79029e00bc8422c3edd7252baaf3a0da6a21d1d754d80a44c5c68bf diff --git a/sci-libs/symengine/files/symengine-0.11.1-flint-3.patch b/sci-libs/symengine/files/symengine-0.11.1-flint-3.patch new file mode 100644 index 000000000000..662a4bc1bdc1 --- /dev/null +++ b/sci-libs/symengine/files/symengine-0.11.1-flint-3.patch @@ -0,0 +1,41 @@ +From 1ef98559d75b4fa5b87dad2daff0d12e7857ac8d Mon Sep 17 00:00:00 2001 +From: Isuru Fernando <isuruf@gmail.com> +Date: Mon, 30 Oct 2023 20:25:05 -0500 +Subject: [PATCH] Fix flint headers and replace use of deprecated funcs in + flint2/3 + +--- + symengine/flint_wrapper.h | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/symengine/flint_wrapper.h b/symengine/flint_wrapper.h +index 21cfcef056..ade419088f 100644 +--- a/symengine/flint_wrapper.h ++++ b/symengine/flint_wrapper.h +@@ -6,6 +6,8 @@ + + #include <flint/fmpz.h> + #include <flint/fmpq.h> ++#include <flint/fmpz_poly.h> ++#include <flint/fmpz_poly_factor.h> + #include <flint/fmpq_poly.h> + + namespace SymEngine +@@ -710,13 +712,15 @@ class fmpq_poly_wrapper + } + fmpq_poly_wrapper(const mpz_t z) + { ++ fmpz_wrapper fz(z); + fmpq_poly_init(poly); +- fmpq_poly_set_mpz(poly, z); ++ fmpq_poly_set_fmpz(poly, fz.get_fmpz_t()); + } + fmpq_poly_wrapper(const mpq_t q) + { ++ fmpq_wrapper fq(q); + fmpq_poly_init(poly); +- fmpq_poly_set_mpq(poly, q); ++ fmpq_poly_set_fmpq(poly, fq.get_fmpq_t()); + } + fmpq_poly_wrapper(const fmpq_wrapper &q) + { diff --git a/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch b/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch deleted file mode 100644 index 0fa049dbf218..000000000000 --- a/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 6ad9620ffc578abdb920b84ea5e393c726389ac0 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Wed, 8 Jun 2022 06:02:25 +0100 -Subject: [PATCH] cmake: fix pthread detection - -The homebrew FindPTHREAD.cmake module was hardcoding the path to libpthread -in the installed CMake config file which broke consumers when upgrading from -< glibc-2.34 (e.g. glibc-2.33 -> glibc-2.34). - -CMake provides FindThreads which does the job fine for us. Tested with both -glibc-2.33 (with a previously bad generated file, and then fixed) and glibc-2.35. - -This should be fine on musl and friends too. This brings symengine in line -with most CMake packages. - -Bug: https://bugs.gentoo.org/849803 -Fixes: https://github.com/symengine/symengine/issues/1910 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -335,11 +335,10 @@ if (WITH_PIRANHA) - endif() - - if (WITH_PTHREAD) -- find_package(PTHREAD REQUIRED) -- include_directories(SYSTEM ${PTHREAD_INCLUDE_DIRS}) -- set(LIBS ${LIBS} ${PTHREAD_TARGETS}) -+ find_package(Threads) -+ set(THREADS_PREFER_PTHREAD_FLAG ON) -+ set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) - set(HAVE_SYMENGINE_PTHREAD yes) -- set(PKGS ${PKGS} "PTHREAD") - endif() - - if (WITH_MPFR) -@@ -761,10 +760,6 @@ if (WITH_BOOST) - endif() - - message("WITH_PTHREAD: ${WITH_PTHREAD}") --if (WITH_PTHREAD) -- message("PTHREAD_INCLUDE_DIRS: ${PTHREAD_INCLUDE_DIRS}") -- message("PTHREAD_LIBRARIES: ${PTHREAD_LIBRARIES}") --endif() - - message("WITH_MPC: ${WITH_MPC}") - if (WITH_MPC) ---- a/cmake/FindPTHREAD.cmake -+++ /dev/null -@@ -1,14 +0,0 @@ --include(LibFindMacros) -- --libfind_include(pthread.h pthread) --libfind_library(pthread pthread) -- --set(PTHREAD_LIBRARIES ${PTHREAD_LIBRARY}) --set(PTHREAD_INCLUDE_DIRS ${PTHREAD_INCLUDE_DIR}) --set(PTHREAD_TARGETS pthread) -- --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(PTHREAD DEFAULT_MSG PTHREAD_LIBRARIES -- PTHREAD_INCLUDE_DIRS) -- --mark_as_advanced(PTHREAD_INCLUDE_DIR PTHEARD_LIBRARY) - diff --git a/sci-libs/symengine/symengine-0.10.1.ebuild b/sci-libs/symengine/symengine-0.11.1.ebuild index 5d4958377b95..9e1a6ceba0d5 100644 --- a/sci-libs/symengine/symengine-0.10.1.ebuild +++ b/sci-libs/symengine/symengine-0.11.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 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" # BUILD_FOR_DISTRIBUTION enables threads by default so do it here IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads" RESTRICT="!test? ( test )" @@ -33,11 +33,13 @@ DEPEND=" ${RDEPEND} dev-libs/cereal " -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" PATCHES=( "${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch "${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch + # https://github.com/symengine/symengine/pull/1985 + "${FILESDIR}"/${PN}-0.11.1-flint-3.patch ) pkg_pretend() { diff --git a/sci-libs/symengine/symengine-0.9.0-r3.ebuild b/sci-libs/symengine/symengine-0.12.0.ebuild index 4613603523e6..a9b7f631466a 100644 --- a/sci-libs/symengine/symengine-0.9.0-r3.ebuild +++ b/sci-libs/symengine/symengine-0.12.0.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 -LLVM_MAX_SLOT=15 +LLVM_MAX_SLOT=18 inherit cmake llvm toolchain-funcs DESCRIPTION="Fast symbolic manipulation library, written in C++" @@ -12,28 +12,31 @@ SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" # BUILD_FOR_DISTRIBUTION enables threads by default so do it here -IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads" +IUSE="benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/gmp:= +RDEPEND=" + dev-libs/gmp:= sys-libs/binutils-libs:= - arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) + mpfr? ( dev-libs/mpfr:= ) llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) - tcmalloc? ( dev-util/google-perftools )" -DEPEND="${RDEPEND} - dev-libs/cereal" -BDEPEND="doc? ( app-doc/doxygen[dot] )" + tcmalloc? ( dev-util/google-perftools ) +" +DEPEND=" + ${RDEPEND} + dev-libs/cereal +" +BDEPEND="doc? ( app-text/doxygen[dot] )" PATCHES=( "${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch "${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch - "${FILESDIR}"/${PN}-0.9.0-pthread-cmake.patch ) pkg_pretend() { @@ -61,7 +64,7 @@ src_configure() { # not in portage yet: piranha local int_class - if use arb || use flint; then + if use flint; then int_class=flint elif use mpfr; then int_class=gmpxx @@ -78,7 +81,6 @@ src_configure() { -DBUILD_BENCHMARKS=$(usex benchmarks) -DBUILD_DOXYGEN=$(usex doc) -DBUILD_TESTS=$(usex test) - -DWITH_ARB=$(usex arb) -DWITH_BFD=$(usex debug) -DWITH_SYMENGINE_ASSERT=$(usex debug) -DWITH_SYMENGINE_THREAD_SAFE=$(usex threads) @@ -93,7 +95,5 @@ src_configure() { -DWITH_SYSTEM_CEREAL=ON ) - use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${ESYSROOT}"/usr/include ) - cmake_src_configure } diff --git a/sci-libs/ta-lib/ta-lib-0.4.0-r1.ebuild b/sci-libs/ta-lib/ta-lib-0.4.0-r1.ebuild index 600814664e17..2b4fcc3ffd2e 100644 --- a/sci-libs/ta-lib/ta-lib-0.4.0-r1.ebuild +++ b/sci-libs/ta-lib/ta-lib-0.4.0-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Technical Analysis Library for analyzing financial markets trends" HOMEPAGE="https://www.ta-lib.org/" -SRC_URI="mirror://sourceforge/ta-lib/${P}-src.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ta-lib/${P}-src.tar.gz" LICENSE="BSD" SLOT="0" @@ -26,6 +26,15 @@ src_prepare() { eautoreconf } +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862936 + # Upstream is sourceforge plus has not been active since 2013. No bug filed. + filter-lto + + default +} + src_test() { src/tools/ta_regtest/ta_regtest || die } diff --git a/sci-libs/ta-lib/ta-lib-0.4.0.ebuild b/sci-libs/ta-lib/ta-lib-0.4.0.ebuild index 508a8a64f8d4..7efdaabff8d6 100644 --- a/sci-libs/ta-lib/ta-lib-0.4.0.ebuild +++ b/sci-libs/ta-lib/ta-lib-0.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Technical Analysis Library for analyzing financial markets trends" HOMEPAGE="https://www.ta-lib.org/" -SRC_URI="mirror://sourceforge/ta-lib/${P}-src.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ta-lib/${P}-src.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest deleted file mode 100644 index 28ee49beed06..000000000000 --- a/sci-libs/tensorflow-estimator/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f -DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c -DIST tensorflow-estimator-2.11.0-rc0.tar.gz 655514 BLAKE2B cc73f282a32f657bf507d948210aa981f0867c4898574c61fb5654204fa573ac7bdef16635d202ed3d202ccc9c8915f5613e4149ce6839d59281a38cfd6953f7 SHA512 c473a6db62a0a55f25f8fd5fd7ffb2f2a473261c5a7b3217bd1d8a21a02ab4871793ea57917c6eb9dc9012bd030faf8030702caf3f764983ce526d201866204f -DIST tensorflow-estimator-2.12.0.tar.gz 656763 BLAKE2B a67c81487b7765f3195f7567b66455a4be390bff8d6dec751d054a26b654b1aac96982f6fa55d0488a8e6414e7d4b58d1ae59680a1c694615f82718c77478872 SHA512 d86bfde67c97988beeb5abc8042c1847c6d0081d54e21e35424d463895e95a5d0adc74d7d2bb006a617748da3b9a8bbb8979d6a842f024ab3a4d08a2e806147b diff --git a/sci-libs/tensorflow-estimator/files/0001-Update-setup.py-for-2.11.0-final-release.patch b/sci-libs/tensorflow-estimator/files/0001-Update-setup.py-for-2.11.0-final-release.patch deleted file mode 100644 index 3a22052e9845..000000000000 --- a/sci-libs/tensorflow-estimator/files/0001-Update-setup.py-for-2.11.0-final-release.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bfc826cf6ab1a65c3cf2e28cf9c6300ced56e9f8 Mon Sep 17 00:00:00 2001 -From: Vinila S <106367904+vinila21@users.noreply.github.com> -Date: Fri, 11 Nov 2022 16:55:11 -0800 -Subject: [PATCH] Update setup.py for 2.11.0 final release. - ---- - tensorflow_estimator/tools/pip_package/setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tensorflow_estimator/tools/pip_package/setup.py b/tensorflow_estimator/tools/pip_package/setup.py -index b49eff2..fe35b4b 100644 ---- a/tensorflow_estimator/tools/pip_package/setup.py -+++ b/tensorflow_estimator/tools/pip_package/setup.py -@@ -30,7 +30,7 @@ DOCLINES = __doc__.split('\n') - # This version string is semver compatible, but incompatible with pip. - # For pip, we will remove all '-' characters from this string, and use the - # result for pip. --_VERSION = '2.11.0-rc0' -+_VERSION = '2.11.0' - - REQUIRED_PACKAGES = [ - # We depend on TensorFlow's declared pip dependencies. --- -2.37.4 - diff --git a/sci-libs/tensorflow-estimator/metadata.xml b/sci-libs/tensorflow-estimator/metadata.xml deleted file mode 100644 index db4dc8444e40..000000000000 --- a/sci-libs/tensorflow-estimator/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <longdescription lang="en"> - TensorFlow Estimator is a high-level TensorFlow API that greatly - simplifies machine learning programming. Estimators encapsulate - training, evaluation, prediction, and exporting for your model. - </longdescription> - <upstream> - <remote-id type="github">tensorflow/estimator</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.11.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.11.0.ebuild deleted file mode 100644 index 963a5d519961..000000000000 --- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.11.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -MY_PN="estimator" -MY_PV=${PV}-rc0 -MY_P=${MY_PN}-${MY_PV} - -inherit bazel distutils-r1 - -DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -bazel_external_uris=" - https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - -SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}-rc0.tar.gz - ${bazel_external_uris}" - -RDEPEND=" - sci-libs/tensorflow[python,${PYTHON_USEDEP}] - sci-libs/keras[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/unzip - dev-java/java-config - >=dev-util/bazel-5.1.1" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CONTRIBUTING.md README.md ) -PATCHES=( - # Tag is missing for v2.11.0, apply version update manually - "${FILESDIR}/0001-Update-setup.py-for-2.11.0-final-release.patch" -) - -src_unpack() { - unpack "${P}-rc0.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - bazel_setup_bazelrc - default - python_copy_sources -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - - ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package - ebazel shutdown - - local srcdir="${T}/src-${EPYTHON/./_}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die - - popd >/dev/null || die -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) - distutils-r1_src_compile -} - -python_install() { - pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die - esetup.py install - python_optimize - popd >/dev/null || die -} diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.12.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.12.0.ebuild deleted file mode 100644 index fbe71a0d54d6..000000000000 --- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.12.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 python3_11 ) -MY_PN="estimator" -MY_PV=${PV/_rc/-rc} -MY_P=${MY_PN}-${MY_PV} - -inherit bazel distutils-r1 - -DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -bazel_external_uris=" - https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - -SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - ${bazel_external_uris}" - -RDEPEND=" - sci-libs/tensorflow[python,${PYTHON_USEDEP}] - sci-libs/keras[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/unzip - dev-java/java-config - >=dev-util/bazel-5.3.0" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CONTRIBUTING.md README.md ) - -src_unpack() { - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - bazel_setup_bazelrc - default - python_copy_sources -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - - ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package - ebazel shutdown - - local srcdir="${T}/src-${EPYTHON/./_}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die - - popd >/dev/null || die -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) - distutils-r1_src_compile -} - -python_install() { - pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die - esetup.py install - python_optimize - popd >/dev/null || die -} diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest deleted file mode 100644 index 40b0ce6a48ca..000000000000 --- a/sci-libs/tensorflow/Manifest +++ /dev/null @@ -1,58 +0,0 @@ -DIST ARM_NEON_2_x86_SSE-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz 103972 BLAKE2B 77d843aae7d471f7bb916caa40f66ec66322c11bab18ac338360c1a1faeb51a54fb394a35bee7ad3095ba34835e51441416d0c09ecc627769d9181678494eada SHA512 1d9a4192baf05be8cd36ffa55b9bf97e09ab6f714b303bd2ca7b16bbffbb661475c11b130437cafe234fce66d046d7b041f7daf9c25263c5921584412a5c1c12 -DIST FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip 91462 BLAKE2B dc40d6129c009fc28b40d58b81b89e96a2deeeda3ea19c680b66073f02f955cc5dfc379d7843ec8aeed9fedeae6a70594b45752014526deee5c6226ec4b952e9 SHA512 15ae434977209a938739691eb91150556bac75a4a5449a9b4f135424f42beabd67ede4cf12c3a5594dea5028cc4aadaf989d0b42c2bb6f741db55ebd34717e24 -DIST FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.zip 16646 BLAKE2B 8f6ca6feee16cb57d9b4504e7615703c2c7ea86fa8ea3f814668478cc13b8cb3cb1429200359be5521ca11f77e1c3d575b2222d123d3ac03586faab88a131ac2 SHA512 6b4830a56137e226d51ba8166fe1a31c51256f1666cc0a683abfb154fbe313d415ce15e362756865a1dd91510cf581c619604b29e8a5288c328c85da57d53308 -DIST OouraFFT-v1.0.tar.gz 110531 BLAKE2B de0e280407e21118e2bc6ca93a7caf3c4a49d0a13eda018b1497f98851af73dda4cef56460dba310336c7ed958e34feef4784ca2575a13287dec2c1ac9a5af6d SHA512 89c6e8fd57abf26351b3efb792008a1bbe62d404a4225dcae8aa666b3782a421be071bdc9760ebb0c95b5336ee5ea517d2fa43ab915045f7cf6fd76e73578079 -DIST XNNPACK-659147817805d17c7be2d60bd7bbca7e780f9c82.zip 20341886 BLAKE2B 9aa37b3622e62e554b9021fca88f9f8d274989d4799d942c27a6d13ebb59409b130423a23f60f4e42042b8894457d8d691e17e3f21555562c8e9d1f97bb1ae13 SHA512 13c87064ec57adb29320c4d061ce0ae6cdb42b5e7584fbb758e3703f7f0a96d47e618b7ef584bf10d5b11d3658c43c6822e3b13748b6e659a5820ef534652ebf -DIST XNNPACK-e8f74a9763aa36559980a0c2f37f587794995622.zip 18756888 BLAKE2B 0a1787166e8bbfda4aa6010075d92573112a21f3f9d3b1c13bc931fae6fa4cafb71685e4c57e86d7a662912bb6431c2d39a24378bf82361b50e5855d1b62f524 SHA512 a6802f0995742af0ca82de010cbd42da230b36cc884612d4ba2de20ba0ca56da6a11209bfb01ee1a5ddc31dc891a69438fa4836ec9d62d56e32c6aa144c6e7aa -DIST apple_support.1.1.0.tar.gz 27105 BLAKE2B 6982ed0188760caeb6951dd28d211449d37a3192fa75e22f5ea86b599a5a92bf8efcfe5a549146533b725aa0fd41584c4d12db3fab41ffbcbca60f657e9590f5 SHA512 db291209ab9a54238b244e02abbca749a695ca3b9b9dc2e207227d3ea32f13144f3236fa921df4c6ba954850635db56584582d8916bdf4c90a2adc55dc90cd3a -DIST bazel-skylib-1.3.0.tar.gz 36103 BLAKE2B a58142b9d2a5da9f137705105aa735c8489519989ca7e633968114309f23074a56cd03b5fed70e284da63751d666904c2573940ad9a0feb2be689d695f0f07ae SHA512 ab3a0b465ebbfe07c139b92f1e8b2c0bcede66d6366d184891e3c0ccd6619164bc299777e7d7236cb463834b98426f6fb6890409e0ce94b75446dbd85854944f -DIST bazel-toolchains-8c717f8258cd5f6c7a45b97d974292755852b658.tar.gz 80728 BLAKE2B 340a295d8998d01eba6bdd3a97efae869c5dde93dee9bd9266af8ad92a00a5c84cafbc6dd1f5d20f78dfdaa59f7585cefc7af4b87df712489db7f76bfa1d5210 SHA512 cf391a756d2520c65423f991bd0afdf3aed1785b91481c55c5d3182e54b137fc7922fd179e758af2868e11f9f10ce9903409015a2fb0f18e67d14a3b073c6d72 -DIST bazelbuild-platforms-0.0.5.tar.gz 5399 BLAKE2B d53aa2dbbd526d15aef24914053a5fa7c7402e1201d94a603c8148281a933292e4815f01aae7f7f166d5325f40b14d2810d6d8e03e0780329c25299c3d8ebffe SHA512 332d5954c349a7d0b801d6338bc42193a730e8ba6c75866ccef17c5053f8f29e1d185cd33a73fe5758e96e57de0c2631974f45d18bdd58c825f9a5fc231ad8b6 -DIST bazelbuild-platforms-0.0.6.tar.gz 5537 BLAKE2B 0712516f5ea0683054c1127a173a6af933278130c36eb0bf96cbc7a30050f551608bc2ea5451aec2d4b91dc117e16b21a78a1cc289064ac4ffd2adfb698208fe SHA512 372a722ebe04a1f13c348d37e3994450647762f3366bb6982ed6c6b4703684bc7960643cab2f6b51d5112086c7864f4d6b1c586de275c2353dbf1c9ed1a3e5d0 -DIST bazelbuild-rules_android-v0.1.1.zip 14654 BLAKE2B 1cfd5af08c6eab9602883f62d85ef1b9eb02383f73dcc31ae84af880c9ba228ae349ac6b017c550286e248347193e2c56eba30c86174432429809447dd940ed2 SHA512 80628a5e2ca9806ab031cd0c2f2999bd67f5621a83e8300a51fe6233373bdaf7c90ff8fa9551c81e60fc904c4d7b24554327ac8ed2ee101e92c4ab9319c53f4a -DIST bazelbuild-rules_cc-081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz 130803 BLAKE2B 406331205e8e35fc9f7f727f6f7f9697c658af800e4b90373440c433ec5cfedfe0a3986ce5b1499a2db5b7aa4dc62efac364e73639b98864d2f63076e5b209e3 SHA512 2dc8f50c405cadf10d797117b51868fa22798c4ff7cc1c4f7d4c39fa0d2e5ffbfe8269df42f90c92e0870bb8e8a9c204d3dea237a7ded03f6275657060ee9774 -DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a -DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03 -DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c -DIST bazelbuild-rules_jvm_external-4.3.zip 3998031 BLAKE2B e13022ad12c5cd1901d7dd3f1cccfd8ad04e0cf8f12b7329b9a1ed49b7ae7aca6c08704c5229427fa6a5b1f16e9c50e1a61f9adbe75c8a7ab69a291d8b2c2914 SHA512 a23bb25fdf7a5f5916bf5a4576c6c06ae2de92a6b9d8d52720ed12e61ee766f665652acdf84f9814acfd90baefab0941d3244a011f341185a378b053a51f21f3 -DIST bazelbuild-rules_pkg-0.7.0.tar.gz 76580 BLAKE2B 77574785070b45609d12aa2c2dd53c8cef18cb2c3a326324b5add996cc31a40f725bb3b12affcfba96540cd1d64a60fb8afa789125fe0aca328c652755d12cab SHA512 2fba108997065d753e17f1e7de1db08461416d03f8832d38e25f5151bfd0ad896565db9eb56b3702b604296a19620f9b60e5c15440855d36e64865010e6f4cdc -DIST bazelbuild-rules_pkg-0.7.1.tar.gz 77334 BLAKE2B fef99181792dac840724d0cfe4f1d71ae77e16e9da0b2f938752e6971b04264bfb7d731998998b5637da774b5e67adb68cc7eb3c4f38a3933ef62f949d56553d SHA512 5b47922e9b60bf82ded612bf023d66d2c6786cc81abe6bc1653aa93400e3497acc2d92d5ff90f9f4ff757143ea0d66c1f8c8eea4059142889f9eb0d9073d9a80 -DIST bazelbuild-rules_proto-11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz 14304 BLAKE2B cdd23ef47d247f6d1b9fbaa49edbda7e1cd55ad2e3616f43ff8d21fa42888c1f36172683e47beb3f3678a2b252d9b6c82fd692711e3133862eade8b64da06ea1 SHA512 024021816b4999b62db41709e0e9354ffdc88beb61a081b061d934241f06b1aa5be3b74324cbec94d1871e60eb65209b2e6b4bb8ca4a101218eaf6196ec6a974 -DIST bazelbuild-rules_python-0.0.1.tar.gz 2302092 BLAKE2B 1db52eebf2461d779f764f2afdd070d1d0dd65eb2b83ccd98c2831da1784614ca281b114064729a9f257c64eceb62975aac8362d231c84f32abdf19aee7a1852 SHA512 40fa069a4482e2f83e29dc8e109652d14d187b2ec8efdcd36e98d117de93d66a938ed74999b42a2293fcb6eccc0a111cbbcf65c5c155579214bb1b96644280a5 -DIST bazelbuild-rules_swift.1.0.0.tar.gz 199181 BLAKE2B 8261cf061ab630cff5bd0bf55c0b62252d3c7cc34a368eef80c0d1e70534dc43b5596077754306e87ba3e5bbc4b77710ba4934ff748079b8e03e72143e15deab SHA512 9e4acdd0a168462b5b480aad72cda9b3b16aaaf86fdf367c4de80dfcc093cb80c74f2f2219190730be10471d07c94c4f9bf8756a938fb9aaee9d1a4d983c4761 -DIST cub-1.9.9.zip 619595 BLAKE2B 265b797a906b03da886de88863236c9ab90daa31498ddf848fcaf5e5ee1342614ad9a41618120ca09cc4c0da3e96eeec5e20ca9d7ba3f9860c507f06d15e59e1 SHA512 8c9c0a3f66f8d518ec07f857b5625e006d52f28bade1c1478a0f37420e2f7586dc3ff029d551748a1802bb5544b16fde5388e8d5a45d61eec595201b9db7a30d -DIST cudnn-frontend-v0.7.1.zip 20112411 BLAKE2B 6f836f6b484e708d43833aef3ae52b930b80845d9e85c61f0fa4670c04a9274975eb65f682a989b9ce5ce1c3992cf43afa6f0c8e684b1754965966a79bcfda65 SHA512 f211c5e8f2a80e445d15fc9003a63485a85dcfb91c170f92e0464d494509ef44c0083a745372ff2e17dc25791f90402e4a672f795eb3faa9650e6776266b6a36 -DIST cudnn-frontend-v0.7.3.zip 20124177 BLAKE2B 9c32d99d69d4c7bc96fd6189aa1c2cdfac6fa31dfe84beebaee0e791e7a27768864067159da4473f737612973388daf39c7770ad9c1270bed840221bb603fc4d SHA512 68f5dba9873b317d8239187b57e7b4306e9078e52ef0992e6f23982aa374eff6c2ef2232b6cfff8012f50d9105d6f61c84f7f7c9ab4139d4db451599f896e0b4 -DIST dlpack-9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz 76170 BLAKE2B c28873deab233d73996137c254acecc4adb0a750cee675cfd0777ccdfa91ea704e338e7166705d47e775c45b46b152834268d89c0443a08c57b4b830bd07ac71 SHA512 e6a4fe9356b8f75f96e7f9960df40e227f8e5242e609f8cc8bf28e8161bd4f58e8c6de374d9cf216edf7e0e09ca502bc158d41c3058bc6e6e7b2bbfb9c5483ff -DIST eigen-3460f3558e7b469efb8a225894e21929c8c77629.tar.gz 2833459 BLAKE2B f624102a174d80860314f0e895f641fb86369a2df88ba2e2589da86e5ff0802b36c64be44211f6013997e0251d74bb28051e3e7edcc6cc43ab88448524db3152 SHA512 c015dae59e0df1f25b6caef5f3c724cfd91cd440df6c3eba1ee7c129b20caf9ec4010209cc5edb82ed6534503a697ba6ee49f64be0359de332ed023cdede05cf -DIST eigen-3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e.tar.gz 2810518 BLAKE2B 97c9221024f765e6899c676602ee2c850fae661dad613957cead4bce29fce8d9cbb1ac20b812b71c699feea75768be2da945fc39e9b9e9cd2e5b3c6bcf034c60 SHA512 de2c35d3ab859021dac9de35b83cb94e824814e436cd40e45ca2f5f7f9fefadac2b4222f05de9eb1b03d04a29c751f9da3a2b804e6c0fc97b4a5508f25b1e7d4 -DIST farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz 467251 BLAKE2B 74fd0cf3de41a6db0aac74148f795335df58b5a3bdd370b22ae0763aba5a4952dcd0133ed300350636a4678ff54a5c59eedee749dfcef7283e21c181b88f92cb SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1 -DIST gemmlowp-e844ffd17118c1e17d94e1ba4354c075a4577b88.zip 940590 BLAKE2B 72e8ef48e6c20d3f3510eb3a891748df386f3ac127e79cd5c594b7289826294e29be5987632800898d94d6ded9016e398672fbdabd07af8f55d458540e66ec7b SHA512 b5683bd6e1cb942d0e1e07c3bd28d83d74706c45a33b59896124f659f361bb4f93181d3ccd282d9dd61df49695b38470f138ffd2c88b6d11fe160a0266d3909a -DIST highwayhash-c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz 160745 BLAKE2B f2ffe8f13b1a8346b5b29e719c0a57f34e1fa6320d0f2d0575e4e97e813ed1a8f55acfb44b57aba70ea7d372ade18aee5ef82a881ecf457f580ffc92d6528c7b SHA512 4d6a7e8e321df82c009a0849b8da097a551f6c35a49fef65b89e731075a6af624918c0e55be9fd3a5bf07c519ab09bdefed57e0e39d4df0e79e189c468939de7 -DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708 -DIST llvm-project-10939d1d580b9d3c9c2f3539c6bdb39f408179c0.tar.gz 179559452 BLAKE2B ccdf998502aea7e87ba128560f5458b2a959d32a13f56dc795b8a0ed794c0348ca035ca601a34c0c288990f358dc5c3c01712b7458ebd15c48b1c41b4413fcd2 SHA512 36997be5da7caeaf949ae093b3ec1d81dda668087cc94de1fee9f5262a019f40fca61e652787e3f9498cd8b021b8ffc8002daef189ae0e15fda281ef6d56ecd7 -DIST llvm-project-d8415b02a519f222ecf71b069c96cc85ac635de3.tar.gz 169045379 BLAKE2B fe25f9c889c5159fbc1d251640f65b3097b4260ec7b27d5133843502ee397995c1075fb10f1a6519c6f693757ab8fe0fe2b82bb96678ef4ec4086c09ce3c90c3 SHA512 546edd97778b4298d7bb645620010e00569813fab07b925a909db4cdd8feb9adc4898e488f7bb31e70587d7b4134820a3f49a98d4f87bcf1dcad9adf5eed7e4c -DIST llvmorg-10.0.1-openmp-10.0.1.src.tar.xz 955492 BLAKE2B 4197ecfb2e3498a95a2ba5923f2b4bdafbab645ddf2d3f1875d39752d3ab7304fb35bce918d2dc6e40e5ea809545ae0907d6bc0b94a3d68b8d96da48f5a62adc SHA512 5b6f6487feaabd2a18ef2bbb1a5f86bb567e264f9fdf56805cfdd3f65f36f21e7c1392ba5170fafb52a395fc1606b277233beba3df31dc2ab825ef8924e7a05a -DIST nvidia-nccl-v2.13.4-1.tar.gz 287269 BLAKE2B 8719e26978225a9697101fb7998388c3179bb0af5c396602689242e5529492ad7a81a142e3a8492c9fa4c92adc251c58e67f97fee64a4fd1a046134ac7d737d7 SHA512 5f7077f69a0c1624a1c8ca3d2f503d8269751e26cb6ee63e1a165fb86877b62073ec4e182d939b9aacce4ee8bb8295a39d1b6d65ef3dc0fce795735341a13fc6 -DIST nvidia-nccl-v2.16.2-1.tar.gz 326883 BLAKE2B 86db7adc67ba311b72e7e013dbc2a04918c0746c1fb62079ccd3300691479e1f6e35e379d6ee4320e343666b68372c56607ae521f5ff2d7e59d5f4dc3b894097 SHA512 e6572c2e7adc03053048c0b1e5290ffaf6f294239d78038887582c847aa549e5e95c7970b943f1d0b8964c32b4cdee3785bf40886f274907b613f320e9de10d0 -DIST oneDNN-v2.7.1.tar.gz 6405831 BLAKE2B b43253f7bc1be0bca51746f06d825191ae544376b259662cbf8f567d8f39a6befde3c88a14744e053b851d2f89fb2600b999abef1acb585bc116d6fa0c95fe3f SHA512 062e97ac613d265627ec1f010aa1d101bf71c449c813187c26244c66c9e6b9b582a0a0a823a9391fa828f396051318fada8263ff64c4f4b4bb6ca1d7a08ea6e1 -DIST oneDNN-v2.7.3.tar.gz 6410473 BLAKE2B c6730100e0438d456eb4986f416ae2bd1f173a80c52d5090523af06790afae8ee17cc58ffa8ed7215cd0eff99191a925d8cdce9986c72ccb8ebffacedc434b18 SHA512 ad9450f8b701288fa1721f64d0cb33fc344e9fc4f84e517b3d52377189ffcd0c5b56156ef4a33ca3ffe2da886abcc7ac5b2a3407cc155bd4be2223751b84f7c9 -DIST openxla-stablehlo-51f005f0a8ff6e28f535adfec4de936cb4097aa4.zip 6902721 BLAKE2B ef9766377a38f816f5a6dc60f34d5300b2775bc282084e9f34c7a5ccc6104a0154d44f2c57aba081889de50fc141a6059255fca3f681322343e316289d6540d7 SHA512 ffe46e21be6f617b6ecbc7ef35e83d441256e429150af60451cf04c02085fb1a0b60a9687d8d60d6f1f9321e6f6a92f24749a3c1cf1ee694a8ffc0fcd13f64f4 -DIST openxla-stablehlo-fdd47908468488cbbb386bb7fc723dc19321cb83.zip 301572 BLAKE2B c8242b3d9612fbdfa1c34ae5cb610aadd68464498e6cc84d48bcc38abb9e8636fa31b9a03b5a604a29cafe12a47e5b7be90c48d52fb6587bcd376d6307775197 SHA512 61b89d0dafe450ae95d770878385b5ed3cbb0109b79cf5e01304119f2f52255ccc83cedc542cfa5c342692945833b86606468224e67c6ff9dd6f7216b86adc7a -DIST openxla-triton-2c3853269281da6742cf469a5ca5772947d271ce.tar.gz 459751 BLAKE2B 8b1b314fd1b6d8822a84cb9cacfd70e2c59784a76f879d75c910f376d38fbdccbc132ebab7f29c5bddde04afd7821c0322311d97c55fcfcc87580b82039a7efa SHA512 cedee3b982b93ae237a1e035ef2a9447aabc94ea4add63959b927670006b5cf546f064d5741ee9e731de31c343ed5869abe9c479d07360b07ef2b26f93081a6a -DIST pthreadpool-b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip 61524 BLAKE2B 924419730bc6b94ec98a13db94f177b3b70d6c763158f43fb6f9e45605e73cfce238e6c996e2bf629dbb2a5af93ae99849ddc91174fc4664d702667f7423892d SHA512 d25262b47e39058d5aa8b8197c4984a5b941587a19079a2210f738c3af34ab8e8477731c88ca80c3f812a6a04635f80300124d93cc1e099352ef2aca04bdc3ae -DIST pytorch-cpuinfo-3dc310302210c1891ffcfb12ae67b11a3ad3a150.tar.gz 3515639 BLAKE2B d4adc49ea1bcbfd7a7efb13cdfea6a1d9cf717b06209c03342f92a3d624de65bcdf2ce7aa7fa8bd5f95ad423447ee833fdea718e16f98037344df75de8bde943 SHA512 f4c0ce922cee0df62c15a335889bb59b5f70ad71448b42b9c1bfa9b5e77c4c4d5f1613f607f32fa9d6817d0d5f49c554e1378079a1cd66a9cd2492796d48c3c2 -DIST pytorch-cpuinfo-3dc310302210c1891ffcfb12ae67b11a3ad3a150.zip 3812878 BLAKE2B 30048677534192f1e288c69be5a0373844206cc4e209d48b92f5bf38da37003bdd5125b6588ec0f34acd855acd9cd16193725976ede644d3140fbbcf03d2d364 SHA512 963fa6c6948102d15cae1db90645e9cf85d1efc0fd541f75dfff7d6efe62fdd196085910cdb366be56b7e71f36df98edd211fc875aff6eb1e9962e0d62f43667 -DIST pytorch-cpuinfo-5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz 3512335 BLAKE2B 71c14866fde3846b5f375b39fe2f081a6c219b36fc0721640971f99c53ca77c8e7f8df83992d777af32a28c645d64f27dca838bd8e60835c5497e131467b22d0 SHA512 6a61f4574661a55771c2ec31bb0919a51d0bd8c770477b254a5c14dc5323716af275c7fe3abc5aa96720d7cc929559ca66f614265d3940e076b8db2fa15c8e36 -DIST re2-a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz 306766 BLAKE2B 54162a22afe10b392e30864729b3b210194c0dbf7926cc3536dfe3afd43e0b8abf3d01b08e0feb71a8ade19cd497aea9e9b7b34eacb85e10cc7e1c5fd62a407d SHA512 9557830cea13485bd332ccdcdd3735ea63e6bb41f4cf943ecc24a1d79b75a58c5894cfe70c4a35a07a1b2b1f3d2ffa76fbeff168fda17c72b3436cb6213121dd -DIST rules_apple.1.0.1.tar.gz 2198467 BLAKE2B 79178efe1acfa36af3f41b31610a5add8bd9c35529931415ab45cc1588c4fea477ddf0cd67c5d799de688db049fe2f3ce776c5e5da2e1dde1c329efc44d51ec0 SHA512 a24d880dd8174241b2808424fd3364f8b0ba9865109704981ad68f383d983bab9f8e8923942423e70b0a3af6951d16f5712647692a8ca3bef4347057f3536cc6 -DIST ruy-3286a34cc8de6149ac6844107dfdffac91531e72.zip 381045 BLAKE2B 00cf2a009ff6cac8e3e8c3380c3fdb4fe9299614eba56bfbf0b2b8dd908ec2ec7d58b8185810899dd8bac80cc990d69a26e01eed8562f73c5fc08b8b3ad198e0 SHA512 4acb4dcee41788c3f2a65a4335f64d20057980289f231a401ea45c27dcd16bc2e48d0748d6ad35e77c3212104c54353193d4710260993ae8927dce24a6ef435e -DIST ruy-841ea4172ba904fe3536789497f9565f2ef64129.zip 379664 BLAKE2B 82f54b4e7959ca2ff489cf0eaa7c01c5084b11174a43e2caa8f30dcd3951fb9552e513fa0488190fa73dde62719bfd8e4be59bd264fe316ec5b9852db2494ed2 SHA512 e10bed1901eb53cc0174d8723b67b7ff4f7021b5d94e8e7596879a9a625e77948f265d430b5c56f7789030874ba08bdb5263796212d9b60affd1a20694ec3317 -DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e -DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856 -DIST tensorflow-2.11.0.tar.gz 67996769 BLAKE2B 539a8d7084280023c7b019a079aad6bdf0fa94b22276250a02913fb0ad496b4af2115276152b4f37101547404b616de58f209b9d1036e5d4dd9b0f7072a59ba9 SHA512 cda16db72a0ede72ac9f5e76c3a745ea9d72421fa40021303032f8fc3ac2755f64524f97a4629c18cf888f259027439b49ec921e0f5fd329a6ba060235a658d5 -DIST tensorflow-2.12.0.tar.gz 69710128 BLAKE2B 582b7b2717edd0ce41ecd74525fd38684d375cf1833c206cb53fa10ef964bb41ef8f29fa947a1f77e892bb68793d53c567bc9c4c9124dba94913f57ddcd3b1f9 SHA512 9273720b5be08e5d3dc76aafa4af6b27a2d50afd02b181e7632f3d70961995b2e0e5acb13e70c9b704ef475617c23d70047fbe74d5b63b156cf8f2fa8a856b84 -DIST tensorflow-patches-2.11.0.tar.bz2 2977 BLAKE2B 53672704ccfc5291f7070421af9f7246d2f211689b18f35917d4d166ff5e9ddb623db4dd9dc8054e0f2262b162dd8c2216446c6ca5e2bf538872debf8eb8aec1 SHA512 866c6abb78934c1a645ab3172f93d81423e2023fa1e8688255ef0777e340d810a6889c838b841be765f0897f7a269c4d6cb52b8f59af114bf5b9e181b1348590 -DIST tensorflow-patches-2.12.0.tar.bz2 4194 BLAKE2B b61efaf0ade6ef88b5abb858a84b537e02ff9fcd032a2a7f68a6467e53511a50fff66ef7e1096f343a8909e165b1b76146cb6a8db8e1974eeecf2cbf0b6a71a0 SHA512 2f931fd4b995d33300d392f7dafd6dd23671772f733c28faed239d01e9b032967afb17cab50908fa38956e2cde479a13dfdc632e622d918fe55d281aa9b3dc4e -DIST tensorflow-runtime-4ce3e4da2e21ae4dfcee9366415e55f408c884ec.tar.gz 15313054 BLAKE2B 316da579b93d83bca43d51198dc65dea12972d73f019a5b78fe53162966e022d21d4225ba4a7786d1a0f376550a1052c59858df04b958768962b88d64d3c5083 SHA512 ea490ebc8a5eef4a7ce6185c19e3b1305fd886c8145ef54387076f458bfec56a8a33452728206afa67001273920f6958317c8c4289e32ac6fea432e15a2502c5 -DIST tensorflow-runtime-91d765cad5599f9710973d3e34d4dc22583e2e79.tar.gz 15226589 BLAKE2B 5a00d0f884c86f85a25aba8f7d9eee509f35c114e9bfa24ce3effe9437bc549a4a7f013b03b515fbb4a217724a2e2abca96300fba64560b0d0e4fdb05fb9c3ac SHA512 b2fc8a240de1a13fade8628358f410b8f6e1bfde9d2cec3765b62d2ee7eb143c168687a23cb79c7aecd19a668d2d3be46fba361d16ad29b722fe19004aa3c5a2 diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml deleted file mode 100644 index 7e7bdf148869..000000000000 --- a/sci-libs/tensorflow/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <use> - <flag name="cuda">Enable support for nVidia CUDA</flag> - <flag name="xla">XLA (Accelerated Linear Algebra) Optimizing Compiler for TensorFlow</flag> - </use> - <upstream> - <remote-id type="github">tensorflow/tensorflow</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/tensorflow/tensorflow-2.11.0.ebuild b/sci-libs/tensorflow/tensorflow-2.11.0.ebuild deleted file mode 100644 index db9af569cd4c..000000000000 --- a/sci-libs/tensorflow/tensorflow-2.11.0.ebuild +++ /dev/null @@ -1,419 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_10 ) -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} -DEP_VER="$(ver_cut 1-2)" - -inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs - -DESCRIPTION="Computation framework using data flow graphs for scalable machine learning" -HOMEPAGE="https://www.tensorflow.org/" - -RESTRICT="test" # Tests need GPU access -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda mpi +python xla" -CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4" -for i in $CPU_USE_FLAGS_X86; do - IUSE+=" cpu_flags_x86_${i}" -done - -# distfiles that bazel uses for the workspace, will be copied to basel-distdir -# pkgcheck complains but do NOT change the .zip to .tar.gz, bazel requires the exact tarball (basename and sha256). -# the build will fail if different archives are used. -bazel_external_uris=" - https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz -> bazelbuild-platforms-0.0.5.tar.gz - https://github.com/bazelbuild/apple_support/releases/download/1.1.0/apple_support.1.1.0.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz - https://github.com/bazelbuild/bazel-toolchains/archive/8c717f8258cd5f6c7a45b97d974292755852b658.tar.gz -> bazel-toolchains-8c717f8258cd5f6c7a45b97d974292755852b658.tar.gz - https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip - https://github.com/bazelbuild/rules_apple/releases/download/1.0.1/rules_apple.1.0.1.tar.gz - https://github.com/bazelbuild/rules_cc/archive/081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz -> bazelbuild-rules_cc-081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz - https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz - https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip - https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz -> bazelbuild-rules_pkg-0.7.0.tar.gz - https://github.com/bazelbuild/rules_proto/archive/11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz -> bazelbuild-rules_proto-11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz - https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz - https://github.com/bazelbuild/rules_swift/releases/download/1.0.0/rules_swift.1.0.0.tar.gz -> bazelbuild-rules_swift.1.0.0.tar.gz - https://github.com/dmlc/dlpack/archive/9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz -> dlpack-9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz - https://github.com/google/farmhash/archive/0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz -> farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz - https://github.com/google/gemmlowp/archive/e844ffd17118c1e17d94e1ba4354c075a4577b88.zip -> gemmlowp-e844ffd17118c1e17d94e1ba4354c075a4577b88.zip - https://github.com/google/highwayhash/archive/c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz -> highwayhash-c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz - https://github.com/google/re2/archive/a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz -> re2-a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz - https://github.com/google/ruy/archive/841ea4172ba904fe3536789497f9565f2ef64129.zip -> ruy-841ea4172ba904fe3536789497f9565f2ef64129.zip - https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz - https://github.com/llvm/llvm-project/archive/d8415b02a519f222ecf71b069c96cc85ac635de3.tar.gz -> llvm-project-d8415b02a519f222ecf71b069c96cc85ac635de3.tar.gz - https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz - https://github.com/mborgerding/kissfft/archive/131.1.0.tar.gz -> kissfft-131.1.0.tar.gz - https://github.com/oneapi-src/oneDNN/archive/refs/tags/v2.7.1.tar.gz -> oneDNN-v2.7.1.tar.gz - https://github.com/openxla/stablehlo/archive/fdd47908468488cbbb386bb7fc723dc19321cb83.zip -> openxla-stablehlo-fdd47908468488cbbb386bb7fc723dc19321cb83.zip - https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz - https://github.com/pytorch/cpuinfo/archive/5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz -> pytorch-cpuinfo-5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz - https://github.com/tensorflow/runtime/archive/4ce3e4da2e21ae4dfcee9366415e55f408c884ec.tar.gz -> tensorflow-runtime-4ce3e4da2e21ae4dfcee9366415e55f408c884ec.tar.gz - https://gitlab.com/libeigen/eigen/-/archive/3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e/eigen-3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e.tar.gz - https://github.com/google/XNNPACK/archive/e8f74a9763aa36559980a0c2f37f587794995622.zip -> XNNPACK-e8f74a9763aa36559980a0c2f37f587794995622.zip - https://github.com/Maratyszcza/pthreadpool/archive/b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip -> pthreadpool-b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip - https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip - https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.zip -> FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.zip - cuda? ( - https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v0.7.1.zip -> cudnn-frontend-v0.7.1.zip - https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip - https://github.com/nvidia/nccl/archive/v2.13.4-1.tar.gz -> nvidia-nccl-v2.13.4-1.tar.gz - ) - python? ( - https://github.com/intel/ARM_NEON_2_x86_SSE/archive/a15b489e1222b2087007546b4912e21293ea86ff.tar.gz -> ARM_NEON_2_x86_SSE-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz - https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt - )" - -SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2 - ${bazel_external_uris}" - -# abseil-cpp-20211102.0-r0 does not work with NVCC -RDEPEND=" - app-arch/snappy - >=dev-cpp/abseil-cpp-20211102-r2:= - dev-db/lmdb - dev-db/sqlite - dev-libs/double-conversion - dev-libs/icu:= - >=dev-libs/jsoncpp-1.9.2:= - >=dev-libs/nsync-1.25.0 - dev-libs/openssl:0= - >=dev-libs/protobuf-3.13.0:= - >=dev-libs/re2-0.2019.06.01:= - media-libs/giflib - media-libs/libjpeg-turbo - media-libs/libpng:0 - >=net-libs/grpc-1.28:= - net-misc/curl - sys-libs/zlib - >=sys-apps/hwloc-2:= - cuda? ( - <dev-util/nvidia-cuda-toolkit-11.9_pre:=[profiler] - =dev-libs/cudnn-8* - ) - mpi? ( virtual/mpi ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/flatbuffers-2.0.6:= - dev-python/absl-py[${PYTHON_USEDEP}] - >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] - dev-python/astunparse[${PYTHON_USEDEP}] - dev-python/clang-python[${PYTHON_USEDEP}] - dev-python/dill[${PYTHON_USEDEP}] - dev-python/flatbuffers[${PYTHON_USEDEP}] - >=dev-python/gast-0.3.3[${PYTHON_USEDEP}] - dev-python/h5py[${PYTHON_USEDEP}] - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - >=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}] - >=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/tblib[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - >=dev-python/grpcio-1.28[${PYTHON_USEDEP}] - >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}] - >=net-libs/google-cloud-cpp-0.10.0 - >=sci-visualization/tensorboard-${DEP_VER}[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - python? ( - dev-python/mock - dev-python/setuptools - )" -PDEPEND="python? ( - >=sci-libs/keras-${DEP_VER}[${PYTHON_USEDEP}] - >=sci-libs/tensorflow-estimator-${DEP_VER}[${PYTHON_USEDEP}] - )" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.8.0 - dev-java/java-config - >=dev-util/bazel-5.1.1 - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - ) - !python? ( dev-lang/python ) - python? ( - dev-python/cython - dev-python/mock - >=dev-python/grpcio-tools-1.28 - )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) -CHECKREQS_MEMORY="5G" -CHECKREQS_DISK_BUILD="10G" - -get-cpu-flags() { - local i f=() - # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc. - for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do - use cpu_flags_x86_${i} && f+=( -m${i/_/.} ) - done - use cpu_flags_x86_fma3 && f+=( -mfma ) - echo "${f[*]}" -} - -pkg_setup() { - local num_pythons_enabled - num_pythons_enabled=0 - count_impls() { - num_pythons_enabled=$((${num_pythons_enabled} + 1)) - } - use python && python_foreach_impl count_impls - - # 10G to build C/C++ libs, 6G per python impl - CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G" - check-reqs_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack "${P}.tar.gz" - unpack tensorflow-patches-${PVR}.tar.bz2 - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - append-flags $(get-cpu-flags) - append-cxxflags -std=c++17 - export BUILD_CXXFLAGS+=" -std=c++17" - filter-flags '-fvtable-verify=@(std|preinit)' - bazel_setup_bazelrc - - eapply "${WORKDIR}"/patches/*.patch - - # Relax version checks in setup.py - sed -i "/^ '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die - sed -i "/config_googleapis/d" tensorflow/workspace0.bzl || die - - # Prefixify hard-coded command locations - hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl - - default - use python && python_copy_sources - - use cuda && cuda_add_sandbox -} - -src_configure() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - do_configure() { - export CC_OPT_FLAGS=" " - export TF_ENABLE_XLA=$(usex xla 1 0) - export TF_NEED_OPENCL_SYCL=0 - export TF_NEED_OPENCL=0 - export TF_NEED_COMPUTECPP=0 - export TF_NEED_ROCM=0 - export TF_NEED_MPI=$(usex mpi 1 0) - export TF_SET_ANDROID_WORKSPACE=0 - - if use python; then - export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="$(python_get_sitedir)" - else - export PYTHON_BIN_PATH="$(which python)" - export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" - fi - - export TF_NEED_CUDA=$(usex cuda 1 0) - export TF_DOWNLOAD_CLANG=0 - export TF_CUDA_CLANG=0 - export TF_NEED_TENSORRT=0 - if use cuda; then - export TF_CUDA_PATHS="${EPREFIX}/opt/cuda" - export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" - export TF_CUDA_VERSION="$(cuda_toolkit_version)" - export TF_CUDNN_VERSION="$(cuda_cudnn_version)" - einfo "Setting CUDA version: $TF_CUDA_VERSION" - einfo "Setting CUDNN version: $TF_CUDNN_VERSION" - - if [[ $(cuda-config -s) != *$(gcc-version)* ]]; then - ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler" - ewarn "version is not supported by the currently installed CUDA. TensorFlow will" - ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}." - ewarn "If the build fails with linker errors try rebuilding the relevant" - ewarn "dependencies using the same compiler version." - fi - - if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then - ewarn "WARNING: TensorFlow 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 TensorFlow with the CUDA compute capability that is optimal for your GPU," - ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5" - 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 - fi - - # com_googlesource_code_re2 weird branch using absl, doesnt work with released re2 - #com_github_googleapis_googleapis - local SYSLIBS=( - absl_py - astor_archive - astunparse_archive - boringssl - com_github_googlecloudplatform_google_cloud_cpp - com_github_grpc_grpc - com_google_absl - com_google_protobuf - curl - cython - dill_archive - double_conversion - flatbuffers - functools32_archive - gast_archive - gif - hwloc - icu - jsoncpp_git - libjpeg_turbo - lmdb - nasm - nsync - opt_einsum_archive - org_sqlite - pasta - png - pybind11 - six_archive - snappy - tblib_archive - termcolor_archive - typing_extensions_archive - wrapt - zlib - ) - - export TF_SYSTEM_LIBS="${SYSLIBS[@]}" - export TF_IGNORE_MAX_BAZEL_VERSION=1 - - # This is not autoconf - ./configure || die - - echo 'build --config=noaws --config=nohdfs --config=nonccl' >> .bazelrc || die - echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die - echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die - echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die - - for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags) - do - echo "build --copt=\"${cflag}\"" >> .bazelrc || die - echo "build --host_copt=\"${cflag}\"" >> .bazelrc || die - done - } - if use python; then - python_foreach_impl run_in_build_dir do_configure - else - do_configure - fi -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - if use python; then - python_setup - BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - # fail early if any deps are missing - ebazel build -k --nobuild \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so \ - //tensorflow:libtensorflow_cc.so \ - $(usex python '//tensorflow/tools/pip_package:build_pip_package' '') - - ebazel build \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so - ebazel build //tensorflow:libtensorflow_cc.so - ebazel build //tensorflow:install_headers - ebazel shutdown - - do_compile() { - ebazel build //tensorflow/tools/pip_package:build_pip_package - ebazel shutdown - } - BUILD_DIR="${S}" - cd "${BUILD_DIR}" || die - use python && python_foreach_impl run_in_build_dir do_compile -} - -src_install() { - local i l - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - do_install() { - einfo "Installing ${EPYTHON} files" - local srcdir="${T}/src-${MULTIBUILD_VARIANT}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die - cd "${srcdir}" || die - esetup.py install - - # libtensorflow_framework.so is in /usr/lib already - rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die - python_optimize - } - - if use python; then - python_foreach_impl run_in_build_dir do_install - - # Symlink to python-exec scripts - for i in "${ED}"/usr/lib/python-exec/*/*; do - n="${i##*/}" - [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}" - done - - python_setup - local BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - einfo "Installing headers" - insinto /usr/include/${PN}/ - doins -r bazel-bin/tensorflow/include/* - - einfo "Installing libs" - # Generate pkg-config file - ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc ${PN}_cc.pc - - for l in libtensorflow{,_framework,_cc}.so; do - dolib.so bazel-bin/tensorflow/${l} - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1) - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3) - done - - einstalldocs - - # Workaround for https://bugs.gentoo.org/831927 - export MAKEOPTS="-j1" -} diff --git a/sci-libs/tensorflow/tensorflow-2.12.0.ebuild b/sci-libs/tensorflow/tensorflow-2.12.0.ebuild deleted file mode 100644 index cc9ea6718f88..000000000000 --- a/sci-libs/tensorflow/tensorflow-2.12.0.ebuild +++ /dev/null @@ -1,422 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_10 python3_11 ) -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} -DEP_VER="$(ver_cut 1-2)" - -inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs - -DESCRIPTION="Computation framework using data flow graphs for scalable machine learning" -HOMEPAGE="https://www.tensorflow.org/" - -RESTRICT="test" # Tests need GPU access -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda mpi +python xla" -CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4" -for i in $CPU_USE_FLAGS_X86; do - IUSE+=" cpu_flags_x86_${i}" -done - -# distfiles that bazel uses for the workspace, will be copied to basel-distdir -# pkgcheck complains but do NOT change the .zip to .tar.gz, bazel requires the exact tarball (basename and sha256). -# the build will fail if different archives are used. -bazel_external_uris=" - https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip - https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.zip -> FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.zip - https://github.com/Maratyszcza/pthreadpool/archive/b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip -> pthreadpool-b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip - https://github.com/bazelbuild/apple_support/releases/download/1.1.0/apple_support.1.1.0.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz - https://github.com/bazelbuild/bazel-toolchains/archive/8c717f8258cd5f6c7a45b97d974292755852b658.tar.gz -> bazel-toolchains-8c717f8258cd5f6c7a45b97d974292755852b658.tar.gz - https://github.com/bazelbuild/platforms/releases/download/0.0.6/platforms-0.0.6.tar.gz -> bazelbuild-platforms-0.0.6.tar.gz - https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip - https://github.com/bazelbuild/rules_apple/releases/download/1.0.1/rules_apple.1.0.1.tar.gz - https://github.com/bazelbuild/rules_cc/archive/081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz -> bazelbuild-rules_cc-081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz - https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz - https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip - https://github.com/bazelbuild/rules_jvm_external/archive/4.3.zip -> bazelbuild-rules_jvm_external-4.3.zip - https://github.com/bazelbuild/rules_pkg/releases/download/0.7.1/rules_pkg-0.7.1.tar.gz -> bazelbuild-rules_pkg-0.7.1.tar.gz - https://github.com/bazelbuild/rules_proto/archive/11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz -> bazelbuild-rules_proto-11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz - https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz - https://github.com/bazelbuild/rules_swift/releases/download/1.0.0/rules_swift.1.0.0.tar.gz -> bazelbuild-rules_swift.1.0.0.tar.gz - https://github.com/dmlc/dlpack/archive/9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz -> dlpack-9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz - https://github.com/google/XNNPACK/archive/659147817805d17c7be2d60bd7bbca7e780f9c82.zip -> XNNPACK-659147817805d17c7be2d60bd7bbca7e780f9c82.zip - https://github.com/google/farmhash/archive/0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz -> farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz - https://github.com/google/gemmlowp/archive/e844ffd17118c1e17d94e1ba4354c075a4577b88.zip -> gemmlowp-e844ffd17118c1e17d94e1ba4354c075a4577b88.zip - https://github.com/google/highwayhash/archive/c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz -> highwayhash-c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz - https://github.com/google/re2/archive/a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz -> re2-a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz - https://github.com/google/ruy/archive/3286a34cc8de6149ac6844107dfdffac91531e72.zip -> ruy-3286a34cc8de6149ac6844107dfdffac91531e72.zip - https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz - https://github.com/llvm/llvm-project/archive/10939d1d580b9d3c9c2f3539c6bdb39f408179c0.tar.gz -> llvm-project-10939d1d580b9d3c9c2f3539c6bdb39f408179c0.tar.gz - https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz - https://github.com/mborgerding/kissfft/archive/131.1.0.tar.gz -> kissfft-131.1.0.tar.gz - https://github.com/oneapi-src/oneDNN/archive/refs/tags/v2.7.3.tar.gz -> oneDNN-v2.7.3.tar.gz - https://github.com/openxla/stablehlo/archive/51f005f0a8ff6e28f535adfec4de936cb4097aa4.zip -> openxla-stablehlo-51f005f0a8ff6e28f535adfec4de936cb4097aa4.zip - https://github.com/openxla/triton/archive/2c3853269281da6742cf469a5ca5772947d271ce.tar.gz -> openxla-triton-2c3853269281da6742cf469a5ca5772947d271ce.tar.gz - https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz - https://github.com/pytorch/cpuinfo/archive/3dc310302210c1891ffcfb12ae67b11a3ad3a150.tar.gz -> pytorch-cpuinfo-3dc310302210c1891ffcfb12ae67b11a3ad3a150.tar.gz - https://github.com/pytorch/cpuinfo/archive/3dc310302210c1891ffcfb12ae67b11a3ad3a150.zip -> pytorch-cpuinfo-3dc310302210c1891ffcfb12ae67b11a3ad3a150.zip - https://github.com/tensorflow/runtime/archive/91d765cad5599f9710973d3e34d4dc22583e2e79.tar.gz -> tensorflow-runtime-91d765cad5599f9710973d3e34d4dc22583e2e79.tar.gz - https://gitlab.com/libeigen/eigen/-/archive/3460f3558e7b469efb8a225894e21929c8c77629/eigen-3460f3558e7b469efb8a225894e21929c8c77629.tar.gz - cuda? ( - https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v0.7.3.zip -> cudnn-frontend-v0.7.3.zip - https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip - https://github.com/nvidia/nccl/archive/v2.16.2-1.tar.gz -> nvidia-nccl-v2.16.2-1.tar.gz - ) - python? ( - https://github.com/intel/ARM_NEON_2_x86_SSE/archive/a15b489e1222b2087007546b4912e21293ea86ff.tar.gz -> ARM_NEON_2_x86_SSE-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz - https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt - )" - -SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2 - ${bazel_external_uris}" - -# abseil-cpp-20211102.0-r0 does not work with NVCC -RDEPEND=" - app-arch/snappy - >=dev-cpp/abseil-cpp-20211102-r2:= - dev-db/lmdb - dev-db/sqlite - dev-libs/double-conversion - dev-libs/icu:= - >=dev-libs/jsoncpp-1.9.2:= - >=dev-libs/nsync-1.25.0 - dev-libs/openssl:0= - >=dev-libs/protobuf-3.13.0:= - >=dev-libs/re2-0.2019.06.01:= - media-libs/giflib - media-libs/libjpeg-turbo - media-libs/libpng:0 - >=net-libs/grpc-1.28:= - net-misc/curl - sys-libs/zlib - >=sys-apps/hwloc-2:= - cuda? ( - <dev-util/nvidia-cuda-toolkit-11.9_pre:=[profiler] - =dev-libs/cudnn-8* - ) - mpi? ( virtual/mpi ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/flatbuffers-2.0.6:= - dev-python/absl-py[${PYTHON_USEDEP}] - >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] - dev-python/astunparse[${PYTHON_USEDEP}] - dev-python/clang-python[${PYTHON_USEDEP}] - dev-python/dill[${PYTHON_USEDEP}] - dev-python/flatbuffers[${PYTHON_USEDEP}] - >=dev-python/gast-0.3.3[${PYTHON_USEDEP}] - dev-python/h5py[${PYTHON_USEDEP}] - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - >=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}] - >=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/tblib[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - >=dev-python/grpcio-1.28[${PYTHON_USEDEP}] - >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}] - >=net-libs/google-cloud-cpp-0.10.0 - >=sci-visualization/tensorboard-${DEP_VER}[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - python? ( - dev-python/mock - dev-python/setuptools - )" -PDEPEND="python? ( - >=sci-libs/keras-${DEP_VER}[${PYTHON_USEDEP}] - >=sci-libs/tensorflow-estimator-${DEP_VER}[${PYTHON_USEDEP}] - )" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.8.0 - dev-java/java-config - =dev-util/bazel-5* - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - ) - !python? ( dev-lang/python ) - python? ( - dev-python/cython - dev-python/mock - >=dev-python/grpcio-tools-1.28 - )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) -CHECKREQS_MEMORY="5G" -CHECKREQS_DISK_BUILD="10G" - -get-cpu-flags() { - local i f=() - # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc. - for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do - use cpu_flags_x86_${i} && f+=( -m${i/_/.} ) - done - use cpu_flags_x86_fma3 && f+=( -mfma ) - echo "${f[*]}" -} - -pkg_setup() { - local num_pythons_enabled - num_pythons_enabled=0 - count_impls() { - num_pythons_enabled=$((${num_pythons_enabled} + 1)) - } - use python && python_foreach_impl count_impls - - # 10G to build C/C++ libs, 6G per python impl - CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G" - check-reqs_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack "${P}.tar.gz" - unpack tensorflow-patches-${PVR}.tar.bz2 - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - append-flags $(get-cpu-flags) - append-cxxflags -std=c++17 - export BUILD_CXXFLAGS+=" -std=c++17" - filter-flags '-fvtable-verify=@(std|preinit)' - bazel_setup_bazelrc - - eapply "${WORKDIR}"/patches/*.patch - - # Relax version checks in setup.py - sed -i "/^ '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die - sed -i "/config_googleapis/d" tensorflow/workspace0.bzl || die - - # Prefixify hard-coded command locations - hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl - - default - use python && python_copy_sources - - use cuda && cuda_add_sandbox -} - -src_configure() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - do_configure() { - export CC_OPT_FLAGS=" " - export TF_ENABLE_XLA=$(usex xla 1 0) - export TF_NEED_OPENCL_SYCL=0 - export TF_NEED_OPENCL=0 - export TF_NEED_COMPUTECPP=0 - export TF_NEED_ROCM=0 - export TF_NEED_MPI=$(usex mpi 1 0) - export TF_SET_ANDROID_WORKSPACE=0 - - if use python; then - export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="$(python_get_sitedir)" - else - export PYTHON_BIN_PATH="$(which python)" - export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" - fi - - export TF_NEED_CUDA=$(usex cuda 1 0) - export TF_DOWNLOAD_CLANG=0 - export TF_CUDA_CLANG=0 - export TF_NEED_TENSORRT=0 - if use cuda; then - export TF_CUDA_PATHS="${EPREFIX}/opt/cuda" - export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" - export TF_CUDA_VERSION="$(cuda_toolkit_version)" - export TF_CUDNN_VERSION="$(cuda_cudnn_version)" - einfo "Setting CUDA version: $TF_CUDA_VERSION" - einfo "Setting CUDNN version: $TF_CUDNN_VERSION" - - if [[ $(cuda-config -s) != *$(gcc-version)* ]]; then - ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler" - ewarn "version is not supported by the currently installed CUDA. TensorFlow will" - ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}." - ewarn "If the build fails with linker errors try rebuilding the relevant" - ewarn "dependencies using the same compiler version." - fi - - if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then - ewarn "WARNING: TensorFlow 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 TensorFlow with the CUDA compute capability that is optimal for your GPU," - ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5" - 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 - fi - - # com_googlesource_code_re2 weird branch using absl, doesnt work with released re2 - #com_github_googleapis_googleapis - local SYSLIBS=( - absl_py - astor_archive - astunparse_archive - boringssl - com_github_googlecloudplatform_google_cloud_cpp - com_github_grpc_grpc - com_google_absl - com_google_protobuf - curl - cython - dill_archive - double_conversion - flatbuffers - functools32_archive - gast_archive - gif - hwloc - icu - jsoncpp_git - libjpeg_turbo - lmdb - nasm - nsync - opt_einsum_archive - org_sqlite - pasta - png - pybind11 - six_archive - snappy - tblib_archive - termcolor_archive - typing_extensions_archive - wrapt - zlib - ) - - export TF_SYSTEM_LIBS="${SYSLIBS[@]}" - export TF_IGNORE_MAX_BAZEL_VERSION=1 - - # This is not autoconf - ./configure || die - - echo 'build --config=noaws --config=nohdfs --config=nonccl' >> .bazelrc || die - echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die - echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die - echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die - - for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags) - do - echo "build --copt=\"${cflag}\"" >> .bazelrc || die - echo "build --host_copt=\"${cflag}\"" >> .bazelrc || die - done - } - if use python; then - python_foreach_impl run_in_build_dir do_configure - else - do_configure - fi -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - if use python; then - python_setup - BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - # fail early if any deps are missing - ebazel build -k --nobuild \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so \ - //tensorflow:libtensorflow_cc.so \ - $(usex python '//tensorflow/tools/pip_package:build_pip_package' '') - - ebazel build \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so - ebazel build //tensorflow:libtensorflow_cc.so - ebazel build //tensorflow:install_headers - ebazel shutdown - - do_compile() { - ebazel build //tensorflow/tools/pip_package:build_pip_package - ebazel shutdown - } - BUILD_DIR="${S}" - cd "${BUILD_DIR}" || die - use python && python_foreach_impl run_in_build_dir do_compile -} - -src_install() { - local i l - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - do_install() { - einfo "Installing ${EPYTHON} files" - local srcdir="${T}/src-${MULTIBUILD_VARIANT}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die - cd "${srcdir}" || die - esetup.py install - - # libtensorflow_framework.so is in /usr/lib already - rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die - python_optimize - } - - if use python; then - python_foreach_impl run_in_build_dir do_install - - # Symlink to python-exec scripts - for i in "${ED}"/usr/lib/python-exec/*/*; do - n="${i##*/}" - [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}" - done - - python_setup - local BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - einfo "Installing headers" - insinto /usr/include/${PN}/ - doins -r bazel-bin/tensorflow/include/* - - einfo "Installing libs" - # Generate pkg-config file - ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc ${PN}_cc.pc - - for l in libtensorflow{,_framework,_cc}.so; do - dolib.so bazel-bin/tensorflow/${l} - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1) - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3) - done - - einstalldocs - - # Workaround for https://bugs.gentoo.org/831927 - export MAKEOPTS="-j1" -} diff --git a/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-musl.patch b/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-musl.patch new file mode 100644 index 000000000000..86fd4793ae5f --- /dev/null +++ b/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-musl.patch @@ -0,0 +1,10 @@ +--- a/tensorpipe/channel/cma/context_impl.cc 2023-12-31 13:40:35.080753311 +0100 ++++ b/tensorpipe/channel/cma/context_impl.cc 2023-12-31 13:40:44.570735997 +0100 +@@ -8,7 +8,6 @@ + + #include <tensorpipe/channel/cma/context_impl.h> + +-#include <linux/prctl.h> + #include <sys/prctl.h> + #include <sys/syscall.h> + #include <sys/uio.h> diff --git a/sci-libs/tensorpipe/metadata.xml b/sci-libs/tensorpipe/metadata.xml index 0771cea93d5e..a676d5dbb87a 100644 --- a/sci-libs/tensorpipe/metadata.xml +++ b/sci-libs/tensorpipe/metadata.xml @@ -5,9 +5,6 @@ <email>tupone@gentoo.org</email> <name>Tupone Alfredo</name> </maintainer> - <use> - <flag name="cuda">Add support for CUDA processing</flag> - </use> <upstream> <remote-id type="github">pytorch/tensorpipe</remote-id> </upstream> diff --git a/sci-libs/tensorpipe/tensorpipe-2022.05.13-r1.ebuild b/sci-libs/tensorpipe/tensorpipe-2022.05.13-r1.ebuild index 734a2050cf07..0ff4c6216eef 100644 --- a/sci-libs/tensorpipe/tensorpipe-2022.05.13-r1.ebuild +++ b/sci-libs/tensorpipe/tensorpipe-2022.05.13-r1.ebuild @@ -30,7 +30,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${PN}-${CommitId} -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-musl.patch +) src_configure() { local mycmakeargs=( diff --git a/sci-libs/tokenizers/Manifest b/sci-libs/tokenizers/Manifest index 7c5b44220b36..b367271c9438 100644 --- a/sci-libs/tokenizers/Manifest +++ b/sci-libs/tokenizers/Manifest @@ -1,284 +1,420 @@ DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 -DIST aes-0.7.5.crate 128544 BLAKE2B 7381fe4963324b1f9b5cd1e81b2f2e3010ebb435b049b20fd1a9b37e472fed0062c63fe0a1629a59680f3c99154836a147db9561ee01dddbdeeefe6efdca5b6a SHA512 1e1e6714af9131af6a7e9546339d729979719c9c6751e4e2274e9cc243803920a7317c01a6dc20e31d730ccd43fc65cc2e9a3a29a6bc4d0c9bc0a6a3b65fe5c7 -DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6 SHA512 ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5 +DIST aho-corasick-1.1.1.crate 182812 BLAKE2B df74c2cfa0ae392a8d466e370ba761c4cd37c65773affba9a3cdcf7f5797b34b4a25e1646be3de5081644b34db2dce273609edb4f18a1ce7fdbf31ac28a10b88 SHA512 a894e1cefbb63a3b7b78a3676874d0b7a507c27970f48cdfbda1e5deefbf6b20ed4271b660a12eea77b318cd2fa0f80850a0b1ddfe0d0731ffa326c0fc295692 +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c +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.2.6.crate 19429 BLAKE2B ab22ca48e23a717f2cb909ec1fa162d40bffe198b99dc2e2d7bd80702b404ed881aafff9bd54f5091ed714573a9e9fcc64d4e9aeba8e5d2be22fc09cf97531d6 SHA512 6488232a6b19f6d187424097446754139559dc9eb5918c47429e4759b64b28fda5a3f33437cb1b364cceace655935f94d2be128bac327ac826fa588c2c1463ad -DIST anstyle-0.3.5.crate 14272 BLAKE2B 15bb1487dd8c3d7864611d85f0ed277c9226f5f046ed6508ce1f933cfd38bba870af15fe3d238a0aaf104272be28dbb9d2f3a96e53bf28dddd14d0b4de173d52 SHA512 3075963236b4b7b94b98672481a82ad1ab9d219e583dc5646bc7ebfef35a7bbdcb38c9e12c770a51809fdc4fcc510e781875507446b36bc87a69e4a10e562709 -DIST anstyle-parse-0.1.1.crate 24186 BLAKE2B c488959a2c50905f35b43b8d6174f1f1e56bf5da49e4d7c8cad7eb313eeef5a66b61d1b5f3780796b8f6f4b0702b54b112e9227054c5567c5e57ce7b1c3d8440 SHA512 366fc0a5eb27744eac1f8cfc775734226e937ab5288e1401043d033eca046eeed6918362bc9c1e76f8b2f77ec85e7f0d9a0c801a4b36790f278d62a8fe1d417f -DIST anstyle-wincon-0.2.0.crate 11667 BLAKE2B 491e1e2d4932e9d9cc170379e297833c9731c7628061116f9a590a63059005b36c41d96abb6c8ed0be3698800bda7930df92aa827d77bc7ddb2182f170c85eb6 SHA512 d0d9703e023a92ce51a0987b23564e93504d11266e049be5fb386bd7d448e6bc9e7fc795217ce139290ffad5c40bf6fddad23709ebfbeebb9f2f8e0592be9b63 +DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163 +DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09 +DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159 +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa +DIST anstyle-parse-0.2.2.crate 24696 BLAKE2B 979daa24ccc3ea484445216bddc190f148f0ad83b95c997c1becbadfb641b67834980c413bcf5b7ddc2c6883d5e071a9636fbb44f79680ac42f8b73a797e466a SHA512 28039806f87c2bd8266cea834975939b79fdf0cc95a029654806655c0662520aa497d84eefadcd9edce204986e60b62678e76a09cdb38bcc50c91e9d05c4bee9 +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 +DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a +DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc +DIST anstyle-wincon-3.0.1.crate 11279 BLAKE2B 593de9443b4c612526550285a6c156db26a233815e77a748597c6eea509ae511f41eb8ee736010f8be853695c9f1d94b034a77190e612f0a00bf00385d66ced2 SHA512 75ab14081b09e031ee0f559538976f39092aaeb6f561a56de83d12911cc2b45e28eec21068792c86a61e344021921ab55e7139ca79acec78e7d4a796dfa42a2e +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 DIST assert_approx_eq-1.1.0.crate 7512 BLAKE2B 6efc259426c5f61ce971a86dd434bad2dadc6613ee182df90d818a7f5ab1e4a8e1bd4b210a76d80f2c1fe93bfb91cf8a65776c419d39746e9f3d4aa78669b426 SHA512 701ed76e413f32d873fa670e307646924344bc40d56961887554bfd155ddbfc7606b76c341f66d64a75c882d40f99d803fd839f0ebedd35293ae47aeaf57782e -DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b -DIST base64-0.21.0.crate 72180 BLAKE2B c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2 SHA512 60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f -DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c +DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16 +DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 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 block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb -DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4 -DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa -DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000 -DIST bzip2-0.4.4.crate 34197 BLAKE2B b69f8ad38b44eb4912b33d53467492b0ebe6ed740451bdfe9133e71c47a8dbd85b1110a9607c4cc627fbabc44cd86fe0396bb545864632ffb6169f9cfa547b6c SHA512 9cd2b9159bd0b42ac908ecad41f0a737272af94ae0d6dcfe182d2f44bcea4632d32b0456f02322047ea9d6f46377db6cd083f468782bccd6126bcc75cb852555 -DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b -DIST cached-path-0.6.1.crate 76405 BLAKE2B 129b80a8ff3b38e9f376d4cedcd33258109d91c67038a0e95312f9a0ddfa65f0df5b2265b6212e6e2bd86e4cbb119cb863e95405c1eae33877d1a27294516f4a SHA512 123c5439d94273a35e86b9739ba24498d7a379e3bab36b9c715d528fbd9e376c22d4b0b79f4d73012e2da1424917088d60498315ef66a9c137fc43ee28ff10b0 +DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c +DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b +DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214 +DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST ciborium-0.2.0.crate 30130 BLAKE2B 69896bd45dc95fb38df5f6b7f0952866c8efcb65490ad64447e1a645b5558c00a56d81aafe1ff6d2477daab4050c1f69598f0a3f2a74f644e090006291b9af0d SHA512 05f906ca1eec19e903652f2cfe86de36c25f6019af0e10212720bfdb2260a90426cea3acbab6acf64cb059fd138883e5cd4e46032b9a2d7a021715243ca6ecc1 -DIST ciborium-io-0.2.0.crate 2738 BLAKE2B 6f59c4e8d9c91bec47775d96d1089fa3989d347f7138f73f73cda02842a0409d96f32ce25f371a8a7dd5b34706c457b6815aeafeac36a61e309e828f9cc2edd3 SHA512 814059cf5c32c3ca2eab6877eeb73074d38f3419c04137ba345f83c7dc0222b983166e869e0ae9f22d9c604a162555926bff92a3ff57c076d72c9cb39072db63 -DIST ciborium-ll-0.2.0.crate 10740 BLAKE2B f2ab6870bf68d238d51617e17a6a50fb7894d11d7428305fa0ef590b825fa9351dcfec02e27d5cdf716bf392d0a996ecee2a475297de02ed99c65d8fc06f2c08 SHA512 73a7507332c8d941c82e7ff8cc707168f8d231db7531fd28eaba1be341f1511cd494c61f531852e0c5e37a65153addf259ebceac70f70185ede287d93b911845 -DIST cipher-0.3.0.crate 12756 BLAKE2B a572b0140512b7512d496f2706cdfaedb680d47a283e3db8b4be97418585ed988929a3beed44012e8a9d9728cbc21f00b78bcbe376bbf57614d54ea07e4daf4c SHA512 8f0094c7786160730825cff21ca838f52801783f1f4f66755b0771595963b8b99fc926265ff502c66b94a2e6703d592d42bbed96ebf8d3a690bd5e731f0f5c4f -DIST clap-3.2.23.crate 219435 BLAKE2B e99a928ef61a7f9f6d7df2c38acd480fc86bfa3885d8b875007aa5bc855396641ca6772387de2eadc1d545dd201434037ea9e7fd138395831e4755ae5a917a7d SHA512 1f1f2ad07a0f8fbe8672f4252edf260ffb5e024a20d6673fb846d59e245a226a43675539ccd3cb252571766b1f6511c68c5cb0f2351c8086955d49c37f87338a -DIST clap-4.2.1.crate 53500 BLAKE2B 9c088b22612441cb33a501e589de09594ac2e19632534e57abbd6ae2d6f7b52afd6e720e2104668c7dc3b82d5e1fdd0128c736c7e6825f1eb3be2fee6f677833 SHA512 4d4d78e050fd6c6b9d80a417fa10ac6026787c529717e09b8dbc80cfde365eb9280aef4859ddd77c723ad50d5d0732c4e3b9abff9a4a4f184dce02de9e803f0f -DIST clap_builder-4.2.1.crate 158784 BLAKE2B 7a9508e256e1fe4fd9f1a9f7e5fc5a6b28902cd2e6ddbb0d6e90561247073c3ddf19885ee1fc0903382f4a108b2602271530bb6384c4ba17b5f4d92c47f2a84a SHA512 e3282e0041d4c38105b643de6dd9561b1a4126fa45d1de2fd7cdb18ef9681f93adfe9f073b50272212e95cf906e31fc38734e254eea1fbf2b896a467b50216a8 -DIST clap_derive-4.2.0.crate 28953 BLAKE2B ba1a598c4febaa3a2eb41fa4f0b78b79c1f0fa9e04b488c770a59fe450e057648941292f54f799766d54f979f8e0f38c145721b410a6da9cd9eb4bf3dd1a81d0 SHA512 99f509007248bef618550ecb49f77bcf8efedd0067333e97e72d4d3e05db08db8ba16f353a28a53c5719f5c6f367b8e085536492bf38b46e8d3cb9dfcd78ea1f -DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f -DIST clap_lex-0.4.1.crate 12122 BLAKE2B b06dae9978865bdc63dcac66358f7d63f16c736a9b9cddd3b25a89c8d18d5648d107c2ebc3cf756f9e20af723381f574532add12ad4454312ea3379efd92f68c SHA512 012f5b3bfd252a2278a4089bf05340b03f73866c18612b2a4572a81b3182c00bf13dcf47e61fff49eb9fb2e091602999e6c27dee275c7de7559b27955ad082d9 -DIST concolor-override-1.0.0.crate 6570 BLAKE2B bdb82a18c4fed55ce3eb02712da64a82ebea1789ab627ef99c5cdd989838408d5a540aa19380e7739fda5672814ec854b191b4a6f1bfa90cbeec594a86a0d201 SHA512 c49a96db1507b87d518fcd275ef7b4c563a4acab43a37a427fd52f844f03a5e051eaf9599b5a531f2b47555cb27e5d300b7925e97efb3450db3b3c1f4cf3d8ee -DIST concolor-query-0.3.3.crate 8337 BLAKE2B 0d4069a63d79dbf76fb56ab1aeb9992e2c32a2cfdcb02d8304b55c8fb0dd1df315ba4bbe7d7a3d5f6e6f9c5654c1165b99113ffde30eadb5e84b31d15ebab957 SHA512 6c039db27978b809d2eaccb86261532a46ebab3677e6c3963cae5a6cc2920021cfd097bf622fd6eaf2b1fb3c5ee5f07fa79eeff0682f2b70e739fc0d062505e9 -DIST console-0.15.5.crate 34788 BLAKE2B 915818e2a5cc6776a3d40f51ac85ba178e738f5cf40e5e3c1450aa731a04d73a617341dead606e043fcf66d0701f625ccdb5c787978d784c3f22f9ec0524e89a SHA512 54dc15a0c0d7e1a96a368e5866e1e5ea9d11b0b7eafd0e086376085efd3f656bcf5ec86f4eb387b42dd8cd4258f9162c401914d519a175331d0c1873794f8d43 -DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01 +DIST ciborium-0.2.1.crate 34974 BLAKE2B 370f4228aa63075cd7a0d41dd83f15211fc69267235905e7f5607f6e6c0baf64db0f6203c97990604de2ae683ca1937acf284c6444702414fe1a685ccfdc12a4 SHA512 4403239badcdb5ea6e754e706472e25c4593a1fbdfc5a07e46409ea3dac41151020204167102dbf401a2e5f31b3731267bc3759be59a73880a022e5f4a3064fc +DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05bc7677a370460549297839c4d6e913622e8a6cb3a5c2447b94b0bd17b7d5007228ea8881193d08e5b8deb072 SHA512 8d1af6a09f116e42f0098d7d0e34dd906dc3e718b257ff1a1fde655a235d40619f61f18917c0cf35c55de9160c255a9795d5e7525989037e3512807cc6a900b1 +DIST ciborium-io-0.2.1.crate 6679 BLAKE2B 1835b1002c2e5f6fb1cc36a6a1f1e3ee10423760646b00a75e5ee5e66dfd2892914705e4456ec440cde27dda04e28329febfbd5c640ec7f86e7c013a9a9d748d SHA512 8860de0a72f07d0d0bb84af3c24635193540c574cc87367c7379222bf97ed68648330511866810265b68076bd1146e0ddb41c269e62db669b1c3390aca679c50 +DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106 +DIST ciborium-ll-0.2.1.crate 14649 BLAKE2B 02f5ddca41141e426492afe237ef439acca518c448a6f8daea650ceb925f6a13517819df88c93c979ed1ad9e8411cde400ff39ca288d2de8577ec870531453f3 SHA512 214550780734dcb0bb5dc999ecf22283850bf52ee4a9cfb58d86bdac9d4b80db32f0664eef71e8197e7e56a6643ff45d2974b9a36945db2c754a98df42adf9f8 +DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a +DIST clap-4.4.6.crate 54823 BLAKE2B 0685ecb0fbf3c2c8f5840aabbb5892e88184e866f1afe871b6b75184832f75cb9fc0d43de2f07ef0350cbd290c2cb7c3d86d24120681210af0d2184c91655f98 SHA512 94fb68da3c6b43c90f05dba94339794243a0ab4780feeb27d31f0808e4efd734aa13384fd7e493ab1214ad528134bd23e15ce2e3a9f83075f47a7c856222c6a8 +DIST clap-4.4.8.crate 54609 BLAKE2B a975094e91d9aa9ccde5e79d6b46fad451dd80a1765a116a3c94e3523bc0383e51a5ce7383021b10776654e1252eb08302d9a5761bca903b154e1a0a1f5164e5 SHA512 579cee9b0b582d23c3b78fffcbef4c33ce47a67f511276922daee838aa5ad26134ba81a454bfdfb72d7e23df69b78227f0b60e57d2ca7455402d37dbbf099dbc +DIST clap-4.5.0.crate 55379 BLAKE2B cd81a1347f2dbb0fc16ac3263d0dd653d6bd948666c8e05cee9c842550e6dfa2373eb68b16159466ded6c679359421586687204c7945bbd7b7c50fd1fb0e422f SHA512 2956b6e65220188b2d11fc532480b78f0f3574dc4137adbae2519d77b9f581bc89a10ad044e8e533a032633340ff09e21dc35ceba41b8f0f2e2b8917ea00581e +DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0 +DIST clap_builder-4.4.6.crate 162450 BLAKE2B 54ba8e3402c7790ed976b4bc0033fb3a4db00e042a828a563bb49f347a60704a18cd6b77e3827db545217101d7b4f88e7176ec01f1406b7c7ad55130af7e9696 SHA512 d6dde9859015995aefa6c7f45d98928bef5120578460b1c576738e49df5a0e64ac0adae04e0f3d7fce0bc84de8b3dd7632840c61ed46c95855f7f801351c6f56 +DIST clap_builder-4.4.8.crate 163164 BLAKE2B 1d7ea3e3bedbe44f8bfb80014bc8de1057749b3e94506a83c3da6e475a67e44911bcdc6f08c3af02fb908059a745dcc2268d03fbb58d010841a2bf41645356d4 SHA512 83a3a4c81bcfd769a787b4f91b29488e65cb3d4e9e5160ab7b7289e5860a7d4058aa08077b62b9e8d10e4c1cc7c949439b677444d94c8ae00a7bebb2e0e8af8b +DIST clap_builder-4.5.0.crate 163521 BLAKE2B 597b64b2bf727186d9bf1c4b55227d96dbb819313ed1f952b2753d24cf6c7737075acdbd0091a919e6e4fdd60bbee4a1e7707bc09860e49068556a1112842204 SHA512 d0df594d0c15687d2b9c19c51f86a9fe1cfb9b8b78a8220d77b0e4d9252a850e217312fd3e1d1aae57703ce973f194241acd4e6ae0c9ab79e45d0c14ea8dae57 +DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864 +DIST clap_derive-4.4.2.crate 29019 BLAKE2B 9f3dc6f3249566c49b7a169b7b5735493cd3eb1d8211b0e7d35db656716866ed9a82911bbc0e6699eabad6cbd8e28b5e833541444a40f55a87387dc49447f62f SHA512 a111ee62021b3b5176ea4db5d3a30b7b0ce00f074b6a9bcefd1d70bbd147a779c9adb491424013ab021792a5253c33d9e38c0fe9deeb414def7ebeb9e40c2ce7 +DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167 +DIST clap_derive-4.5.0.crate 29042 BLAKE2B 80a7646b2e30432008d52e27494e2563637e408a90557e5b0009a9db6a39abfdc79c04139f99caedd433a94b45f7d95fa11b49cfd33d203fbc4bc911fad4f9d1 SHA512 0a9d79f957067b929f8e1340b0e0623f78808c5d287cae252e6508fe8e07c4f11bfa39b1d3b60bb6a531d888d809c43ad3f6a491a7dd1e3d3ce89af7e1b670f6 +DIST clap_derive-4.5.4.crate 29159 BLAKE2B 6f7087d553102f24c9de37e1ba85c0d540ea42d9df9af26b5234ccde23175180efe21df93513df49f6ba83e46cc85cedcead29c902e426c39b25086c9f79a51c SHA512 670411136c819577c0129c6fcf5a8216cac82a47ae11ce3cd97cffd038644e06c5a21f7a69948628f01fb77f1e656678ffbfe441385866fdf90d247bda036c4d +DIST clap_lex-0.5.1.crate 11793 BLAKE2B 8e3d2dc120401fdd0cf0bf069119c8b7eafa13e5f682c56499062fc09acc05f443caafa6fca791ea53e693a83de69e98fd0488726a4170db037c37118ce0edf1 SHA512 ea5e49e9a8536093f7de89be30add7c3d880b232b0ce393b0429fd4402db2518036998689817bdfd472b6400224fd3c42fec1b5f8538dc433c31dadeb6281e80 +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036 +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST console-0.15.7.crate 35409 BLAKE2B b5e34b03a1c7d5fbffe5ae07182e28f6638e026a1dc2bd87bf47f67230ead612b37ce0c79b50d84619009753bb98dab661279b77c68760a0b75ce8303733abc7 SHA512 f37213812527bcad23baa8648cd949d8ec955e1be7589ecd36fee46637e77420c2561fc301f2562dd95bb66802b92ec1da5b85367bf16b793849913698a80576 +DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072 +DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 -DIST cpufeatures-0.2.6.crate 11467 BLAKE2B 3c04a3b912e7f65d6da4b2e47029d47cd6d84383fe49bbfb88aee58bb2419f0805a0fc550a104233980a4a38d94ab545df76db8127873cf10780bf15019896ad SHA512 2b3ff21b38f61966ec63b56030c057a4eb3ce261c739c6bc6349dc0da6f6b31d06393db792696cce79950c68576bdc0ef2bf1c2ee0f456eae165af40f22c5dcd +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 -DIST criterion-0.4.0.crate 108978 BLAKE2B 8016f306593f91c74039a5cfec759d64bfac04445cdde20d535580f1fa9419cfef94453a4a276f7979551b823578cb7862f88a0f2fd1f5ecce58964a42df8302 SHA512 e6e078ae5be2c8fc018986eb8fc1432ef78fd94b93aed1f05d7b0bb195a440d0a068cc8c26066a970cdd105102131e706bfc3e05f3a44174b5df4184aa3ffdcb +DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e +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-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4 DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672 -DIST crossbeam-epoch-0.9.14.crate 48524 BLAKE2B 439eec7e5e0364af0fe0a34ffc9354ae289798ffa7480bc656d4a610101e1ef2d5f484d84f82c87f961bd622434c36adfb7a87f7fbd2c71077b732cc7cc765ad SHA512 543cb60cff7c0823733f6ace191b137a04025a2b40fe4fea5eb273772009627fb705aecf742bc59e01367d4c15a14aca73aa2caf7f4b509f4b25947e14fd1e19 -DIST crossbeam-utils-0.8.15.crate 42326 BLAKE2B 23e6bd2a6535c6fccf7b7d17487fdd4095c92a3f3ae383a72dd6d90c1c49c2ec8d96dc01a94c7127b2681bfaef843585b3ae8665ecbc43b2e7db8434e31c6c8b SHA512 adb9ce1886396bc637299cb8122d102bcc9e561f25d67ef73e98c9ed8a8b13b78bc0f5bbacab19d015e1a7690bc0201f08b3d8e82393ec347e7f2933eb622533 -DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f +DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864 +DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde +DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 +DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831 +DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9 +DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025 DIST darling-0.14.4.crate 25168 BLAKE2B bc48b27823a1a85a01a5daea47d87c2ac4b3ea48079249606aec912a4f417b72516004f17765e38f06048543708b758bf68afa63dc5e7415906de7940f02726d SHA512 1f236976cd291502229a49c2317fbcad94df54e2d7fbedebd9ac3173f9e51620ce8f2e37c78e86a63db8d9cd089e3eaedb990e58cc97847baa2cbaae58526aa6 DIST darling_core-0.14.4.crate 57485 BLAKE2B 3d284d6a5100f45228aef5e42f9de63b6cfe2b5d42f1224bb19ff5d262b0c293931ee99f3aaf1f0eb24e55bb7e04ae790389d73c624c5f00f17a280a4a496ebc SHA512 6df7e911a543e9cadd0810cd8bf6563e2f000b52bab875f7a34d229bb6c4fb7beb6ebbc4fb0e12b97f23616280a20f306210abdfd1dd094c53da35f97be27b96 DIST darling_macro-0.14.4.crate 1896 BLAKE2B e537b384c4c05103a962ff03be3da6c6c31d1c0cc25dedf5df1522c524e744446274a1696093d6f4479c0b6ddf02d27941fe959f517ede4b203bff3e20eeb294 SHA512 819fb85d8e324f4848669d32b2eecb2c2945a9891fa098eb9ca61d84588d26f0e0d1c7c482956935c7188e9c6feea0db5ae4c81bfe3d014f74fcebde80a204cf DIST derive_builder-0.12.0.crate 35456 BLAKE2B c190003a65fa22faaa977bd22beaaddccde90aa9817d28e0940da27c71b50d1b77435029eeddb552c0451303340edae41d857678316b5e1deb36a233929b0943 SHA512 3ba06c1d53f69ffca5a56edcd1173e9b5d67b9a5b00025c36fef04fa06a3046188ed503e1c0c8d56b26411b5199c3a152f284965f13ad8b346b6750ca9e00f0f DIST derive_builder_core-0.12.0.crate 31438 BLAKE2B dba84c7354018e509171767aacacb2be8e3ff566799ff693e2c4473b29f4ff93e2e785a0ac68c6b5ec4daa2f6c98c0da693b574d39184e038053589ac43b6c8e SHA512 f2e3cd5afd603273a1785fcef32b8cafbc89c422bc7754c46a9dade42f7351e3d6fcd00a5717e2617618f1bf71d5ce94abe043b19b4b6092d484955f1578d7fe DIST derive_builder_macro-0.12.0.crate 6288 BLAKE2B ee0046658aca482c8d6141d4b12c9529277236a98119a5c776f4e759ba63e16b5d25045e25a9b1f008ce257663504e26cb90c2e7417edb69c2cad38f123f93f3 SHA512 cb4a71f49c66ff91dc5a459053102e1aab7956d6003998270ac9bc94c2259b824a77689f209ff0104261ff829e54dd0900ec76c2cc1b8d3c52092961ffd072e8 -DIST digest-0.10.6.crate 19527 BLAKE2B 402009105a6ac055be062769dd4f162aabb977b9afe29f451eeb3e6b5dd1a579c371c5ec996b9c1bdba3b4ded83830ed2e1934a0505480bffba1e0d16775a8f7 SHA512 21d3c1dc64e640300c51e8a009af464d6e3cd2b10aa67c87a038165c11409d6e5faad1967236724a9a4cab8fdd88826cac1db4798245fd53ac2ff1a9b2b68b76 -DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b -DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f +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.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432 DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e +DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 -DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a -DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f +DIST env_logger-0.10.0.crate 36574 BLAKE2B d2f387682059fe9b4566ab995be449c58c57b8df5e5d8bd5ffd153aec1648721d8a9606d3f9aa034263651f5182043e08b6cc08d2d29d0a10f6cc61df9949a06 SHA512 4dd02f9d333a1f15657167ef4bd403eda5426cad17e0a4a43fa20cc65449345eb4d3fae2d6b10a3480016b9e23497fac13ed7e70b40c9450ef430be9f910d3e4 +DIST env_logger-0.10.2.crate 36402 BLAKE2B 34ef02d0f53fea474e7284fd7021ed3b44b11be2c0d0c9a66ace8792bac74d1a6b43997e0e7d043ef89e14903f6ab6d42c169bbb164f05cfe4e1688611639edb SHA512 c44131efb703eed984d8f4edcf18c77ef14036edf013e8bf445703c74a4386e4c3f4b55a272490da1ccb47a692ccde4670772c74d35c5723601c870416144b69 DIST errno-0.3.1.crate 10348 BLAKE2B 72831d0b69f95884a69918249cc0e814eb5eade3205331bec6d2021f8b01a42c4c9b494f2717033d65a4c5230c8490b6ce250d349c1e8e177b20e7e84a860020 SHA512 00d64157d066f1e7601c522c0f4e777eb662ca5cce64682f616de0734857765c343396f7161ac2908c3db0c474995ae157bfe9d8a9880743724d9bd428dfdf54 +DIST errno-0.3.7.crate 10712 BLAKE2B 1ac3a3084673791fc31e228ea3f49d334eea106f1bb6de3f9548882167d8982153e0d9cd9dbb4bde68fb9a12ea8eced99a4a128c507fe8a6ca90caf849cda1dd SHA512 ba4cd3919fefff84bd5ae473392ecdbaaec52ccaa9d1d93ae06ea5962523054d0fa1c5866787e36114a00d449a60df811a110f89c923a6acf7430d3668c2f54e +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 -DIST esaxx-rs-0.1.8.crate 174617 BLAKE2B d763ae571a04e068b640ad381e6638c92bc6d32f53f556146ce931ddbffd48e359bdf6bbca32bc4a197118d4ebb48d6dcf094189969fd509abdc05b5e57ce681 SHA512 9ab8f1019b16293987faac87790d6d848458f19602d7657ddb84db0a2e3a9640531626944fec59bcb73fcf8aafd40e24a412a410f1836dce3cf33f8500cd04e4 -DIST fancy-regex-0.10.0.crate 79951 BLAKE2B b00f5c398a4a35f257b5e92c20bf3beefa1cc6e1dc515319d18c7d58eae14de53f51b5d0be443619dc06df8f960a9134c413b10ebaa1f0766860965682483299 SHA512 19d948e4e98b3ff0d9d9680287ff0ee5c3597598c781d61fd7174cec9b63448ed3bd9fb52a2643ff4289ee21069123a0adc9c422ea516076e4e55024845309be -DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52 -DIST filetime-0.2.21.crate 15026 BLAKE2B 069f38a2c3c25c53b288e3af7372cc314f7b5aa7a094f88d231cbd9fcf935f0bd17c72cdf9c038bc2e78a35e6cb768a66f659aa535c72b7fca5452bb28a1fa99 SHA512 5adbeadc9b93811aac7e8a91b2999006e5022689c7772fc2f231d905b8c1210e1b1e14eee327a081eb70e351b3ba7f8973f492d99a138ce83eed45f7b4a8b013 -DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7 +DIST esaxx-rs-0.1.10.crate 175210 BLAKE2B 40cedcf5b281ee32e7d146763c727936af7825304e72bc3f7d39a483dab0faacbc81f3b2a303757f292ab119d7681da2622b94ad7c3f85c4e30215e92828e290 SHA512 87129723dab9588da3b0a873e47fcd1906c6089aa714701401c59d5d61fd47eca0bdad9778ac068dcc072b093688e2e5ea0cdce77f265406cb7339605be901a1 +DIST fancy-regex-0.11.0.crate 82918 BLAKE2B 55cff8d2ec3152fe46fc6ea2a6fcd13714b35a5c056739a9a15d7754badaf66873ca1093f96f61529f2b0ba0279a193754a053ed9d5dbbfcd72faef545f092c4 SHA512 7d35306e596543ac63a7b0fab145a401b8eceae08c6d7564dc46aa6f28269acabe59135b30dab20f3ffa6779f5a0d3fcd0264d8b5c19be56fd66dbf6e5c2092b +DIST fancy-regex-0.13.0.crate 85930 BLAKE2B dee797093765f8f1ea6b8896cd832983fdbeafb23828b896811f2657e135b71e374a713fc37f68ff128068d04ae140bb2864415db1edfa2e300aea04ef597474 SHA512 0e7ad0ea46ecaf9eefbeb696bc99aa725022d92f0f11b9f3efb8e81a80a058fed08816d3f9efb4c5fa0176aa1b649e13f5ea18d3352f75a7d2be772fd531f744 +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 +DIST fastrand-2.0.2.crate 14674 BLAKE2B ea23f52d745f4fcfd4ec911d48d77c60da837f57942994b17458daac7cae38953cf679459908d68e5f393d03a90cd6eddba23d2a86c2bc11ebfeed0bb41fe4dd SHA512 3ef9c21e4928071619adbad6421165ea82feb04c26ee18893b172f9f8a510b9a2097257ae31647a907680412b68d6662eff13cb27649ed9f5e68c374619701cf +DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284 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.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11 -DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50 -DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99 -DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0 -DIST futures-io-0.3.28.crate 8910 BLAKE2B 5554e9dd8548be47e7195ae8b223288cc2e765dc9feb703092972ec9e19ade825bc9d7093625a77c7dd2213df59e2c70ada84a84446b5a940c3e62daeb9dd57d SHA512 805177f2677a09d94ce5f010af9244e0e0dc285937e355a836179297c4c912a762f8d96bce57af388502810dcb67a772b7a522f5c6b21be3aa4b7ee46372d402 -DIST futures-sink-0.3.28.crate 7852 BLAKE2B 752286cb15ff37e9bf4c6cc80c8ebfeb229dbaa4e8aea6fa505f1e145e5dec99c4818c8e7ba2bd8a03898350e05bc124a5ad83e28989e282dbc132ed13e7fbf3 SHA512 e3535aaffa42215448d78adcba72f1dc3131598169dbcc8b52b82fe3e74f4b0d5631ab3dd3ac5d4315be890b94d6fd8f53de274ee4815f9abb27d40982c96c07 -DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82 -DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4 -DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d -DIST getrandom-0.2.9.crate 34457 BLAKE2B ccf7232ece1047000140ed6bb9a1afa784be87b5cf83e2f58dff77abcd79e34120b45336cb05e47fbfde36407957fe9da8b04971092ec05f67b321fde9142d29 SHA512 48e341125223945d1c02c4dfc54df303ae27d3ceca0d5a30b42065f5e40da600cb2010bb59e88af6b990d54b5eb4bf83ae5bbd27e13e56363f5f68be03ea9082 -DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b -DIST h2-0.3.16.crate 162883 BLAKE2B 2465ba9f5c34313c7b07258bfb1eafd9b14f09340ab4b0d2189cd2404656088b6ae0a048ff9216adaa81bc32fbbb29f9167dfa6788021bf245850bc122dce17c SHA512 2a34cee510d39291cc8b5264a96201ae4cf78a1fa3a6f4cffbe42e0205315db5397668f7ce8a304c45c8ace51120037b567b5a40ca8451d5d2a87ad7e0fbc86e +DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104 +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345 +DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e -DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST half-2.4.0.crate 50666 BLAKE2B 5175650e5cb9fa08a5d45ce35b76b15454d27f214d9b9236902ffab71834b342beba0654f9c85fc796bbb499a1a979b60714a5bf7666d1faf59d61530073adbd SHA512 7357a0f84dc6ae394efdd464f5a6da2bafa48bf8d794b2c34d1507d4d66af31ece8a012b58e6f76eacea2c249488a12c20f8c7e516ddd42a70633c9dbaa13bf5 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 -DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a -DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28 -DIST hermit-abi-0.3.1.crate 13793 BLAKE2B ece7865a09f566a95bfba5f1fba380bf12836c3761fc6d5a3d5543d3e50ca0eac81bb567d50b5643849cf1a752aa651a0db4c053c60faa8f1c74fe2f12819d71 SHA512 a55fe9230e4e8fef63284befff74108f206e76067257439d334d33068875368902dc690926a1feea15611f14123073867d7e9cd21397bc484cef849d6e1dfbf9 -DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8 -DIST http-0.2.9.crate 100146 BLAKE2B a720a5ea6e59d1bd4e7b422fdaa30b3b9d72a7533c5e91d1c8ee2b1dcd899309b490479ec578aa3b51f1dddeb5c6510f28136e9fd1f04d2af12d2418261f6c03 SHA512 17bbc886d34f5aa4b56d82a605a54e920a244988085d06e70bc416f8e0edfa3356544f29082b3fbf3dcea18e741ade374375dd82ebe2276fd9a9508735a1e03a -DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5 -DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f -DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd -DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da -DIST hyper-0.14.25.crate 195127 BLAKE2B c2d9b8ef0773e23b7b1746feb5eadc515c5ab63698670c5f0c3fb7de9b511f21ba310c04d66f236c8bdad9262af2e0c2a1b45d1092545276dfe04fc3ca157531 SHA512 abf06e17b1f6f5822c0447d160ab7d218124e27a1dce4b2264b5eb66a3642ce773ed060c59c784a20695c280c81cd4922b23930082945d46f3ac60e3a84965ee -DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e +DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76 +DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6 +DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1 +DIST hermit-abi-0.3.5.crate 14437 BLAKE2B 62b2d2d7d2d5d63ee79d98d3604e79705b34c3e50a107e36f06d56783f7df22debba00b135c3d9cecdd5ecdde6bb5e1e052ab7e843dfd791dd9f8eedf931f96e SHA512 28256ece8ed613bb789a194ab44dd071e48c16ce9f8d4622f828b5ffb83fdee18cd7fa939b40987060a43d76d4b76b3b78cc1109ab15c75880517661b8843bc5 +DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045 +DIST hf-hub-0.3.2.crate 24295 BLAKE2B 0f7b8ebe62f4d210b61a6e2bc0b1d4da178e0a07ee47bf5fdd21047f0465588613606bba5e03b46cdf6c415ee2a88fc2a5b4f47a2566a1683c043603688a2cc3 SHA512 a6178ae68a5c9f65f0ac4f2054042d7cee85ad5b4ec97dd7e94057bf0b9eca6d1232b790355a4cda0edf91d1bb13d6de1846c4a249e7b9ecd62a431d7b9d45c2 +DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 -DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441 -DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 -DIST indicatif-0.15.0.crate 28897 BLAKE2B 40b2fdc5962514b05a3b604c1045b864ca97f4c24a479435a90f1880cc79b2d9e3ed3f48486ac1e323b342891f8487f955c47cf3554bd9e4593b68693ad2b8e8 SHA512 9edae880d12412ad1f11d5cac004009a19540af3161176bac35390848e0a6959850a50fcfc2a66bd5ae5901b4e6af1a24286f7aede653f90b366089cbad6a5d2 -DIST indicatif-0.16.2.crate 35057 BLAKE2B c2f3beb7ac4450c5aace863f33de7a4b474e93c5d34fa55acacf971c5e0918b4b72c1a970f15395a8256fdf8bbb78edc8f2a6fb85be4aa7dbcd13d1fc30ff55a SHA512 5f60358f1fe3ffc0ec97d1d8922a7a2645d7dc0affed1d49a9205becdb36756d6a03482ef00fc918231770f967f7fc523f7b8c3bf4c06f71a0a93549c46fdacd +DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb +DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST indicatif-0.17.7.crate 63108 BLAKE2B 665bc2077207cac6ca2071d9e6ead76abb30d5f7c209d7b4a2ff5a1fcba566b331467239bd9168082839c961acf5a0522ae4c899aec141ccc649025b2eeeacc3 SHA512 412955eec523e961a20bb48f9921128004e723b405c8f1bb73abfaeb4f532ac6f883794fe6c8738a40c2e0a400a6ebf94ee17d89f7cdc98d9d0f8611d84a369e +DIST indicatif-0.17.8.crate 64869 BLAKE2B c534020b2c7b25bb07cdd0fd4414fc817506647cf5b8e2081c22be58857d5adb170082a3756004c69187619fc5625f8b9a1904566dc51c621838e09ecda5b43e SHA512 487e73445c5c7d3c16d6f93a3d9767f41b37d2832e56851154f8b69e678ab7d9ab04eba225a6bcf8b48842ae0db0249b060e998e29a252dedf8afacdc88b1aaf DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8 +DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a +DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 -DIST io-lifetimes-1.0.10.crate 37294 BLAKE2B 9b8836c4bf30e6d102fd9973ac66f067c3ff8bc2806e55f26368ebdc9854f2e9cc6eecc8014f9a0b22a968a6eea8be243fcb7a641d2d0dfc747ee08a6a1450bb SHA512 4b2cde9522780a408c5d4e6406286bc5dd3a0de1a99675129e9856e5d889498a127fd5dd7c937a7542135abc2213b60bfb6258b7871b8709dcdd79d60455bea9 -DIST ipnet-2.7.2.crate 27044 BLAKE2B 0adfa02e7ffeb48bf977206e63583fc5e20719bc7b850b4f3b2c9f934af83034478c96df1a5c2c3edecf4c58362f25cac42808191af0ad0d7a66fedef91dc45a SHA512 53cc9dcfaf4d4e83a436b739319d892e1b0e45cdf85a36ac6a8a1594b38caff719074b2c6008361b1cd40bf03fc705e9149aea54b4c75f88af2da9f20706e39e -DIST is-terminal-0.4.7.crate 8356 BLAKE2B f0f42d6f6204c68bc8a9e1290b9b059ec55f5aa2f83f6966711a5f986852befe21ac9281fd611e65cb4fcbf35dfb212748785c7258c44602e7e390c51f09dec5 SHA512 56c00b2942963f8a0b5c40c96a885f85565fb09e247bfd5a3e77ca5c9e0e0e40a17a8d809c0541177e8b496fef87baac4b86c751765491ffffdb631515d8acf5 +DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f +DIST is-terminal-0.4.9.crate 8109 BLAKE2B 0fa495da123f6fe5e3ba5f643f1ee097fc4f8e8aa54d9525b6108855a6a2e58556534a5e8dbfe7b5f8e2f1932003ac63f6aa3384317de7b385cf724bee294468 SHA512 0803ea53945715333d9b5fb18feec7230a49cb1a5f7308e2ea8d06a650e376794dd372be111e85622fd21320228706dd589423510dd010cd6ea112f185c46966 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3 -DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3 -DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce -DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31 -DIST jobserver-0.1.26.crate 22645 BLAKE2B 44bcc15330268ea29650e58605c7f21c35108eb64b790c005968955238e948d27b3d12e6bb06bfc0eb4a3fe5f9e5322bc0657200212bf87e08d9e043e008a5a8 SHA512 ad3ebb693018928daf399e918ce35ed0d4e643cfb5c78bde04697e41dc8adf2861023ea1cf2c5033a3026048ca0ebeb7f2f57a966ba8e420558e42dde8d494f7 -DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16 +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.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 +DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 +DIST itoa-1.0.8.crate 10465 BLAKE2B e518264938d044e24a4d72cab788de717c36cc7396fdbf2805fe3a3e0cdfc361c4f6fedee7bcebea6fbacff254e073da26b2400a073fa75f75523b8ed9de9938 SHA512 6171bfcd70634a2587740c145a15790e12807d2c756a25e74950daf9dd36acc662f12836c5b87e20483b4d020bc0d98a352b8e9787b0b8544bf1ee1b6a0c2c8e +DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d +DIST js-sys-0.3.65.crate 80725 BLAKE2B 9abf4a2e9678b2b2e6648f07ea879ac372a20b4ec34a271b93dea1ed57d25c8fefb6c9a2cad93b4c8d008987d98bd9c50a45614419fbde11659e5515261ccc69 SHA512 ffc14e62a936a93eb6b71317a0d00529dc9b3d45994aeaa79fc21b5fad93a6a02da52e1dbb5fbc439da66f693e8a04b39c8a03381494d355443a425412ced267 +DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST libc-0.2.141.crate 671145 BLAKE2B c0e37825ac3fba376e942a0e2c2aeefcab384b24c50a453d1948376cecb3f953d59735e37aef8a9ca7ae707fc6b4818823fae7330f213bf084e5460a82dd3ed5 SHA512 29d81f440d62fa1c9f7983c38138994e61f4897761a50a4f14abce1ced85a8994c6f0cc0ce86f77113b74495e36ddbebae6627f0b94c44621620a395a6723cdd -DIST linux-raw-sys-0.3.1.crate 932203 BLAKE2B 090e9c11a36ed26b244d9f130c87d1c6adcd81424e83eded72ffc421192d0800af27c683afa262efa8b3063f0ea510ec113664e0c2b0eb273325d2c30443f313 SHA512 bd82bb055a8f40ccd4a1cbfbf8c628c63ed609489f7ebf61b9ccb268474c16e206867c3695e1da2840c72cb26b3f646fe9585148037604adfcdaf7bfb494a452 -DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 -DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 -DIST macro_rules_attribute-0.1.3.crate 15228 BLAKE2B ab0152c6560583d0656cc94a60978541c045ea9c10716da1409dd6e52e8bdfa1c7bc59bb3a61e47129c99d9df4e846e0b32aacd0927c57b3cae158af750de254 SHA512 1dd6f07c4e88a8b12d1fc97dc89f229ca61911c13d935c50c10fb62f7cb315ccdda913b5ae978a7a6f78ea006942626f28834bb35c9519d36e6c39bbb618fd02 -DIST macro_rules_attribute-proc_macro-0.1.3.crate 8249 BLAKE2B 8026721d57d5f26aa79a45c1550e113f73b4bea0360b65d6a938ab3de61fd3bbcadc7a72eb1c5d72587e62a7c7818d85ed8e0baf9a80c59ed9fba5b6b97e6f10 SHA512 b29e12cdaa8c31d823614530aa352af52e50a1e4f91c345357a3060011a00d117dfa2fb7582e4708e17eca3332019580f5891a092ac8a5d2c4bfc08ea8f5edf1 -DIST matrixmultiply-0.2.4.crate 32929 BLAKE2B bd3c6b2d11202ea9390760ca59b7452beb4094b4a95314c1a1c596ff623eb985ae5cf2b3821d365dd2e2912c1bd25713188de07b4555a996a667cb4d6b0cfb11 SHA512 3ec6846e1342d6dddb81f5bd4495e940f011a3e048c712262cc413318c087aaa137550cff6d969873ac96bb628f6a460e92536674c0d503d5c609d9be5d9d184 -DIST matrixmultiply-0.3.2.crate 49247 BLAKE2B 7f7eff4e0c7b71d942319caab54df7b75e3bb6e6fc7c224312da0a607c78894010b870a5649b7ce20767f622b64141752c55d3ab77cb0a394295041cb2e2a73a SHA512 9a6203c0f604474007b2d28b4db5b83282315de39c775cedefe1c1793ed8b48e83ad01c21669076a77bc28a75eeb847defbcd662239854e8e32acf71bbc800bc +DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e +DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385 +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41 +DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49 +DIST linux-raw-sys-0.4.11.crate 1413981 BLAKE2B 45172cc348e758bf87831b47d2d52ea43e781a738a59654dffc04cd5f1726efdd8d1e2376cdc247019b64d82d756f4739815422c353f54f081a2c539df02b5f4 SHA512 befe18ab06e5248ee89f0cb8fbc192a5564c15c9873672fea62754322d3c197563d9133b839d5222e6baa522ec1fafc48176ee605ec7954c5d93e52dfb6d9772 +DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62 +DIST linux-raw-sys-0.4.8.crate 1407619 BLAKE2B feaaae3eae813e30d0134f2490c489b5e62013f86153115eb06868fbf3d20c3bf3856500086de61d4dd3bc8faa90cf1b7151c05f0780a69e32b01a72c7b985da SHA512 aa35a1ad8774fb65a5866bd03c98861b8b445573ccb050bd365984dcabb37171f4456ef75d190bc770d316ea8efdd162eca6c555ad5538ed6f7f7d51827e7aaa +DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db +DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 +DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b +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.7.crate 57046 BLAKE2B 7ba1abb8602370e8780c8401a4197653998af1d0aa0976a6710fd316cc057b4d6ef71d009ce71da85ebb2d2867c597e02ca2df721bcb28ab1c175ea4b7ac48b9 SHA512 40d68362bfe3ada4b8674bde0f5b0bc34e88590b8a0bb442cf1dd55de1d6dc696533221cf373da898bbf5aee83a12eac564e7fb8b2bd451e62c827b7fbc81c21 +DIST matrixmultiply-0.3.8.crate 57530 BLAKE2B 3a97130168de9dd18fcc0ed33df126f25f47a919e9f74289f809f33c2a290bc41626a743e6c446d3ed0a22fb5eecadbf29c11082704970ba9e465fdc5ce18332 SHA512 c2d31d5764cdec868fddf018b3e51b936e8bb18b131bb9899a5747ad5a4cbe892c0d62265f99077137308ea11f32254c8a8b64da07855a6c38756df42d76e5f3 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa -DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe -DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 +DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4 +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 +DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40 +DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55 +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.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419 -DIST mio-0.8.6.crate 93658 BLAKE2B 32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b5104ab7a1a3b84dfd299bc7bf7f3671aaae0a2759a56120740915d380aff05af5f5f8b9e8e22fbcfa8203 SHA512 45b3d2a911b66be556dfb79d87ffcc57ee5f33a03fb30f319631796090caf8779e94cda37fc7a76685c69483f1cc7616c15440b71bfcc51239928d8879873f6e -DIST monostate-0.1.6.crate 13807 BLAKE2B cab2662ac4063d974ada6fea5da15cbe094341aa34ab973b6e88d251d9cc4f363b94790a6d00a0b6f1976e7661a142f680b30c99a59ec017f0c8699b042ee116 SHA512 2e45ea9687dca49a9756dbe82699485857d959112da04967524c7ded685057cc3fb186dc5a7fc2006a8a238ae85dd9d67470ff47cc0c8f7259c3bd8c12588e0b -DIST monostate-impl-0.1.6.crate 7091 BLAKE2B 5685ed5159cc384fb1287f181ae132b9bbc9c5f80a4fc9c0c2792b718f8158bcf10b480ccb35af5ff7607105afd4841646bae14e664c9cac274db5fccaf1bf71 SHA512 6cec6504c53166f34d2aaabb6b3d3aacf1ae7ef7ae6b1cd7b2ce557b3b17d336afd2dd628d96890baada34fdec55ea2b63ef3893e4a3ea616c7b231e6b85a23f +DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c +DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432 +DIST monostate-0.1.10.crate 13986 BLAKE2B 26e3b2bd6be2d6bec4e94b09fe03c3a00ee615f546a1a55935ecdb42e89bbafb573d6c524a2d1d14eac00ab6c217e23bd0a9e64d8abde2c081919fc65d44c604 SHA512 8d2384d5cf78a69f4d725a1f5760354ab3a8adad103b713014544e9bf5f9f439be1568b9063161020a3e8b643da1a429860ba7938441d2747749664a7d07d014 +DIST monostate-0.1.11.crate 14003 BLAKE2B 67f94d563a2c552e21d9d22d709fb26e1df7064794fa593e81e8d185fe0d1c6f573c32e374b72f5ee9a734d349c80d7ab431602fb93518c376e6d29bef21b4f9 SHA512 3a40b97113456ee66dde593e5c47f3c154a311c81c01578be551fdbbf1fc17fb01983e54772ad6b16296c0f9812b88d532f56d9814d19b42d78bc67a7d42643d +DIST monostate-0.1.9.crate 13946 BLAKE2B 80ff108df0375f747218b3ace6de061e0de6a78c77d3eb1b3d28b736e9d01d12dd14039bcacaff50adfc83db301174dbb2464cb4f5c3418981b7175cd8412e97 SHA512 fd08981f2bfd6a79e333c039c8f7f033bd6d44b3adf26bf014d3e922cfa5eef91cad18a48f2b43358fda661f3acb56fcd824442199fecc4268d3db9ce6309db9 +DIST monostate-impl-0.1.10.crate 7187 BLAKE2B b8ff7491ed8828dc5a2c2a3e45f1f75a5f73a3ff477a03ca4b045138490c1b0317645d8deed4bb2366a15cc8d4ca2fe740933c95ff159e9e484783c39973aa9b SHA512 8548b4689442818149b559aa92d97c4790a70c6aa0477329ef8f83edcfe1a4b88fbe9106bdfba9ebbe880b1e503fc7d424afdae73d09da5dc10c0686618e7a19 +DIST monostate-impl-0.1.11.crate 7187 BLAKE2B 8e60838d49c84fef449ec43fe2bb16700b39c7827c68227701fac51f520c113af99554aa62b3777f2820e234d36e3b2e6fb9d481ecd30d477fb97f84fead8a82 SHA512 2729055af868e2851f36ff1b57ddf5deae177ee625fb9d0a98461c2bd34a7f9b03c89b131471a67025a043d145143b0e5e9d2b0654cdfbe613869aa28600c917 +DIST monostate-impl-0.1.9.crate 7184 BLAKE2B aeb8d00f1540496bff31ec5b15a15979d185e7e4d1e53d1396d0772f5c49837d712d5e4780597bb46fb5678b87c25e6af11a8cca5a70d9d37992ec0d75de8507 SHA512 be5e687eeb745634b367dd329fda5d5593b51ee5d8b29ba817716b1cb1d73254c93979b85bc3515249a6fbeacc5ccdbb59f2cadc718b78728fb9af346191201c DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c -DIST ndarray-0.13.1.crate 213899 BLAKE2B 41a4e6249c84dd4acefe911c445f46c6ae2c101b131aba93d3587089622438b834f8eb8941d3159ae49ad02af3b28553ddf171bfd73c40b57d8d71283ed27861 SHA512 8dbe6eea8c04e477f57d9693760424c4d2adbdce65ef8a047fb3b09226f8395e91fbad3a21c71a1d0242cdb89996bbf7eea435ffa8c58c37dee03af9913eedca DIST ndarray-0.15.6.crate 275225 BLAKE2B f17e028e7d57670f136d777dc2bb720dd52bc3d9fdbc0e2de5f5c2fcd9f6310f0bc39299fadbb53e0d1588e1e64d9f2b5daf20e30dd95517bbfa597b9572581f SHA512 19037ba1de0ea5f8e0cba5d8735d6192c1674007529289a357e9c5e036a1af88b48ba8a26b4929663403159f6700bd00d04becd9b1fdd4c07990bbeddfc20ead DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad -DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea DIST num-complex-0.4.3.crate 29523 BLAKE2B 7f6af07ca78b00ba21f04931c473b2b725c61c78bb74b3bcef7b10a0fb00353c06283da02c056fa8cd4f9949476392054dda56ddacd330abc2d1aea3317e9ebe SHA512 64f1e6ee49f162a190b9aaccdebdf5d4f1712645eebda7877437f58859c5d8d4cfd10b67a39098dc964f9c842909b10e222aa8a2159575a7bb19352f753d3d99 +DIST num-complex-0.4.5.crate 29614 BLAKE2B 32277724d5336443768a299c835cba63906ac91b85c57ff0e57338902e32731a0e67a93c647e6a57ae53a1b4a961c8b9ca2f6937a275e51a58089378a9646e8a SHA512 7b607f240773e4f4ff1954f46b2ee85be1a4f012e2d290343f6178543d10b69c0e9e1a93b0df8efa013c3914ad48321e1d96a4578092ae4d359acdc239ce1ebf DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735 +DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8 -DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f -DIST number_prefix-0.3.0.crate 6291 BLAKE2B 24b232d965aa08a092d6bd65f0d28e5a93c7948b4831ad42bae067387908513a67a81dd85dcc8a2ae7d829abd6232409abd2ed4a15c993176b1c056351177998 SHA512 014c37c477b1c99c20461dfa6deb1692d93f10c592387bdb757d9220347ec7bfce5861e82029286cf3a64e9d53427cbfc40549e358c3fbaaebeb73e91b598107 +DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e +DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df -DIST numpy-0.18.0.crate 65263 BLAKE2B 51cc77d4566c99bded9438980fa1f19a71cd7d668df040857b507b048fb2e628b06ebfc07dc2d0daa26fd556d4170efe82cc34bf5324b5f07362ee65ffcffc6e SHA512 00b21d6a7b6235fcd6f640ecb911b960d5d1d74655e3ac15b7d9069b17f5ff2c12e2d5cfe1bcde99cd02d989d0bdec86da52f34fa12804e931dab797519277fc -DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904 +DIST numpy-0.19.0.crate 66304 BLAKE2B 1ea519b4a34e184b49f2c08388ef4d47a0b081bf199eaea0de3e9daaa3d89f0584a4005f7ee9a0a85b5fcc1b16f1271cf779bc1492173907c2069c2c891e8ff4 SHA512 fe6d1ec55c5e88afa82407351502558a516c7e12bd799001a7f0624a385f6ee4d109d7688df30e8502240d22a75eb9976aaa3ecd209209d04a6960f3481441a6 +DIST numpy-0.20.0.crate 71258 BLAKE2B b6e50e0d40ce11ade5298324b51f3204029cea0988264abef819b2cfcc8eefacba5f6ded33ff2de2791eae4fbf88ea0f5e1738ee6692ddc9363488169bd16dee SHA512 bb4184d540b01d6983d05c409e8508e04735d4451e2c05f9f3578bf3a731f9065eebd6bb309955d6abef835f52756c225a4d5c19f99edfd6760a9d92f630540e +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c 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 opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae -DIST openssl-0.10.50.crate 252262 BLAKE2B 29c9bf06ed36efe7a44c98b0c0db4561fbc21be2217e55d2923c940a9b032ce5303df4dc4f4bd5e4b225a3d47db091402d2bf5566c1ef9a9c6a2be5d8002004b SHA512 9aa1dc93c5936049be135b5d00eead50be9b40bfcc27871b4044642e93e1d26ccc1aa78176776b7f35bd5c8ef7c462c98da19cacc9448d025f86e5bcc22f593e +DIST openssl-0.10.59.crate 264765 BLAKE2B e7b9bb03ee1a58aa519ca5a647b4e12d1ce748543667dc8a81905d72a4cebfc2f8c0f01ecd9e63dd691a245be29f37e7752fd820471cc27f2395995d57f22e41 SHA512 3f91a953612fbce7fe9f2d9f0b74cfc88ee45bc6cb8f3ec18536631ae786ec9a09d7afe0fbcf4d299e508997df804155156d80cfab6b3b7954391745f8629494 +DIST openssl-0.10.64.crate 272306 BLAKE2B a8b618aa403cdb06a7f135cd966775f21c99739365c55aabde2680a6154d03c7d554bfae6c62a069841c70ed82ece6c3f0cd589da8c26022b7022c3c4d79a6d8 SHA512 a1fa9f71cfebbb37ed9d4a902360f2cc95a78f55b5da5d51eef69db38cef016fc03236485158d689ccf054e04937b8cddf88e3f0f31672997fb30c6cac73cbf6 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.85.crate 63150 BLAKE2B 5c96fd2fc82ab8a7900d01003c2a55455be5277d232027e4a932e9af33765d6a0ccd32f936ea09f802587d615886e4e6483165b7408f540b5fe44feb6111db43 SHA512 37da552f7d74a44538a86442b350dab80620460d80d02bd7f998b35c7ecf10a18cd2ed2da6c02f193e787fa98aa22659c1d2befa20e4f183c52a8cada9787604 -DIST os_str_bytes-6.5.0.crate 23166 BLAKE2B 60f5beced502b7bcf165dd2bca2989f9039fc22cda80bbb09d2ed0eb115831c6e0f80292e656f4bf9c0b0635ad10210c88c1b23bcbb59b8d2729b6cda473ecd7 SHA512 cde7779ba24304256cc57de78208af4d26bc91dae7fbb9c85e3f67c3e35cb6268caf3fc9eef530a8d3cbdc951ec3534223f3559d2a013561912231ebdb1801b2 +DIST openssl-sys-0.9.102.crate 68622 BLAKE2B 0d3d3c9ef8e2542c7f35db1d8feaf512cc7313481bfcc99354d601e8d6332adfc2e7ee8b35599a9241de35c163efd840186e904375bdc9c65ee743abbc154cba SHA512 7ecfaa0b49cea5c60f6f063fe5217252a65b27c5e6d1185e0aa1bb4b59c4cf9bf326840e8795a870a537c18ee5a987feedaaf2dd767cd6f1380f25468a1622bd +DIST openssl-sys-0.9.95.crate 67520 BLAKE2B febe547d6b1d357bd864d943b88f70c9b4a2118156f205fb928ce18946a91aa97619caea30b4580e5013c7bda6bcb75322df4be11a519db6ee6013d09b7e8855 SHA512 8a44009a416864c4deb42a9112d25fb87e2f03734a77500a1851b576d94f615ac69d934c1938f0b78fce9f41a5f8ba73586dfdc0f7d980f7d88ed920235f6495 +DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c -DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0 -DIST password-hash-0.4.2.crate 26099 BLAKE2B 3f211d467d43960c1d767111c679d2ee7ca004a14946409e37b4e8ea46848100095bd43ac5d4e4ab31828e6fc09e67eb0b40e677dffb086f711668c4918c8bcb SHA512 f6b7da81fa172ed37229894c426965182be1a445ccaba4351b91ce43ff1ab8cacd205b321721df49dd43ba17dc6a77e9b7cccc3a0c396572aa7ad642af44926d -DIST paste-1.0.12.crate 18156 BLAKE2B ab4426f9f588de4c50114421c4f9a0bb2fb5f144e9cde5d0d8ab14b3a451ff5219a99ee1cfa82dd48cae86f70d205dd8fef591651e443ba118bb27f7446e601b SHA512 fa75129e5463347ebb871f2e409463d2f164e1d9cf7160aca044dd280582354cb3286df05d56acc209174e371b577996a5b99ff35f12810610172bd9de21f98e -DIST pbkdf2-0.11.0.crate 13229 BLAKE2B 33a9fb386ab9550cf5b8b54a48b8ad4582c95c1de7b15e767caf7b08d5996677f0926b57c556e43e90daa099fadfd1f5bcddec3bf4a48a82e7c71228b5398dda SHA512 f900766e8e84d865670977bbe5816b74036f0c2b3a30df4c8ed73680f76f0ae111472af7aed96524cdf7e1092609c2008c5f40efb9a9c65b3a796b7f3415c087 -DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68 -DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4 -DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 -DIST pkg-config-0.3.26.crate 18662 BLAKE2B 2ad92dfdc8ac0414b12a61dd30ea4ac5f142bbb55d0555ecfa3a53e750367e1b11766a693ef11f8cbe5a2ddb978327632458b2bcf75be7aa8f973262033349ee SHA512 509c4d1494cccc20de6a62d9d037c63ff77ebee8d907747c57ba0926d177b08fcac0231ccdda14511b453deb0b76ddd10f8fbdf63ff94257d72a12a889546435 -DIST plotters-0.3.4.crate 143219 BLAKE2B 3121caf7d2a62d3dd337d887ea2343981d23b26ab742fa192456d58a73ebd07d384ad6e1de58671b5c06344c2efea8e32168d830051d425a63299d15746f3a73 SHA512 04d490ad1b822195259a661dbc605ec2f8e190a5bbbbf549741b286aa888b26a2c7468d226cee7718bd69b77e026283944367504db98c0293b3db4ce45103534 -DIST plotters-backend-0.3.4.crate 13416 BLAKE2B 2b7090fb98ab9c28fd8525e1b3b4ca3410dafdb80563f52b545af70db638899123455254861e95973fb9c9e178e83cccd941c7305977de033091ed957291c28d SHA512 4784da70eda90a48aab38192619cfa7df733519cadc3b9aecd339dc735a9237e03144eee4f22f5f03ca214a732e8807d179d455032dd255a8125092ea489228b -DIST plotters-svg-0.3.3.crate 6916 BLAKE2B 74c2c71afefe1148c82f8695ca3ae5283bad5b084e542325f3b6d587eac23f9fc087b64033043ff52ebcd661d40bb91c33ccd0de3c424ac0916baaa3a69c63b6 SHA512 1233eece4ab91ec690f93c7134ae8e6405183aaf500b2dce6973b6e212058334b7335aa80915e40363b9d2057398028c57d0b3aa974b88bb42c4e0e4726e7a92 +DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd SHA512 8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256 +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 percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a +DIST pkg-config-0.3.29.crate 20563 BLAKE2B ed0559b0073890911fb47742743b2586123bf9e9b594aa0d5b2c419c6768cd37e25b546c21077ea6cc02823a679b302aeaaca6c7fcaf9aeec615dd08f53a1f6f SHA512 bac7dafc0e10bef40e427c1fc0271d1a26acb2f5b1cf7cc7a128f4d4f1f3110529e45057b71cea7b0f6ddff26945fe08962285ddeb22b54639e44a2e43af698f +DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d +DIST plotters-0.3.5.crate 143975 BLAKE2B 57b9b37d9e5f43f12f1bbd95d0c0789a09b2f34b30278c62d8637f341a901ac4c0d70ce4a4f869429a43cafaab637d2f25af3eff12354b0e85b184f439c91320 SHA512 38bd608db346161ffa04c50aa315bf5d5eb2840490c5ad6722b9e294b8aacc3c434a1c6de073d2a29cb34de6cdc6260a227f9b7995ffbe75fbb8783708f50045 +DIST plotters-backend-0.3.5.crate 13440 BLAKE2B 72ba042a2057f7afebad34a794df17a0c340ae0d15af2631a3f3abbe117dd8a8d17f877dd935ad59f33494c523664cbd4fc11e05f6c7ae0c495b5e9d4c4a8708 SHA512 4468e2619d7fe47cd03fefa8b1d901ddf5cd47b2899b4b9082cfb695f315cbe415fd57efbef6e0a67eb51dd8edad530c15442810fbb87dfc4b7943b1a7f55460 +DIST plotters-svg-0.3.5.crate 6948 BLAKE2B 1e8df5cdf68b1e27e22ef2f383a81caf76ab598d09f31c536e86c543df78a609a33c3c426660a34a37d1313cc2937b0c678c5e1e43fd3d65bce95b59b2531935 SHA512 91c4955f62dbb8d80e01e5cbdc7ad5f1869be6025de1d2baeeb9198fb108ad8f01916cdc0728b7123ed9217abe92cdd8ad30116dd454312c8f63bf9cec98644a +DIST portable-atomic-1.4.3.crate 126291 BLAKE2B 08fbfd391c9eb55c02b8345549a57fb5c3b8cfcd81e3867ca49cba94faa7b2d372e4f2996fbef4a52742d852b117d4b7cc488571df7272b93caf47a9a2680c46 SHA512 89f14902c1e55c37d7663bc9255378441a0951e5d8e21665a8102e06b766135cec6d982f9ed01b4167e872a7853102ad0e9347e9b163ea81d81b00ee2362e9a0 +DIST portable-atomic-1.5.1.crate 140771 BLAKE2B 947153fd068bede928976294a3dae461cc8c463e45c8fab4e80e338e5383231ac76c369a9ed2f2b59c186cfd81f64a2215a3d206191f46e758c6ca5fb21ac570 SHA512 edd024fc752300be867aba01987d23b4b165c8fffd0d56771a0e91f1cacd2174951d855b8255c25ce5d7e4311d2ef7cff94ee04a508a6307519e184e01ac327f +DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a -DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03 -DIST pyo3-0.18.2.crate 418755 BLAKE2B a45c27639d9c4c5a4e017b7e8d7580aba285ee11295f344809e30ac23b70e4541f2cb765dfeee20fdf4d441e1449f5cad4bd6308a52822eea3595305081d4b77 SHA512 b97ebc10939418d7fe3d6219921875cc7253f3aa7cd9d06b1486f8757c6d102377eb851b3a669c670423af2c80e389b736f0ce04a6cecb716c952413d06fe434 -DIST pyo3-build-config-0.18.2.crate 29138 BLAKE2B ad37bacda5f0e5c8eaf382b3371de251b83c721dc2378a0bd3700462bb65273bcd4277589084f6af0a2959f17b370fe5e6a5699c8689107220333c57387bf0ae SHA512 01f544938d83a8283f5101f69673f8a39d2052186e7c712709be25c5ae17a11e7d68c2fd9b4bc7661fff9343ebf3ccc196c1259321061f048c59696692601ae1 -DIST pyo3-ffi-0.18.2.crate 62903 BLAKE2B 31e52b73705c1e5f44e419f314b1674a722a604fb52be5d5e5ff2ae9881ec9f204c1f51760570ed4c210ea530bd9295a27beaf9b5631ef02370d42d3e4c0be18 SHA512 495dcf45154ce89b8cd3a3fe193938e199465cf510df1713f7ad82e0a138ac2f8f1b73ec80f8af72f79a4ed26a9f4e4e93d52357ad4f41a213ec0c7b602734b9 -DIST pyo3-macros-0.18.2.crate 7173 BLAKE2B dfa5792be03b3b1164471ef9ff4ee672fe8e57d0fc169ca04da1542d86262e7e526be079e303b8a4899bfa4b0680d38604f80263c71b33ead5bf0a60871f473c SHA512 a2c367b4b1556b16304ef0da4ed8961cc760d259da9fbdabf791ac910de4f1e9f193227f10ea4215a52c701bd0ee92311dc91d272b9364017e2f6ebde5698f72 -DIST pyo3-macros-backend-0.18.2.crate 48722 BLAKE2B 662822ae71702cb7d173c1ac7ead49cecde0dc4545bc3f5f30fd9ef7fab5537c13509bc8f18b2a8d05d7fa7f6fc8d0378a44d67b85edadfdf6ca153fc698a7d4 SHA512 433d9287bf3cdf84291c8d04ca5b24ecab2186379db554d6b2cf271e8716a890dcdc0717b2a00267e85dc637520559ef8e883bde2e2b16dd8cd580c1468c2dc3 -DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9 -DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5 +DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04 +DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1 +DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769 +DIST proc-macro2-1.0.79.crate 47200 BLAKE2B fff8e514d618b8ef60d6a4ca7610607641cb25701fc5e8452e0db5f942a3c38c724acbbfb0474823fe0f4864df07958c1524383e7640105266608f1d5a741368 SHA512 8bfa6fc1022556cbabe0050a37b93c5ef1056ebda9d3dd368e705a7c695df9dfb5cd5adc18ad1eadf7338631ad1d5ed6f63f0adff3616429ef8c50a930b1838f +DIST pyo3-0.19.2.crate 418228 BLAKE2B ee018b33383fada78cd22643aea9231a8c8a2f19d1eb297f40eec9206c5220f322fff4c926d939a93a24ac6d231a207ebb25afcc0709191151c7ed9af7465efa SHA512 58698183e0f2f0507f8f765bf3e90185c933e78d62f0a9be65c4b1ce8eea19a98fe0341abe7c58cafdacb63a012ec417876dccb7be6facc1360fcb22796fcaf9 +DIST pyo3-0.20.2.crate 434326 BLAKE2B 3114fd6f3fb8ae7d1b35c9d2ac5ba6a49c5ac911ee3a5b941c5063263ca7cce47fa4b4f7ec34cbfe3083f3d1303fd7f061639fba833a04fedb9d5098f5784028 SHA512 cc5151a116179157046ec92677e5a72318b4cdb13a7d7e3bb83778739b5758040e5020f667dd83554a66b758581a08f5de05eb38e7b339813cec85e0712e6355 +DIST pyo3-0.20.3.crate 434673 BLAKE2B 1dcb881fd1fe5c76e9b4951f4d95fcd1daa1845c226a4ab1db4283cabe67bda822ff03e3cc85d797fe4665a1614229e7406dea65ec5e99ce4aac96b973a7f55d SHA512 77cce558fa60bbd8d9981ff5e62fdfa9bac94bd650b287fbf14ac93ef1c326c8ae7fda82d744e3582df03cab8adf490e0f2752fabd9ae3de044e7d80984e0350 +DIST pyo3-build-config-0.19.2.crate 29206 BLAKE2B 5b1cd80d643e448cf8f1d28a514333526061c178121b9a0dcb5bff6082f402ecfd166536d94d42065f6dc1f108a73f12bbb78eedf9ea053a6aa2e9c80ac00ddf SHA512 ccc73061ec1989258921c5b5800689170635fa5503d74a4ac458baef903dd31efa41995d238783f1e099ece1f66d0a0e95c4fcb4b772b9f653dbb20e838b4e28 +DIST pyo3-build-config-0.20.2.crate 30029 BLAKE2B 846eb95d1417a658763417a2750dca1c55201105a3978d61b1db5e3962680ede188f8285dd7deec778ea9860d43e40513b88f5a54f0b1881b08416760bdbbedf SHA512 9dbc669ec69d38716c3909fa8f3b6c5be13c717b20bfd5dd11edab59b8eb35247d7996acd260fec88f92eb3e71248c86e9b40c1a700827889e2990bba20ecddf +DIST pyo3-build-config-0.20.3.crate 30060 BLAKE2B ef122b0b7d840d5362928bac76e1299b333775ec5c49a3bf23a19eccec074917931356bbf719c6d700999941bb6a396948ee7f8761e685c8e9251af07ba0cadc SHA512 70685415bba443787dabb9c61ca3702aefbcacb0705471b496b4f01efe34291735321d91243355b4be9aed8b243e393c09fb65556f1b926ac7f22f64560bd927 +DIST pyo3-ffi-0.19.2.crate 66500 BLAKE2B b4139fba31ef17017b6b60784e41ccda34931a072c2638af1eed8d02d7af701c46fe38b12772d2301cff41d10a433ff0f00a69d79d40233eadafe82abe585f8d SHA512 789191bca537998dd23d72dce4f185b84bbe700f4171c47de35b9bbca15a180ad214392b4f465cc1ecb0be955ebec1cf5a3c497815073be18035bd8bf8c51a32 +DIST pyo3-ffi-0.20.2.crate 64601 BLAKE2B cf1141ad34a13dcb46de0d1e15dda192ca41a7441bfc92a9295861876dcc690d1d5d6d39dafa51cd70c4627353efa91563eaefee8c39f655d12818003f9524da SHA512 ee6386b6fdb80689d104f9cd5229f02e1893d00a52be710bd36882c47305abbe24ef2f3cdef8200fddc0bb97e29001fa3a2fd9d3d2673ecd9a104a070420d01e +DIST pyo3-ffi-0.20.3.crate 65024 BLAKE2B 33e79a02c7ab85f4767e02a39d8553ddc015c80d13bea674885ad8a18d89bd90f866cc39d81ecbf56270ebe87d29bca48f635c4e73ec99df02ce425f1427cb31 SHA512 3d1ced58e243be7cee4a3ca831dc08a1631fcd511c707dd3bada87d7662807dea2d88393d76e56ff19a6d1c2804d93b5b6b7b5efd36b9c275d66fa1bb1bfc384 +DIST pyo3-macros-0.19.2.crate 7173 BLAKE2B 8862f42a30929579b0b0bc2ba7f0b416518724480e197fa13288e49324e851f964183e1529b7f31bf5d4fe0ae194a412723b6b401100e66fba98bbcd9c283866 SHA512 852cc2792aa3d30d9ab8802a451be5617cae6536adced1bf0dde71704a3c7c1bfe862fba751b6d045249819a8ba5d87dfc50914d142a0b662f046498c06f8c2e +DIST pyo3-macros-0.20.2.crate 7925 BLAKE2B 00fc60becfa39bf452786d8a612247785f1737cc3e627700d0d144ab2efaadfb34ce8a8f46e932382a1ea99caebfe1946fbc517b5c26fadb0822ecaa8b2e9df0 SHA512 dd9ea9acda95dfc53689a4c26d8c2139f8a90a05ab06737037f19b8bccd5e52b0da5f297a29194b958f5f8b59cbb566b5f409b3f17a863eddf855ecb755d2719 +DIST pyo3-macros-0.20.3.crate 7920 BLAKE2B 0510accf51cd83390cbb7b6ba4ec9f4610e3dbb7448d1213994013487ae81bb087df1ba0076a3862e5ecfd172b7846f9439a2d86950a93b016aae565ced4f03b SHA512 454f3c0c054aa131ffe955e4be1af061005b9c81b4d80702827e19b983224c118dfea474da515d5fc2c79cfd3fa21204ed4af2d9e81427123e0a78bd246a23f8 +DIST pyo3-macros-backend-0.19.2.crate 49962 BLAKE2B 9d8a032c2205f55d2431b6bbc40df153339e08479df3a8a65506ade7d1f3d17cfaf664cbd09eaec9acff3f5a248598e37427d0c5a531eaf527137803adf49834 SHA512 fd708e6fdbd54ef7c676bedc62070175bac6b8f7ae11231578196dbf552b163a8a2499a1266f786bb6bfb85517fe83610902137d59a5c42efcb1a27c4235a07e +DIST pyo3-macros-backend-0.20.2.crate 49710 BLAKE2B 711b18984e61219555df4b62667f7f376951c6cb47e6dd947fc24618b923c4f4f790eb1aba1901abea4761632cdb58cfa81cce91f33586da3022e6c7d126bc9f SHA512 c6ca2a2cdae8630fba3f8e4122e81b60ef2ef0905ad2a3fbcfae134456d5ca9e73690b61590e391f3b9d82c24725809f18544c5dfa0b36ffdb1914844fe65d3a +DIST pyo3-macros-backend-0.20.3.crate 49797 BLAKE2B 59c55d482577ce105db3e19a1db794eaab8221d7de01197716b75d5d2602e0f27c86aaae527eae7098eafad311144550bd597efe8cd6560c82dc435021f3428f SHA512 e177ee0d6a538a555fbe9108e3e2c20102622b2c9b9696ae309189e5c4d068efad2132afd4a97d734ebabb4d7146980a26cb68dc05d5eb88f338be2ad0cd651f +DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f -DIST rayon-1.7.0.crate 169488 BLAKE2B 518f0eda1fcbd1b1b230587ea18cab0023a699e796c819bf35a6492b7edb051137446bfbc49aaab0a68aef8280c970ad14301a9f8f7461d537af119a65b33a38 SHA512 d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3 -DIST rayon-cond-0.1.0.crate 9615 BLAKE2B 25f0197d6853d7ae66a48fe9bec2dc52ec91b0f168ef6d15f59dc7374150a4cd1e94a5da2c1b0a5b42938cc94066eb63315f4ae1d341cf282c2a6cf7af9ae818 SHA512 0efb35055ae87d09c888a71ead70862c4336e7c6890cfed270d944765ecb2ece579da2f465aeb4bd1ff470a29be53e350f95b09e94c44674f207124f6e1fcdc8 -DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4 SHA512 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800 -DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 +DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3 +DIST rayon-1.8.0.crate 170172 BLAKE2B e2df52c64435926a13f4f275c4f25a9694316aeb02b73856c600a1a813686ceb20828676d8272393d1aec18eac4f05bfcdc5ef02ff1e19245c547c0313a2a03c SHA512 ab1cef238530d81c255b6631ecfed9cc4f3f8d7cb6a74701d29c1dcb022cc5b859db1d246cf8247d47702fdadcedfe64a6749e24cf6c7258e8c9411af7e4524a +DIST rayon-1.8.1.crate 170448 BLAKE2B 982f7ba7d6a43956e6f438921fea2e40d3b398f4f72a4c89f55657aba6aa0d99912a7240b1c32c1dadafa9852adf440e3153a3f0cc56f6582867fa2794bb5144 SHA512 a83304be8334f5aa1c63468ddc749d8e8124c6947f1472320ba0bd4351c9ae582dba31ff369e9efdafdab439571fbf91b497c2370ec15406cfa810f5161cfb32 +DIST rayon-cond-0.3.0.crate 9913 BLAKE2B 4096dc35abfa825739953b92e2eb62822761e4f0eb3311bdb4a0e1639b4453fdabf49c5c6909d4f7ea3c1a674f55acee2d2cd4d116e5a30620ee62ec853e4e04 SHA512 4cd02f2ffc2a7f02db6b1c0468fe8ed78ea092c0629fae448542c11cb8c065883f6939b610dd0e0eb1463dc240aaa75117a5d910cfe5f4eab6a424b774f4b249 +DIST rayon-core-1.12.0.crate 70081 BLAKE2B ef1bb1d430776b0ad49aa523cfe83bb0aa3a381b2e571db74cb8de04bbff884b8c269de31d7afbfd609118c445bf079afd2d4920842c8a8b312d329e4675cfc0 SHA512 588fa479c499e1620e25c5818996f0376d3bf526272af6c50a17ca0ccf0f8f67b03a3a665938575a86a8edc1f101a37ab01133b27f904eb5c291bbfc581135b2 +DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde -DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda -DIST regex-1.7.3.crate 239886 BLAKE2B 8d9413178b626b09243e18a1c5e0336cd41e05659128d4026bd551df0c34b9e141e36c3134f3b22200b18828ef89082a08515047159afb4f4960e5fa840fd54b SHA512 f7e8dbcfaa10c2443b9a6dfa514edf0e149d33f1a135e4a828adf97dbb0f1af5a4b58a2bad75ea8cbecb9641f499b30ed06b8ba60c7eaba79409ca18ede85e4f -DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e -DIST reqwest-0.11.16.crate 152152 BLAKE2B 38049b8583f52333aa877417c5c29ec46bcb5e39308eb82d1ac00b30eb5ce56db72d10ea1add4d00e03e2caff9efcaad6be6ac84fdba7f40cb828ce452f6388a SHA512 949cab4b4cf91092af76cba5e6d14b6211699f6ef237d4f42add32abb0cbdbb4a14b3460d6d016dcde64ef300fc7b9575d0e5e6afb8ddd38624504ec400914bb +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST redox_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269 +DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4 +DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3 +DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d +DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b +DIST regex-1.9.1.crate 251978 BLAKE2B c5a049a485bb78cf27501b1c150d922ad56fa26fcc4594f111786cda8879b21573cd0b629dc4dee81e579a98d3ad2620a08ab97c5d0bd5abb1fbd1f8eadeb3e1 SHA512 cbee57ecf620795eb2625cb2a6a3d6eb2b46de91ade021111f8960e31d8d0098b786ddc1e97734cfa16f7e68d77ebb8a9b7362542d91f2345bf2e4f64778a454 +DIST regex-automata-0.3.3.crate 604301 BLAKE2B 56e385b6b6a759710c1edece283034580ab47753c21be2aeff97d267a00bf6086fac7130ddad35a7a296b50b3abb4fadd034e67ebad4eb25b885d8ae7847d7f8 SHA512 c09bc62d3357f69f6908fd1a6eeef37a6dc862bdf40cc4559bc76f30ba14f7e5e3677a86426b6eef60c76ba83b933a9a685d6efef384c1d6644079aa673086aa +DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 +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-syntax-0.7.4.crate 343365 BLAKE2B b50c01f02e08729496e8bcf023949d088463bf62348b4a1043fe5205650da37863b2ca51f683662a4df33bd56085e0501e50410106c9c471a0daec4c71dfe945 SHA512 b33713c71f6f753820ca6405e8415e5eeed457efd01e81b0b720e48c135b9bb0973962269587ddca31350233aec6d3f598596cb48310db0633bf67f8970f0e18 +DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd +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 ring-0.17.5.crate 4147790 BLAKE2B 452973d50f89d676afb71057bb32222b9ee3c9ae62392c5552e4a9c4a1afb6e64b222fc6a5f1cac80a65e21a8f5576fc4418ce7be3056b05fbb2bb44a64bf23e SHA512 d4fe515031ee3545d257651d07fd23c670b313c64a26af33fe93bbdd006219908c1d2ff1b382ebfe3a85e8aae1a69f0693ccb640edc0a1f51a3af783c20b6df2 +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.37.11.crate 313917 BLAKE2B 12b29f09ad68029fc2ebeff12636a2d06f3a5663f6c8d1df814c9347119f8af0ce8357fe6bcc2f4b6512f859507e2ea5fafd91f7ed03d7ec329668a581e47979 SHA512 206d76b080b6f12788c28949c7f1b2798b184bc8a0e38b5b8ca01e43f25a823efec9dcf3061652998048ae5c3ab769bce0852d7238a75d12008260cf615117b5 -DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13 +DIST rustix-0.38.13.crate 342118 BLAKE2B 9fb31bba5253870345abc513768b0b0deaf581212462e328edd7ebcaa028979454585502ea9b4c93b82701ad08d134b637066f81204b4bb2a374ed5747c36acf SHA512 66e3914746895222963ab80da0fcbbb8489cb74dd37913f57f8570258265a94657d7dea37c944ed20543012bcb474ada3c50650a194554ba74fab07c313aab93 +DIST rustix-0.38.24.crate 362601 BLAKE2B 0f0f6b756c2165be8e4de422f807c41ca6bcc2e0453e5874619f9899684bc91b527d2fefae7f2bb7d83f9d2d58ab679fbafbb73955a740701388391d0551cf8a SHA512 ffdad60074692e29d20ce9550737f09cc104bb7343ecda12a4955316889082949b7f35fb566d593ee908ff22f007abcbd498fd95bc702aa965ceca922d76d483 +DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 +DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6 +DIST rustls-0.21.9.crate 283537 BLAKE2B 38db2b38f33223591571af2829017b64c1f319d03295281773a70c4419f1072cb4651e0d4969eb19be467fe6f09039eb0ede2b315b4cb047f0dd3ecf9352f8b1 SHA512 b2be86d232ee32855872bf08d17b325c91b90ef7557154cb9042b072060ef2183e3d106420fa20d3887d0981c810094fe801c66aad407d1bd735b1b443625069 +DIST rustls-0.22.3.crate 332877 BLAKE2B 02b6bbc7e66472ad3fe19aee0ecd5faaab06f148eec7e4f8b4addb0f5da07246f30c6331d764b31ba7612f89a1f64e60146972ab09cd0c006de030f8cb44cb42 SHA512 2289c7716a88c324976812911ca3ab5e15cbc852d6ea03f500bca3af7b241faab66fd52468015f4f83aea6b7dc1fcd468390d7b3f768c561293d233841509b23 +DIST rustls-pki-types-1.4.1.crate 29437 BLAKE2B 82aa975c98e9d583ea77e6811fb6be7f7f35b9535748e38ce67424159f1a4147b0f0ea690312151a331a03b446b7aea60c13490f3ff12ebe6e9f3369c9116337 SHA512 abe47dbd2604fd4db0df59412ec8f44b6dd2cb9bf5d67e01be6c5428daa3924151d4d996b33af387a31564cbe29e1ec1e9ea1a0ce98e7aea19d8bd7dbb0d66fb +DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68 +DIST rustls-webpki-0.102.2.crate 196881 BLAKE2B 783877064d2cfbc9078d33f081b2b1edfe43218184e60a8a3b3917ba0a3ab97a226f677d4bf4addef5d19d29ac63a8268dab5bd3cf973d64df866e3e71492f9d SHA512 697d44daa5e0a8ea2d12aa6f68026eb63a6e1c4420ee92656c9479df77e3f672ca2525442be55ab6183111fe594ac85661647150326223129ec23686792f6014 +DIST ryu-1.0.14.crate 46861 BLAKE2B 208fa87e54e3c6831193ddefcdfa7e9731a3b72de6ea23a4af708a15487cf4d6cbc49fd3681da078390741595ff5d44b02e607cab6ea9e37e7f5f05c7275b4a9 SHA512 9832c760d1ac674ba362639968962928971231d696e450738045ca36ae2780116ad865b2bdd96e36f14d8f92e12107dc8b75be90c74d76e3bb834a94bd6e5599 +DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b +DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 +DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c -DIST schannel-0.1.21.crate 41719 BLAKE2B 8e3ce88c460b44839a46304c5ce6c02ec518a1f094165ae8589107cd32b79553e1c7aab581cb07fed4ef5935822ae4af8141f63d70e1f898a10e75377b1a057c SHA512 7457d4accd0096c791240aa19970307c6448486a22303e3b20b7fb25c326e50edb8564781e3d81ecb4a7626796ef78233c224f9baccc0de03f0eae2086624880 +DIST schannel-0.1.22.crate 41642 BLAKE2B ccb512f6c6765e5245dcee607b7886411710aa89d317cbaed2f511f74a927a0083042653e070c9d4b976ec83a74f3f37218f3ecb621781ee367b774596227f68 SHA512 6ec962cbd25f25dcee5e31b5012e61d38b97a7e8651a5439ab4cbc8ab33a0e2ce04fa22e06a82ef8750001c6659937ffd8dccb0cbd6971f68b0c354d0075aaa0 +DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST security-framework-2.8.2.crate 77045 BLAKE2B 8581e0056fc0422aef0122e4948d6244eebdad0935c73ac1b01fe31de19f730325f11446dc3dbf5f1ec4400de099eed1d61caef5b8e318365c4dbf9dabab3be3 SHA512 6abaf2129cff62220f152786a36fd4728c72fb2b55f3f75b396ffdf4344902077c8c0784eaaf07e2a4d9311f833298b46372a968b798dd838ea495668fde1be3 -DIST security-framework-sys-2.8.0.crate 17911 BLAKE2B ed066e2cb8986930bdcf55060fcb5a34f826aa27d51ba4236f8a8e56de8fe3a2b33be8da14c64c0809f46c0dce02a20729e6863af2261a04006ac65a291ddea7 SHA512 5e670f5f5d54f2bc11e05435b975d5d26d990d6f7446613dcd5be88c3cd52baeb702931cfc663fd5018c8c99f4619c23e57f31eea60b15d3a5e7ce01a291886c -DIST serde-1.0.159.crate 77014 BLAKE2B a377be7b7a0624ca9449d962693100d4ee892a252b4fe1326dee2057a214029ecacde05aedb7f0adcebc9815e6b4ea7ec2096ef4db4c55526defdef88a20cc25 SHA512 4e5373b940b5328fabca35759e8a02816c89692b83996c6224be39365b6409688ef2db0eef24219381003133a31da93a41b500a76aeb1b84c05df9a91ff4844d -DIST serde_derive-1.0.159.crate 55039 BLAKE2B 6a239fe8b045c5d61e3503186325e2e4fd3cdbd13e6727e79b673f894f5fdd0872419b0b0f6dae97b9c3dbf737b41bb4816e92fc6a0efa0487350bdb0a8dbb7a SHA512 ee05d53cc4e7a36ba6073cf0be235ff4606e26430ab2a25379a6b915378c8c76584ba77b2fef8125edacf4effffa37adce8e51109e3f5bc6f418987de90fa574 -DIST serde_json-1.0.95.crate 144618 BLAKE2B beb05d7c37fcbacf4cc7dc04380e818a144a81e20e09ac9aecf6488bc18b142713bd1e9c7bc2ff4d10dd2385ccd280207cd992380bde4616db54f0852141eb0f SHA512 ff9f3f9e9a0e07956923bbac02288915c31f5ee24fc618808bfd4aa4b36ec40ec8d0e4426d926bdbcd019c9a4a6608dff5a651bf92dc5663eaf69c7c060223ba -DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 -DIST sha1-0.10.5.crate 12146 BLAKE2B 476a0c365ab639a0ce427856787595865a60339fd6b81a45f879ff9b9112021d2c3a62e0a817b4555951131a7fe257d0c30988631ddddc3d217274c46c79ebe6 SHA512 1046b91a9ea64b90098ee6e16c63f0620dc7c2dc847d200972a3da3c8d1ac61fa9030682099a411cdd24717b64d488e0b1be1cbe8f7bfee26b8c15cf4f8e5e9b -DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c -DIST slab-0.4.8.crate 16928 BLAKE2B f20603e1331a767c3f55b56d58bbdb9fc126794a116db128fce6d204122c420e9a65478f9f10a26f86c045dbd55a62556862f4339f3a41419f810bcfa9fd145d SHA512 1d713a217b3816a1e6c230d4bb52c32c90f600e64520f0c339ea8255ee8aefd887d969fa23497f1bd8b2b1f7dcb4b220957889746f04dc3453240b5f28517192 -DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae -DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f +DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb +DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e +DIST security-framework-2.10.0.crate 79723 BLAKE2B 9978af62742c6f58c6720a7a9d76aef3627531a4e5cb2b131584727237ec743eb1e688029c8abfcecdc8280b16e6fc85fb9c6fd93be65621363b0e3945899a83 SHA512 693944670032db795ceb944b187ecd96f094449fc801cc5f8b903a5cf117832a4db97c23dd0ab6d66a61da7ab56b5e9433b5993cbcd0b8dfd88f96e819958a5e +DIST security-framework-2.9.2.crate 79295 BLAKE2B 96be139f2d2b9bc2fec7805c9e90f19f68fb6cf3f09a879f1d5952b502951900fd6889451c6866e53394859a0f8a842b4a674c4bfa82cd71f48195c0af365475 SHA512 fdc58c1c12ff849af3acf34208411caee50f30b9d55e20ef9d3922ee37664c606abcf90c4b415e5c22498dff2116fe2b2f374a0bd382c837ae7d281cd1a0a54a +DIST security-framework-sys-2.10.0.crate 18676 BLAKE2B 4c16983b5bad471b18c52e34fb6a2762097bcbb0891c7c8a8423777e01bb27341576114f6ed90aaa80cc3e0ee264b3bbe9335886565f7b2a91e37f0ac3f555e2 SHA512 10c006488bd52bffba72f7aa44cc58e292c186259054aa85f882c3f0198586574a9c722ba80f101710b867148e823596f8d1ead1b6a753e6b50e702f5fcbf904 +DIST security-framework-sys-2.9.1.crate 18284 BLAKE2B f1484b6b691f3616192ab363c81eb3d6279ad0bae6bb7fbc4eadfd9fc6b6bcd5ce42fb8edab1eb8934f40a1d42714eeb8ca3616871e8f80c90318834901e8ca6 SHA512 3118d1e982d94c5fc6e8ad6270ba398da98a042c7a2060eafb3b78a54491091c46529bec30d4f871744431f01b828ba2a795f695cd20d008441839f3c4350462 +DIST serde-1.0.171.crate 77630 BLAKE2B 84b4377c78018a9d32a1a3841d26111f2db8b761f45376abaf0412ce456e0bbb39b287e460a8d99e217dcf0ce24a461488af85539ec127672767fee0b44aab7a SHA512 c8db09da8845e102e209276d5747a28d2e7b12ab5297d24156062c61c6ac8aaac8789d6e91a4f939d1f674375d8c3d3d1e372dd248baf63fece3740ea6f68bce +DIST serde-1.0.192.crate 76866 BLAKE2B 4920089921e23bbc9180d413cff34277683db1881d7e65c5fd9dc8bad2beae954d2429c9c2049b3e98bc04314ef059e59562c936d6c767681e75b84aa0a2a468 SHA512 b34cea6034a14a6785b3023d0a1c2cb5b1c2756c28f02ea20ba62a657ba54e9d04096a54c4fdde3ff4094913dba46c99713828de4287186bf9dd3f7d89dda0c3 +DIST serde-1.0.196.crate 77097 BLAKE2B 22403615511a7621a9d8d54fd2dcc63878cd2de0e43bff6b7921db85e19f34ee5022eb1086890edb6987428cbb707a59277ae007d1536b5d80a7da615fc3f36a SHA512 0917aa36d855ca77726d538fb7fcfcf629722c784d747b3869c0d69444c447d7b1fab556a9eb9594ddf6cc508df636fdde051a1c3909f9c691e4921946ebda19 +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 +DIST serde_derive-1.0.171.crate 55183 BLAKE2B d60c2aefc4f7ef43bc5ba9b39c9d62d5a784aef205aae4c90c9fe402e872699ce7fb0d74f2c657cb6862459d1dcba39562a7f4a0915cbe3e2c45a9f649858983 SHA512 2561e5105c6fd6ab802ddc04dbb4392450c7eff6709f39ec8ae43ba73138944879330f9bb8de7a6cbef3507153a22007a69d6e27d0acc717889ac91ea195ef45 +DIST serde_derive-1.0.192.crate 55690 BLAKE2B 1e9706fdf38880989cf907c36d1f72b5b211fc6f263a4ee35d5f7106aea0a792fd79a3361d09f831e06ce0a43680647952a8478bd1001f617d2571be428b5516 SHA512 67ad208291c8d7063adce4bface5d963488c43a326e77a89970f86f65e8f77856e173d134718f64eb80dce67283df1951022c12300dea0b4d9570fb7f637643a +DIST serde_derive-1.0.196.crate 55775 BLAKE2B 3d06b3896f0cdd1b1acdcd0046bdbfd1e8a298d6f07d12a2326ff144baaac07fcbd4af1d18b8b1188d4cc192e253fcd79860d1dbb2ecb148025449c0ac954c72 SHA512 f4df7f835e8416e4662c62a46d5f6e6d45ffd103812d681b220f8080310720e27f738a34a8e622df722fed55a1d8c654dd4abfbd78d1fdc871306bf3985baf22 +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 +DIST serde_json-1.0.102.crate 146070 BLAKE2B 3b1cd8a40b8569ed933d105eb1e37861339b7fc98d0e3583e91a976d8414244daa17049640a4f44d7c1ed604e13c9fd6d735a915c14be0ae0bd5bfa0e52a5979 SHA512 103d2fae45bf5b723ebf8cae4ee1734a06f9f4c93dfa3a9ae58c633942c92c380020cbd7913e870baf9db27a51feee505c4a2fae455a7b8c6fa76c82f14b65b1 +DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6 +DIST serde_json-1.0.113.crate 146970 BLAKE2B 8d80b0fc913ba4f008175c6b89955870af6476dc8bae0cd711b748cd0a2bf67b1299396bbd492a1ae5a4ff8050fddc85f0a0ab54f7b24e27529ead3e3d7c920e SHA512 82571b025cd598fca635f18881b52db2364e07eff1b961ca7e3b0591dd41f95503f7188ef1ee6fbc060b9a2360cacbc8a5b85c01fef7879ae3392b29c0004b34 +DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22 +DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7 +DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d +DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d +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 subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a +DIST strsim-0.11.0.crate 13710 BLAKE2B bdc748ffab302c8e1d3412663e300c399ba13bfc0e15b07101a680394204af2df8897ba784dbe57b95c4fa9e732439d0f5aabb090b1b1c81f066bfa125919419 SHA512 ef4165dabaf8cbdd6c58420043cff9c0d1f4bc3ed53de5973b654bd71ac7d462fecaa6e1b750fbcbb8e19b35f6e6b73641a17656b20f5562b6ba7d84e69de226 +DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c +DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d -DIST syn-2.0.13.crate 240619 BLAKE2B 80536a808aa671424fd940d28013b96988b0f51c29400c5fe1ca7e6789587c670cef7e746a527701641bcb9df73925ab2fa581ad5f877b2d5cdec31590ccf223 SHA512 940ed62d2d5676034292e675ffac2fbc495976ebced6a295cc4da8914e9e9f059275e892e0033bebfd26e3692236c504dd36973e7f62b8e1943f19ec6491d9e1 -DIST tar-0.4.38.crate 49158 BLAKE2B a344a65951c5c39212ffa3cfdc7dc68c40a85dbc5e4aa08cfe7cf22f0216443fa081ddba5e8fadc48968cc8e70e08d23391a6caefdf359310e5880741c9d6730 SHA512 4b6458734811e1913cb7e348f32db16f9402fd0e0027ae867db81aecac250b35d07d9478cdae4e27a609ce0f29c9d61683934296cfc3b371119df9f2c380a84f -DIST target-lexicon-0.12.6.crate 24357 BLAKE2B 5d9aef958155bdc1b546b9940083cf81ba4c638525e2d46340e50c4274764b39ac19a12214f3ff64a6830524a2ecea9d555db3f07d5d7dbccd7dd809255c4499 SHA512 63ccc047d10ebff55c3b9be400e2deafcaba7beb28ee67bae6d5df58e7c08362b2c4e0004f6daa582928850701969015ad43714c7ad46df665474667ff4db58f -DIST tempfile-3.5.0.crate 31129 BLAKE2B 6d32584819794dbbb1f30970577ca2c82cf79979f94b070327285ae8bca6f8e3ea2402d2034290472f284ce039a3a578bfdfa81a53b5c49b587dbdb40960f6fe SHA512 8e8775a9727e32f6931b3289d2b8aefa5ede7b224ae2e1937da3aff371ef5f6078587f060eb36793e9779249992a97acc39c02c6095c41467929e39ada12c7db +DIST syn-2.0.25.crate 241421 BLAKE2B f8b06686d0891a1d50d5f214836e43f518aeea443cbb7dabd2563c2399559014b9d42b7e0d1dbed2f4aa5e644efaf2f5f8b37358f9e0140efa231a62348fa1b6 SHA512 2c07b24d5bec7463da97eabbbccea3bf82aff5a74d7ffca6ef21f66420dce369cf77529fe722ce77b019b9085a52feb900f707b6aee5ee088d07035ae191930b +DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 +DIST syn-2.0.58.crate 254920 BLAKE2B 64c3e09adea47f5a5f332416e75ba9e86d1d20e208f859940b80986884b3456130a842685e9002416803d0f8a2b8d61e6d2ec518929c8ebee09a1142d9d77b15 SHA512 168196da11cd854e5dc7e37bfb50b229ecc3a73f7992f36be431dca85a7a1b4ee61b60471be9f6303fd29de6747190701cc475c4b2830fe31f678f102e54d387 +DIST target-lexicon-0.12.13.crate 25424 BLAKE2B 5fcac231c270a59b6589adb79c90cd3bb15ce024e3c5fa3fd267b3226e5514ce77387c57c86ca765b43ee593a55ec99fdc8fbfd464dc01afaa91ad10337b6278 SHA512 323331857bd3db9877a6c7304392e39d378439462ae4f6d6939c02d28914ecddec52696c94ceebfe8a0e7e93ce25c900099bb3922d7783643162e55c7a8769b7 +DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a +DIST target-lexicon-0.12.9.crate 24532 BLAKE2B 7f09be1827a5f9563b842c38aff659432ec61b66b814ebf4cc8a963daf6c93e7dc453a6966aa02d3a886007506d2b993e16ceb047bd34f6d206de76a39d08dfe SHA512 62033617d4587fb9d4b3159c78dbb628041d7ba6c5849c27a5755f173a7279aa4a03e56d31e03f87adfae50cef49eb6f0bc5eea1f6a131b87c618330d19d61d5 +DIST tempfile-3.10.0.crate 33376 BLAKE2B 303e3bbc2492fd965c5e5ca02229868e94de1b1286175a07b3f9767a174c5a83bb6f6ab59d582f963f9cc4f92362be6a8e898e140397e4314bc18bd8d4e13249 SHA512 0f9bb6420105badfaf7e59f9679b53c6e3f875208ad8b08b9bf38cf67a1512742f1e3dc586136ec9cb760d127da6be69e9f9ed55f18722edf1af3a452e7d93fa +DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39 +DIST tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f +DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 -DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 -DIST thiserror-1.0.40.crate 18709 BLAKE2B 8057ebcd11546f8b3ae5d760c1dd1764386f3c29dc43bc7a4aef20604970c65356daef137734e80260051d41e39979943bfda496459696b924a95f455159704c SHA512 db1b1fab3aa61dc6bbc672670eb70cee2f838fa713d3a927022900eddde253108d123bded1aa6df8d314e1aa2f8ff37bc72fc9b0803fe3a56447a64290ab2a91 -DIST thiserror-impl-1.0.40.crate 15138 BLAKE2B 7590428b5a97efde6a823440a9c91e1d1835b20df4ad8a700c1eeddd98516f1203605853fc6dc65528c5fd92480d04f9a8412aa7c20a524cb94435b0a0032f1d SHA512 9027f2d4127864c34d2d92ad3b2753a95893d26f5b2dcdec869884a98232c5304db1700a38112ced258e5f3832218cdea3a4bb21223098e1b20d06af1fd7edd2 -DIST time-0.3.20.crate 111856 BLAKE2B d4fd3d3f9fb164b26317fa26788014419902147c7f17816a09565590245acf72019fb57e88d4f4ad4a399c5dc92247af9e915fc5d2168710f81673ed609a055d SHA512 689099bcd5cfea6b92d88584d92e7c15163f427f621c653026e3b3f8066a3932836de3f8be9716a41b77f1d36a9fa6c3e2a42ab011d21ca38efeb55522a39145 -DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c576553b202d178a64d46396958745b00c9f2aa60a6eb609d663e48b1f9bd1f7ebe58ff6e22540e96b2b1c7f2 SHA512 f7e181a40a0052d7aedf78219a46f8876618342c710e819748a87a5bc0728e5b2fc7ba08e38ebfa6a17d6fb60382003bb35745ff1eabac1c8f8b47d186a383db +DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a +DIST thiserror-1.0.49.crate 18912 BLAKE2B ec93a21ea72626a0d49d87e8989633a4a1c6747e3dc4f183bd490b52488ded6fe97e60d0db59da6e67db2c2181ac13eb903a9b77bc8df7f61de77fdd73bd1c3e SHA512 a6b0476b9250f2a1555ad1f528b062fe7683f7aed338efaebd86b967e58d08f03ea10b4b6c502f4b6ccbeb44cf773b7511996a8504e541c1ea6a6efcc8cc2814 +DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46 +DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c695a200aae3e076b55948791cc51a29e8818d64451b17233ed4d095d0ef63ba4fb07502f4ffde5af738b8629c37 SHA512 6b7c856745256d6ef9e7ab2ea0027f9c1ed2c75ed5b075068af57cf706abfd835fd4552d9ec7578bece1f820086828c5dec85a9cbada409569838cdc9d63936c +DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578 +DIST thiserror-impl-1.0.49.crate 15101 BLAKE2B 7a097705408155ff28e13b30c9a84e5da5cbb2ea60cd586f2bea303aab8180b4d57dc7edff1b36437376c04aa03758c4ba573492118785c3cd1f12b70d77de66 SHA512 dffaacf5238c81fa5bdd605c84c7d064695c4435b5927c0a7ef8975340170252d1361ad48c26116663fcdb0afaec0ec0a63b5f613ad256d75bcdfa3f0659a437 +DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9 +DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde +DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e -DIST tokenizers-0.13.3.gh.tar.gz 639405 BLAKE2B c7c773fffda4fdeb126258e14288cc3ddb496c0dd17adeaad884e30911d1a185ac9f70b902d3b628b76aecb5053fa6dd21dd83fea32eb7f3f35391450acd5544 SHA512 004b68e930cb9191df8bc38698d0844be779f7d984e4d75a831f3f46e7d85f4b62f4bba17aa29d382124b5ddf474c8bc49555a4533a16ef0a49c23c1c99fa118 -DIST tokio-1.27.0.crate 653991 BLAKE2B c474285ae456eedd001d13ba6d1a9cc16c581dd692ed96c98797c11314a402861f43a9fa5fa24d47a4ff3371dd609f774a1d03a4272cda48a07d227dcdf0bf12 SHA512 d7c36e07348a5067678bbd7729c59e81ca71ef6d9581e5cefb122041b1a3f693f77ebad79382cf4dc8e38fde5cf731cdabb02adf55f297fb7b4907cd42775b09 -DIST tokio-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914 -DIST tokio-util-0.7.7.crate 100405 BLAKE2B 97b701985cce390acf3fcfdf4bb761901e8e64ba29fa285a822b97668b4f9a56e13dde3085f7b63025ff58f9ed3726c29a0f8dc412100fa76d7ac5ba75ff24b6 SHA512 d33edfc594dff40a7f76ce84a740eb8901eaa95aa6cb6e2308aaf23b4543dae2ce7f7c8df5f027292777b65aa8b00618ef45dddb34b53b1981ccf1650c01609e -DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 -DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75 -DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65 -DIST try-lock-0.2.4.crate 4467 BLAKE2B 7afbe36d02ccf31351c7c7ca4415578383bb4d0fbf89ba2c5c7835dbf410326fb0f6cb302baf7c1edccc4b193a2ab8079545fd67f26a74457d116204f3c6e745 SHA512 fbd989589eb0a1fb226de65537d51eceab632603e69710b37708d6109ed09c07333189675d5e560e35cc836e5cd211c726d8ce247186b5ea4529328d46c22632 -DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2 +DIST tokenizers-0.14.1.gh.tar.gz 1516228 BLAKE2B 814da77b8c909728662ca000a19b88357ea1c3050e6b5875927729ec20a285a8579fb6be29bc8e6e3025e3b907fa7f31833ba1f71f0e52f1793bed2647d8de69 SHA512 b584a93aa7b07eeea6e871eb7f90f0a1965175ef2eb3dd5ba422c82dc57f5c551f5fee882e3387a8df32baf1bfa17bab7516cefb105821c3e53de867dcd7ff84 +DIST tokenizers-0.15.2.gh.tar.gz 1519789 BLAKE2B 38e705cd2eb72ffb7f0ed8ee1be4db75d3b9662c24919f1d588c55a91d1a01fe057a19cac464460cde7971f595b0518e594947b6da2c632e90cc771519890d23 SHA512 0635d074d98a74d171a5f113c1b6f8b8c80c9f36b2d3b82c18d90d3fc1f1daaec55b7e98f2d771d5b22593b888ab4561e8f3e3152170c22605e034ee84d6a10a DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 -DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088 +DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8 +DIST unicode-ident-1.0.10.crate 42039 BLAKE2B 3365850e1991b9e572c6917a35f3c85523d921d5ebd9fa7025fbc1ce2a0518b06aaa9f3e3bfafb47d357226b5b9964145c7f1b5ddc16cb7280542f6c96f650ec SHA512 5dcc24e138a86f84cb05290332d02953b0ca18839ead1e74b0319bc361ea449700e04d62a51e435cba266121e463643e017718d3023a84f844a59e4ca4475686 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5 DIST unicode-normalization-alignments-0.1.12.crate 91546 BLAKE2B 18aa85b935f2bbd4eab91cd160fbfc75a7f919090dd5874162d1ca76851c53bfbaf1b0e3aa23cdcb2b7a9f15e576736521be1fe45c9ff7de6db23cbc6c59e78f SHA512 b51d9096088c14a84b5c179402b1618f26b0e9bf5250ee86c9d5e26e318149829e3e57802a4c9e437c3ec29ee31ee311491e683abe50ecac5432c0a593478e6f DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b -DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b +DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef +DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe DIST unicode_categories-0.1.1.crate 87298 BLAKE2B f52b83d204b90ce0ec26e0500bc80b0547610f3417616603c4e837fbec0a41a6a715de19f88432f4c15ddb6b2ba55ee75a472fb7e2c888accfc77e1ef1d85fee SHA512 2d15499ee9318ee54910d657339820acfa88183e4f9aa146ac655129d2c4d76d3fd0550b601702ad2ccac4c8647dd2f26528d8003f39181e09b8ef480351a3cb DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a -DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d +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.8.0.crate 112867 BLAKE2B 60409a3d3b271a1578986f5d99c14c8c1300b44010d32cd52f3e32885eb0ed36cadc04b939f2e0d81a0b30f21be433f4c7428b0485c75217b00ed0988c29fd43 SHA512 3b398a52da98e9350792d29eeef8a20d4689a55210df3e30d3e1786d3c5e378c3a144d64b3728f282a07e7e701ce21794e6c50eccceef670d7f5bfefd5da0333 +DIST ureq-2.9.6.crate 113677 BLAKE2B a795b9a3b0985daf2bb27e489b32387693bbcaf32a126b083d584693a921c8b3dc900987846209497d468b655d30c9b364112905cbad870c6758aec28a5c3268 SHA512 c2c860006e33146589107aa191552530749c143ab93a60ff3fa959dd53bbd03c48d7f4b410ecc4c92c28c2b483ec3c2c720373a6ee54ef8f9c31b069da205f9e +DIST url-2.4.1.crate 78228 BLAKE2B 6e324237af50605e9285889d967e6a66e258982c5e78ec99b2df68cbcc555574c0b0d650724ecb015e1065c737c88e3c04205973c35b0afcd63f222e91dde3f9 SHA512 ff2aed100e405f4474e17dcc01d59b63460e7a8babeb7cdcf9df6c1c65216c425e24d557f76c7097702b2befc381656107bef755ce929089b52a3901c46aa185 +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 -DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 -DIST walkdir-2.3.3.crate 23125 BLAKE2B 3bd354b9796a31bd4c8f4ca695514101a7837ae2134fa1ffec20df1cc946a67b38c6b50affbc2cb79ffee0934474d8269378dab5ac49a4943ccf8c7aaa51db11 SHA512 2b6e1e27c16e310f636eb1c9ee58435509fb8f7a6c5beba4dd13d87aa1d91599a593bfe720a675d536ce63e217c31e240a57122455d8e18de1282a9e7fc3defe -DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404 +DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9 +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.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d -DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058 -DIST wasm-bindgen-futures-0.4.34.crate 15117 BLAKE2B 7a6a70d07e021680dad6ae9d4b800d153baa0ff51a2bb7bec59b4c7878335ec3dd9cd4bec1cb7826683e3d91d115671274d45da5148979623dd9e1736a1c7d1c SHA512 6b822fadaadd4b0edd2c9ca264bbc611f67e6d3eccce7034c3ed1a960dc673c591ef1f8407e58ae740dd173a1f1f82d206840f35a10b1f088630b79bcd0dff74 -DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43 -DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5 -DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010 -DIST web-sys-0.3.61.crate 706333 BLAKE2B f57cb14032e2ea01b5e0ffcef0988ee3e8227c1da7d27ef8799583f64cddb4bcfbbb145f5ea1889006fc9ff61d42b1c02d4b278d67371c9d914827113f5e4128 SHA512 dd8c93a92295a9cd94a4a4cac4a81d9fa41c2c0bc885c1861eae5cc317a0d55e1a9d34b97b91999bf617a071f7f8acc39bb0d4a684b40543519f0cad6b82a25c +DIST wasm-bindgen-0.2.88.crate 181311 BLAKE2B 94be99405e6f8d821aabed65928d03b3f5c7062afb923cac6088e56272fce4b928a03ca693b9e3bc2c7ac5b61052a3b2c1b9f75400c95814f29504c0f255f2e7 SHA512 21c50fa3ba6947e53fb56a57850350b9f5ef11d7281e015bbd564fa07a702b9e58b9ccd22bc6d870092e73ae51a9350f4c7f5a019b279f1cae2fb85a1f4ce80b +DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5 +DIST wasm-bindgen-backend-0.2.88.crate 28181 BLAKE2B 791e6bdc0702631dbb959e788db0f6dc2675f48c6d9e15f1362f153dd32a6df85b598a8a415143626dacdc17c2d447d0147c885f373ee6e0503446d96af243ce SHA512 717a62c8ed07adb29cbdbb1edf6f47d47eef2ad6fd9ad1264b09189d785bf525a6f09d1cf362d6a337d5be0a2ae8614e30843a33da73c2d22b6d233b76fabab4 +DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa +DIST wasm-bindgen-macro-0.2.88.crate 13908 BLAKE2B 49baa77009d60e05464d438a97bf4c72a5357f79a2995b88bd2a9c73823b01940b23d90b9b0d7e01bcf3c1c31988b015ba029df09aa1595bcf560000fededc33 SHA512 df45cac130bf787d08640045839d8e9fb1b10720c0e7def84862fc6f6f8df1a3c775870570c210279488eeb1700dcb6b778ee22fd23e5a2ae5572603c2fa3d1b +DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462 +DIST wasm-bindgen-macro-support-0.2.88.crate 20008 BLAKE2B ce90104bb631d00c4a1c0e056c688c6b88f95d9a4d58d474185313c5b38d0b81a660bc4c6684d8b70215140fe6eafd90fe9448e56154ded423616449ec30c750 SHA512 46aa40e5bd55f8ed3a576b1973c6ba7743675f20623397421fdd56b1f5d43159f7e7b3ce4acec0fe5b04a6fba8cf7744cb041e98844b0bc9e6542b06671076c2 +DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7 +DIST wasm-bindgen-shared-0.2.88.crate 7264 BLAKE2B d1934b4af13257b9be90a26d90e0a13927efd4ff794ac1e90cba4133bab58f4941045e17e2b240489bfbf6e35107ffd5c7cfc4c9c37f2112d4a7ad78fec435db SHA512 eaffae8a98a1b6bbb186fc5f6535654171c19a763bc9ac2a79758e5ad2710537ca4de92228b99c7186322f94205f9623155f20d039fcc2d56452340c3bb9330b +DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07 +DIST web-sys-0.3.65.crate 734287 BLAKE2B 38891902fd194962dfeabd71ec799727c87bfe119ea1a47fa1ee52bb074792de40fbd2a7d65f5c2bbffb89ee045b10e1f6a464a9cd1e1830b9760a92cc1d96ae SHA512 870eb6cc0fc0cdbc9facc79c34ff98086a53dbc840cf17b16232b13eb2e79bffe75b792eaa1ec1a1c3d601e282687c8e5592a1ec2389bfc818873eb0639cb53a +DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b +DIST webpki-roots-0.25.2.crate 250405 BLAKE2B e603f95c1d05a7191b00abff160f52063945ca7cb8159b40da3b6934703ac5cdd5a2ffc36a6437e62c9bcba871331bdd32e2cab606b56617027bce8f66722c10 SHA512 7988580df398bad3d62e6ce9d19afc9af7c7ad9d374533c2c67fccce930243a2712c667da9bf02a7624e88dfb94cd5ea04fcf58eda006976ca27e5c87fcb1002 +DIST webpki-roots-0.26.1.crate 249748 BLAKE2B 6a2468eb2f868c65c599d2f6664798f75e77cb7a7228a2c7285ee5256cb01d110709474feb389991f12ba0d143211770c6922932c7fab01b4b0e37b612cbd453 SHA512 89ac53267d850953aa78550a60f58f5bcb0f9e885c4c448911dc55bbb8dbc3fb845cd7545fc40ff26998b0c360756de85206adcb148ca6190e50bc2daea7f61f 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.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd +DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47 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-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9 -DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22 +DIST windows-targets-0.48.1.crate 6902 BLAKE2B 8e6cd47dea52131c66983cbf4982e88f7bd30416dfae4e380f7afb39f67ee0ac88d40769668dd5aba40d4415f9f00cbc2ac98d598506fed26029f5ec4df3a2c5 SHA512 e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows-targets-0.52.4.crate 6310 BLAKE2B 0393bf3e7f8823edc455055e9977798bd6cdc1e523127cf840ee1b9e36febe40e01dcad9875a06aea283dd55443d02f643d42752103a5ec1de933285fe410b17 SHA512 4b2c26468df54b9801e6badd120dcffc15429fc78a614f45efa16d5fed1a36983198fbb621cc3beb4a4f9f0161ef8ddeca3a5c6a6ac48b5589681936f4d2bf50 DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1 DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711 +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_gnullvm-0.52.4.crate 433373 BLAKE2B 5678cf2371e4c566b7ff0dd1fabcae92d12ce9f97670524c93fd8c34bf6b09d054e7de2f852302b8d994f52c81015b7cc8a74f529490c7bdd17a3b5d2c88a12e SHA512 dbb914a866873892a8cffecd4ed4977fe6c3fc48a58bb9f88655d86e7f8969cc27e6f5bb7d40eee41ae7d78f6f4be65d46650719321a7697c7b5b99a0f07a5dd DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63 DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_aarch64_msvc-0.52.4.crate 828055 BLAKE2B 3088f2f66fc91ad698906315eae7e6c0dd7da5414c28cfa25b24e138fc4a7da40535be09129cd37b8e331d8d6e8c41d0106fba1ef9e5b4ac561140653e9ded4d SHA512 dcc538d0a9c276e7ec415575ec1392bf476219348984d9567f56d5cc7af0f9beeac523a9a6651f763dd4f50f89535a3ea2275d5321ec022c2ee8814e4e84e95b DIST windows_i686_gnu-0.42.2.crate 736236 BLAKE2B 4ef0496462afc73d9d72af7e5da1e6d3506a92f8172930e88ae64ab97596ffd31c4f97fb969e9b677e30159c27f00a8e756deb006b630fb98ce83f03c8b762e2 SHA512 ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68 +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_gnu-0.52.4.crate 875736 BLAKE2B 31ee3017a6db246b0d5fc02e10cdb517a69ceac3dbbc9d41b4051f5dfa1196e4a46e7b3f5f90935560c03bb139b897e5dce69989a3698d9c88ebae923e24ef30 SHA512 9d57260744607eb63453040c532bf3693cf3d8d93c56543ee00aa66adf3a71919e72bdef7811f287167403ade893248f189b797a5d2dcb24ef4e6f3d915a88c6 DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a9fe9d3d777130db9e592982660dbf9a96a0f5e723ca121465787aa11877d2d29a5a7d7cf066cdc8fa7e90d7ca7dcb7677f1 SHA512 c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804 DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_i686_msvc-0.52.4.crate 895530 BLAKE2B 87ec4628472beec8697317662fd599a8ea0ba5a11a0cad6b23f2481f39b3a4e0546d37fade4d715ad06a4798cf7faa6435bafa1e5054105c064cb560468b6025 SHA512 0d5526b21bfb96ab352b5181dcf84ff31007ce338245a374b3b413805239359a689b1a21de56ae998cc13444e40867bc30c4200454b84ef9ffa7117318baef1e DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602 +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnu-0.52.4.crate 831627 BLAKE2B 64d29f6e0837be822d89cc8aaea2514382d2c03b33deb5684df1d6b81573b3817add39d99f66181a762fae7c155e60a8c070affe43a0f2e247fb0c5ddcc7afd9 SHA512 96c673fb330af597fc3c71b53b9b66cacc9f3f64f05dc7cfe4a77447b7545280f065df22b7d91a6b7cf681a442d8b71c9d2dd128e76580664d8598c481cbb95e DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_gnullvm-0.52.4.crate 433358 BLAKE2B ffd55fba15ef713bd48caec5ed5f32936e05ac4897b721bd2b041229bc8c7beeca77ca018c3258dcdb09495629aa359d1dadaaf5112d38e7ea54670309d0ddf4 SHA512 f153d86b01e47f17ef08271b69becf7883bab92f96d40cdb1d74432f2bc6a7a65aa4ed931d8f6f4c2679e360bbd8d12037dc2a74a6a444fcaec5e4c784c54c74 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795 -DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c -DIST xattr-0.2.3.crate 11959 BLAKE2B e67cc186c3a86c3019cb5832aa515267671b8f11f88ba6253a3217eaf06d70b72a0367e9c8fb42a584b5b57113f8788c67f4e3d70db6427dd4e4a6efff59ac44 SHA512 55b99a9a9440463050b672dcacb7e1d1cc78f2b6f40ea7bff2134ee3a1c787d64972a1e00d2e06cf5a341bf76eff32f68e17a0c939a23f2c9a892715722afcac -DIST zip-0.6.4.crate 62396 BLAKE2B cfe4d7fcdb71ee6da3b6bf6f8cf4ecca9f717f7bbe96307af943c1b3d75dc233f1ae0df2f8515356da2fa27c0bcb534ee73c72e7afced4ae997b888c9078e149 SHA512 29392175711fb8585d400f99798596e10415423b3fda245069ca3144bce4b1027db845526c233bcf8be13b756e9605df21657bd2b5713339adeb334fe964ff8e -DIST zstd-0.11.2+zstd.1.5.2.crate 28987 BLAKE2B e04fe25ec6661819efeca08698c207922c38447459aa291961d3512d7c30016c51ddf49a8dadac0b7b2bf677b6a89d22670ec1e214607b476584a7e1b2dbf36d SHA512 d3f053c4acbdb45f3dadc9590db56095c761f0ff8899d22461f664701de766dde2fac2960a4477cd05d0a9c7ec200caa02ff891eb1f04630734996e0c38d10dd -DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff291325bc23fd06a1249148426bb853271393eab5121d2e1e29e433eff562c9eab72c1be265f3fe3bf14cc35d4a741db03c38 SHA512 03a6f07ada211fd6c364f03d06acff705fa5b08129aa09c29ad310f05b233553f8ea697e504470d4c104bd947f5d4102328c4df0df5e1da6d8e537f51451a014 -DIST zstd-sys-2.0.8+zstd.1.5.5.crate 736270 BLAKE2B 9ee3bae57279efca7305f6ac9456c71eb5714b595cf75b0faac7232c91f9df127c75c02f68021291ea01d6ab42a51a550d84cec246cd47bb8f502bbd32ceee09 SHA512 acfbf6c464678438bcab289c8be2e67a2bdfb910143d77363bf1ad5227dffc4b60e224388b7e59186fd4d1e017b63fef49734e99e383cbda19b82b4ed382fcd8 +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 +DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1 +DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756 diff --git a/sci-libs/tokenizers/files/tokenizers-0.15.2-test.patch b/sci-libs/tokenizers/files/tokenizers-0.15.2-test.patch new file mode 100644 index 000000000000..01a872cb846a --- /dev/null +++ b/sci-libs/tokenizers/files/tokenizers-0.15.2-test.patch @@ -0,0 +1,39 @@ +--- a/tests/bindings/test_trainers.py 2024-04-07 18:21:19.443506351 +0200 ++++ b/tests/bindings/test_trainers.py 2024-04-07 18:21:54.893466083 +0200 +@@ -295,8 +295,8 @@ + tokenizer.pre_tokenizer = pre_tokenizers.Sequence( + [pre_tokenizers.Whitespace(), pre_tokenizers.Digits(individual_digits=True)] + ) +- tokenizer.train(files=["data/big.txt"], trainer=trainer) ++ tokenizer.train(files=["tests/data/big.txt"], trainer=trainer) + +- tokenizer.save("data/tokenizer.json") ++ tokenizer.save("tests/data/tokenizer.json") + +- tokenizer.from_file("data/tokenizer.json") ++ tokenizer.from_file("tests/data/tokenizer.json") +--- a/tests/documentation/test_tutorial_train_from_iterators.py 2024-04-07 18:19:08.653593406 +0200 ++++ b/tests/documentation/test_tutorial_train_from_iterators.py 2024-04-07 18:19:39.206906910 +0200 +@@ -40,7 +40,7 @@ + def setup_gzip_files(self, train_files): + with open(train_files["small"], "rt") as small: + for n in range(3): +- path = f"data/my-file.{n}.gz" ++ path = f"tests/data/my-file.{n}.gz" + with gzip.open(path, "wt") as f: + f.write(small.read()) + +@@ -87,11 +87,11 @@ + # START single_gzip + import gzip + +- with gzip.open("data/my-file.0.gz", "rt") as f: ++ with gzip.open("tests/data/my-file.0.gz", "rt") as f: + tokenizer.train_from_iterator(f, trainer=trainer) + # END single_gzip + # START multi_gzip +- files = ["data/my-file.0.gz", "data/my-file.1.gz", "data/my-file.2.gz"] ++ files = ["tests/data/my-file.0.gz", "tests/data/my-file.1.gz", "tests/data/my-file.2.gz"] + + def gzip_iterator(): + for path in files: diff --git a/sci-libs/tokenizers/tokenizers-0.13.3.ebuild b/sci-libs/tokenizers/tokenizers-0.13.3.ebuild deleted file mode 100644 index 4686800c13f9..000000000000 --- a/sci-libs/tokenizers/tokenizers-0.13.3.ebuild +++ /dev/null @@ -1,359 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Autogenerated by pycargoebuild 0.6.3 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -CRATES=" - adler-1.0.2 - aes-0.7.5 - aho-corasick-0.7.20 - anes-0.1.6 - anstream-0.2.6 - anstyle-0.3.5 - anstyle-parse-0.1.1 - anstyle-wincon-0.2.0 - assert_approx_eq-1.1.0 - atty-0.2.14 - autocfg-1.1.0 - base64-0.13.1 - base64-0.21.0 - base64ct-1.6.0 - bit-set-0.5.3 - bit-vec-0.6.3 - bitflags-1.3.2 - block-buffer-0.10.4 - bumpalo-3.12.0 - byteorder-1.4.3 - bytes-1.4.0 - bzip2-0.4.4 - bzip2-sys-0.1.11+1.0.8 - cached-path-0.6.1 - cast-0.3.0 - cc-1.0.79 - cfg-if-1.0.0 - ciborium-0.2.0 - ciborium-io-0.2.0 - ciborium-ll-0.2.0 - cipher-0.3.0 - clap-3.2.23 - clap-4.2.1 - clap_builder-4.2.1 - clap_derive-4.2.0 - clap_lex-0.2.4 - clap_lex-0.4.1 - concolor-override-1.0.0 - concolor-query-0.3.3 - console-0.15.5 - constant_time_eq-0.1.5 - core-foundation-0.9.3 - core-foundation-sys-0.8.4 - cpufeatures-0.2.6 - crc32fast-1.3.2 - criterion-0.4.0 - criterion-plot-0.5.0 - crossbeam-channel-0.5.8 - crossbeam-deque-0.8.3 - crossbeam-epoch-0.9.14 - crossbeam-utils-0.8.15 - crypto-common-0.1.6 - darling-0.14.4 - darling_core-0.14.4 - darling_macro-0.14.4 - derive_builder-0.12.0 - derive_builder_core-0.12.0 - derive_builder_macro-0.12.0 - digest-0.10.6 - dirs-4.0.0 - dirs-sys-0.3.7 - either-1.8.1 - encode_unicode-0.3.6 - encoding_rs-0.8.32 - env_logger-0.7.1 - errno-0.3.1 - errno-dragonfly-0.1.2 - esaxx-rs-0.1.8 - fancy-regex-0.10.0 - fastrand-1.9.0 - filetime-0.2.21 - flate2-1.0.25 - fnv-1.0.7 - foreign-types-0.3.2 - foreign-types-shared-0.1.1 - form_urlencoded-1.1.0 - fs2-0.4.3 - futures-channel-0.3.28 - futures-core-0.3.28 - futures-io-0.3.28 - futures-sink-0.3.28 - futures-task-0.3.28 - futures-util-0.3.28 - generic-array-0.14.7 - getrandom-0.2.9 - glob-0.3.1 - h2-0.3.16 - half-1.8.2 - hashbrown-0.12.3 - heck-0.4.1 - hermit-abi-0.1.19 - hermit-abi-0.2.6 - hermit-abi-0.3.1 - hmac-0.12.1 - http-0.2.9 - http-body-0.4.5 - httparse-1.8.0 - httpdate-1.0.2 - humantime-1.3.0 - hyper-0.14.25 - hyper-tls-0.5.0 - ident_case-1.0.1 - idna-0.3.0 - indexmap-1.9.3 - indicatif-0.15.0 - indicatif-0.16.2 - indoc-1.0.9 - instant-0.1.12 - io-lifetimes-1.0.10 - ipnet-2.7.2 - is-terminal-0.4.7 - itertools-0.10.5 - itertools-0.8.2 - itertools-0.9.0 - itoa-1.0.6 - jobserver-0.1.26 - js-sys-0.3.61 - lazy_static-1.4.0 - libc-0.2.141 - linux-raw-sys-0.3.1 - lock_api-0.4.9 - log-0.4.17 - macro_rules_attribute-0.1.3 - macro_rules_attribute-proc_macro-0.1.3 - matrixmultiply-0.2.4 - matrixmultiply-0.3.2 - memchr-2.5.0 - memoffset-0.8.0 - mime-0.3.17 - minimal-lexical-0.2.1 - miniz_oxide-0.6.2 - mio-0.8.6 - monostate-0.1.6 - monostate-impl-0.1.6 - native-tls-0.2.11 - ndarray-0.13.1 - ndarray-0.15.6 - nom-7.1.3 - num-complex-0.2.4 - num-complex-0.4.3 - num-integer-0.1.45 - num-traits-0.2.15 - num_cpus-1.15.0 - number_prefix-0.3.0 - number_prefix-0.4.0 - numpy-0.18.0 - once_cell-1.17.1 - onig-6.4.0 - onig_sys-69.8.1 - oorandom-11.1.3 - opaque-debug-0.3.0 - openssl-0.10.50 - openssl-macros-0.1.1 - openssl-probe-0.1.5 - openssl-sys-0.9.85 - os_str_bytes-6.5.0 - parking_lot-0.12.1 - parking_lot_core-0.9.7 - password-hash-0.4.2 - paste-1.0.12 - pbkdf2-0.11.0 - percent-encoding-2.2.0 - pin-project-lite-0.2.9 - pin-utils-0.1.0 - pkg-config-0.3.26 - plotters-0.3.4 - plotters-backend-0.3.4 - plotters-svg-0.3.3 - ppv-lite86-0.2.17 - proc-macro2-1.0.56 - pyo3-0.18.2 - pyo3-build-config-0.18.2 - pyo3-ffi-0.18.2 - pyo3-macros-0.18.2 - pyo3-macros-backend-0.18.2 - quick-error-1.2.3 - quote-1.0.26 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - rawpointer-0.2.1 - rayon-1.7.0 - rayon-cond-0.1.0 - rayon-core-1.11.0 - redox_syscall-0.2.16 - redox_syscall-0.3.5 - redox_users-0.4.3 - regex-1.7.3 - regex-syntax-0.6.29 - reqwest-0.11.16 - rustc-hash-1.1.0 - rustix-0.37.11 - ryu-1.0.13 - same-file-1.0.6 - schannel-0.1.21 - scopeguard-1.1.0 - security-framework-2.8.2 - security-framework-sys-2.8.0 - serde-1.0.159 - serde_derive-1.0.159 - serde_json-1.0.95 - serde_urlencoded-0.7.1 - sha1-0.10.5 - sha2-0.10.6 - slab-0.4.8 - smallvec-1.10.0 - socket2-0.4.9 - spm_precompiled-0.1.4 - strsim-0.10.0 - subtle-2.4.1 - syn-1.0.109 - syn-2.0.13 - tar-0.4.38 - target-lexicon-0.12.6 - tempfile-3.5.0 - termcolor-1.2.0 - textwrap-0.16.0 - thiserror-1.0.40 - thiserror-impl-1.0.40 - time-0.3.20 - time-core-0.1.0 - tinytemplate-1.2.1 - tinyvec-1.6.0 - tinyvec_macros-0.1.1 - tokio-1.27.0 - tokio-native-tls-0.3.1 - tokio-util-0.7.7 - tower-service-0.3.2 - tracing-0.1.37 - tracing-core-0.1.30 - try-lock-0.2.4 - typenum-1.16.0 - unicode-bidi-0.3.13 - unicode-ident-1.0.8 - unicode-normalization-0.1.22 - unicode-normalization-alignments-0.1.12 - unicode-segmentation-1.10.1 - unicode-width-0.1.10 - unicode_categories-0.1.1 - unindent-0.1.11 - url-2.3.1 - utf8parse-0.2.1 - vcpkg-0.2.15 - version_check-0.9.4 - walkdir-2.3.3 - want-0.3.0 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.84 - wasm-bindgen-backend-0.2.84 - wasm-bindgen-futures-0.4.34 - wasm-bindgen-macro-0.2.84 - wasm-bindgen-macro-support-0.2.84 - wasm-bindgen-shared-0.2.84 - web-sys-0.3.61 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.42.0 - windows-sys-0.45.0 - windows-sys-0.48.0 - windows-targets-0.42.2 - windows-targets-0.48.0 - windows_aarch64_gnullvm-0.42.2 - windows_aarch64_gnullvm-0.48.0 - windows_aarch64_msvc-0.42.2 - windows_aarch64_msvc-0.48.0 - windows_i686_gnu-0.42.2 - windows_i686_gnu-0.48.0 - windows_i686_msvc-0.42.2 - windows_i686_msvc-0.48.0 - windows_x86_64_gnu-0.42.2 - windows_x86_64_gnu-0.48.0 - windows_x86_64_gnullvm-0.42.2 - windows_x86_64_gnullvm-0.48.0 - windows_x86_64_msvc-0.42.2 - windows_x86_64_msvc-0.48.0 - winreg-0.10.1 - xattr-0.2.3 - zip-0.6.4 - zstd-0.11.2+zstd.1.5.2 - zstd-safe-5.0.2+zstd.1.5.2 - zstd-sys-2.0.8+zstd.1.5.5 -" - -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 CC0-1.0 MIT - Unicode-DFS-2016 -" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" - -BDEPEND="dev-python/setuptools-rust[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest - -src_unpack() { - cargo_src_unpack -} - -src_prepare() { - default - cd bindings/python - 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 - # Need dataset module - #distutils-r1_src_test -} - -src_install() { - cd tokenizers - cargo_src_install - cd ../bindings/python - distutils-r1_src_install -} diff --git a/sci-libs/tokenizers/tokenizers-0.14.1-r1.ebuild b/sci-libs/tokenizers/tokenizers-0.14.1-r1.ebuild new file mode 100644 index 000000000000..6544bcfd7d35 --- /dev/null +++ b/sci-libs/tokenizers/tokenizers-0.14.1-r1.ebuild @@ -0,0 +1,335 @@ +# 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_{9..12} ) +DISTUTILS_EXT=1 + +CRATES=" + adler@1.0.2 + aho-corasick@1.1.1 + aho-corasick@1.1.2 + anes@0.1.6 + anstream@0.6.4 + anstyle-parse@0.2.2 + anstyle-query@1.0.0 + anstyle-wincon@3.0.1 + anstyle@1.0.4 + assert_approx_eq@1.1.0 + autocfg@1.1.0 + base64@0.13.1 + base64@0.21.5 + bit-set@0.5.3 + bit-vec@0.6.3 + bitflags@1.3.2 + bitflags@2.4.0 + bitflags@2.4.1 + bumpalo@3.14.0 + cast@0.3.0 + cc@1.0.79 + cc@1.0.83 + cfg-if@1.0.0 + ciborium-io@0.2.1 + ciborium-ll@0.2.1 + ciborium@0.2.1 + clap@4.4.6 + clap@4.4.8 + clap_builder@4.4.6 + clap_builder@4.4.8 + clap_derive@4.4.2 + clap_derive@4.4.7 + clap_lex@0.5.1 + clap_lex@0.6.0 + colorchoice@1.0.0 + console@0.15.7 + core-foundation-sys@0.8.4 + core-foundation@0.9.3 + crc32fast@1.3.2 + criterion-plot@0.5.0 + criterion@0.5.1 + crossbeam-deque@0.8.3 + crossbeam-epoch@0.9.15 + crossbeam-utils@0.8.16 + darling@0.14.4 + darling_core@0.14.4 + darling_macro@0.14.4 + derive_builder@0.12.0 + derive_builder_core@0.12.0 + derive_builder_macro@0.12.0 + dirs-sys@0.4.1 + dirs@5.0.1 + either@1.8.1 + either@1.9.0 + encode_unicode@0.3.6 + env_logger@0.10.0 + errno-dragonfly@0.1.2 + errno@0.3.1 + errno@0.3.7 + esaxx-rs@0.1.10 + fancy-regex@0.11.0 + fastrand@2.0.1 + flate2@1.0.28 + fnv@1.0.7 + foreign-types-shared@0.1.1 + foreign-types@0.3.2 + form_urlencoded@1.2.0 + getrandom@0.2.10 + getrandom@0.2.11 + half@1.8.2 + heck@0.4.1 + hermit-abi@0.3.2 + hermit-abi@0.3.3 + hf-hub@0.3.2 + humantime@2.1.0 + ident_case@1.0.1 + idna@0.4.0 + indicatif@0.17.7 + indoc@1.0.9 + instant@0.1.12 + is-terminal@0.4.9 + itertools@0.10.5 + itertools@0.11.0 + itoa@1.0.8 + itoa@1.0.9 + js-sys@0.3.65 + lazy_static@1.4.0 + libc@0.2.147 + libc@0.2.150 + libredox@0.0.1 + linux-raw-sys@0.4.11 + linux-raw-sys@0.4.8 + lock_api@0.4.10 + log@0.4.19 + log@0.4.20 + macro_rules_attribute-proc_macro@0.2.0 + macro_rules_attribute@0.2.0 + matrixmultiply@0.3.7 + memchr@2.5.0 + memchr@2.6.4 + memoffset@0.9.0 + minimal-lexical@0.2.1 + miniz_oxide@0.7.1 + monostate-impl@0.1.10 + monostate-impl@0.1.9 + monostate@0.1.10 + monostate@0.1.9 + native-tls@0.2.11 + ndarray@0.15.6 + nom@7.1.3 + num-complex@0.4.3 + num-integer@0.1.45 + num-traits@0.2.15 + num-traits@0.2.17 + number_prefix@0.4.0 + numpy@0.19.0 + once_cell@1.18.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.95 + openssl@0.10.59 + option-ext@0.2.0 + parking_lot@0.12.1 + parking_lot_core@0.9.8 + paste@1.0.14 + percent-encoding@2.3.0 + pkg-config@0.3.27 + plotters-backend@0.3.5 + plotters-svg@0.3.5 + plotters@0.3.5 + portable-atomic@1.4.3 + portable-atomic@1.5.1 + ppv-lite86@0.2.17 + proc-macro2@1.0.64 + proc-macro2@1.0.69 + pyo3-build-config@0.19.2 + pyo3-ffi@0.19.2 + pyo3-macros-backend@0.19.2 + pyo3-macros@0.19.2 + pyo3@0.19.2 + quote@1.0.29 + quote@1.0.33 + 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.0 + rayon@1.8.0 + redox_syscall@0.3.5 + redox_syscall@0.4.1 + redox_users@0.4.4 + regex-automata@0.3.3 + regex-automata@0.4.3 + regex-syntax@0.7.4 + regex-syntax@0.7.5 + regex-syntax@0.8.2 + regex@1.10.2 + regex@1.9.1 + ring@0.17.5 + rustc-hash@1.1.0 + rustix@0.38.13 + rustix@0.38.24 + rustls-webpki@0.101.7 + rustls@0.21.9 + ryu@1.0.14 + ryu@1.0.15 + same-file@1.0.6 + schannel@0.1.22 + scopeguard@1.1.0 + scopeguard@1.2.0 + sct@0.7.1 + security-framework-sys@2.9.1 + security-framework@2.9.2 + serde@1.0.171 + serde@1.0.192 + serde_derive@1.0.171 + serde_derive@1.0.192 + serde_json@1.0.102 + serde_json@1.0.108 + smallvec@1.11.0 + smallvec@1.11.2 + spin@0.9.8 + spm_precompiled@0.1.4 + strsim@0.10.0 + syn@1.0.109 + syn@2.0.25 + syn@2.0.39 + target-lexicon@0.12.9 + tempfile@3.8.0 + tempfile@3.8.1 + termcolor@1.2.0 + thiserror-impl@1.0.49 + thiserror-impl@1.0.50 + thiserror@1.0.49 + thiserror@1.0.50 + tinytemplate@1.2.1 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + unicode-bidi@0.3.13 + unicode-ident@1.0.10 + unicode-ident@1.0.12 + unicode-normalization-alignments@0.1.12 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unicode-width@0.1.11 + unicode_categories@0.1.1 + unindent@0.1.11 + untrusted@0.9.0 + ureq@2.8.0 + url@2.4.1 + utf8parse@0.2.1 + vcpkg@0.2.15 + walkdir@2.4.0 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.88 + wasm-bindgen-macro-support@0.2.88 + wasm-bindgen-macro@0.2.88 + wasm-bindgen-shared@0.2.88 + wasm-bindgen@0.2.88 + web-sys@0.3.65 + webpki-roots@0.25.2 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-util@0.1.6 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.45.0 + windows-sys@0.48.0 + windows-targets@0.42.2 + windows-targets@0.48.1 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.42.2 + windows_aarch64_gnullvm@0.48.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.42.2 + windows_aarch64_msvc@0.48.0 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.42.2 + windows_i686_gnu@0.48.0 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.42.2 + windows_i686_msvc@0.48.0 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.42.2 + windows_x86_64_gnu@0.48.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.42.2 + windows_x86_64_gnullvm@0.48.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.42.2 + windows_x86_64_msvc@0.48.0 + windows_x86_64_msvc@0.48.5 +" + +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" +RESTRICT="test" + +BDEPEND="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 + 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 + # Need dataset module + #distutils-r1_src_test +} + +src_install() { + cd tokenizers + cargo_src_install + cd ../bindings/python + distutils-r1_src_install +} diff --git a/sci-libs/tokenizers/tokenizers-0.15.2-r1.ebuild b/sci-libs/tokenizers/tokenizers-0.15.2-r1.ebuild new file mode 100644 index 000000000000..ed6b224ac702 --- /dev/null +++ b/sci-libs/tokenizers/tokenizers-0.15.2-r1.ebuild @@ -0,0 +1,344 @@ +# 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.2 + aho-corasick@1.1.3 + anes@0.1.6 + anstream@0.6.11 + 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.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.4.2 + bitflags@2.5.0 + bumpalo@3.15.4 + cast@0.3.0 + cc@1.0.83 + cc@1.0.90 + cfg-if@1.0.0 + ciborium-io@0.2.2 + ciborium-ll@0.2.2 + ciborium@0.2.2 + clap@4.5.0 + clap@4.5.4 + clap_builder@4.5.0 + clap_builder@4.5.2 + clap_derive@4.5.0 + 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.14.4 + darling_core@0.14.4 + darling_macro@0.14.4 + derive_builder@0.12.0 + derive_builder_core@0.12.0 + derive_builder_macro@0.12.0 + dirs-sys@0.4.1 + dirs@5.0.1 + either@1.10.0 + encode_unicode@0.3.6 + env_logger@0.10.2 + errno@0.3.8 + esaxx-rs@0.1.10 + fancy-regex@0.13.0 + fastrand@2.0.1 + 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.12 + half@2.4.0 + heck@0.4.1 + heck@0.5.0 + hermit-abi@0.3.5 + 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.4 + 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.10 + 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.20 + 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.1 + memchr@2.7.2 + memoffset@0.9.0 + memoffset@0.9.1 + minimal-lexical@0.2.1 + miniz_oxide@0.7.2 + monostate-impl@0.1.11 + monostate@0.1.11 + 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.20.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.29 + 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.78 + proc-macro2@1.0.79 + pyo3-build-config@0.20.2 + pyo3-build-config@0.20.3 + pyo3-ffi@0.20.2 + pyo3-ffi@0.20.3 + pyo3-macros-backend@0.20.2 + pyo3-macros-backend@0.20.3 + pyo3-macros@0.20.2 + pyo3-macros@0.20.3 + pyo3@0.20.2 + pyo3@0.20.3 + quote@1.0.35 + 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.8.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.3 + regex@1.10.4 + ring@0.17.8 + rustc-hash@1.1.0 + rustix@0.38.31 + rustix@0.38.32 + rustls-pki-types@1.4.1 + rustls-webpki@0.102.2 + rustls@0.22.3 + ryu@1.0.16 + 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.196 + serde@1.0.197 + serde_derive@1.0.196 + serde_derive@1.0.197 + serde_json@1.0.113 + serde_json@1.0.115 + smallvec@1.13.1 + smallvec@1.13.2 + spin@0.9.8 + spm_precompiled@0.1.4 + strsim@0.10.0 + strsim@0.11.0 + strsim@0.11.1 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.48 + syn@2.0.58 + target-lexicon@0.12.13 + target-lexicon@0.12.14 + tempfile@3.10.0 + tempfile@3.10.1 + termcolor@1.4.1 + thiserror-impl@1.0.56 + thiserror-impl@1.0.58 + thiserror@1.0.56 + 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.0 + windows-targets@0.52.4 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_gnullvm@0.52.4 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_aarch64_msvc@0.52.4 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_gnu@0.52.4 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_i686_msvc@0.52.4 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnu@0.52.4 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_gnullvm@0.52.4 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + windows_x86_64_msvc@0.52.4 + 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}"/${P}-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 + distutils-r1_src_test +} + +src_install() { + cd tokenizers + cargo_src_install + cd ../bindings/python + distutils-r1_src_install +} diff --git a/sci-libs/transformers/Manifest b/sci-libs/transformers/Manifest index fdb6c547a2fa..ace196dbfd29 100644 --- a/sci-libs/transformers/Manifest +++ b/sci-libs/transformers/Manifest @@ -1,4 +1 @@ -DIST transformers-4.27.4.gh.tar.gz 13210647 BLAKE2B acf5c81ceaaa2f156fc90b2284a6e2d4369742705c14d777c12e94a23961f3ed7cdc8e3cf8a4b962600b59f529862e6546f3d212e1ae1c44b7f76d8a10cbea75 SHA512 8b84a74c473c514314c3c4a422f8c03118575add3499ca280b7259bad72f8f8a6a7a51dc12162963c033b6a65c8914cca011b7bf6343781c5ed35154ea7adaf4 -DIST transformers-4.29.2.gh.tar.gz 13775570 BLAKE2B 01d64001e0ca8c06247f35391fe79edd59b3c02e1ec5fe0cac6ca3a4028633f6deba7f50762b2b688acc524658e25b8ecf4b6618ab6ff12d5737fd7c1864ada8 SHA512 2526f9d2de12e3f73899fb6ab5390884f9884a05ba492235bc95897f99bb45616ed737c87b9b8ac83550dd90b68025adf63a1f95c22a2e708528889215c8299c -DIST transformers-4.30.2.gh.tar.gz 13946731 BLAKE2B 2831f413fb06e4210f59c8b56779a35ba5236ab8934bc955c5997bc45671ca12dbf9fff5997850056876027fa5d542550f8bc00ef86dbd3bc81f65ae0ce964a2 SHA512 dc5d325643a81c275470c15edf98f5863d3ecff3696a376dd369d4f4e9a70ec7d06f23ae8b47354373a8a2f9301543214888cf35b66c9931ac350ab7892ae4c1 -DIST transformers-4.31.0.gh.tar.gz 14219555 BLAKE2B cdda047b3b2e2e90db86fa9a4978fbafc9293d1d663982dae0494d0b6988054c03feca8ee64ca9988c2b7c3a4adbf65876872607dc0769b70c62762762fe2e6f SHA512 744cb15389a23228811f121add1154a4b569e7843fd4908763321a60fbbabd1c57c2f84835c4cfdabecd6fe8c1e88cc5e5f5ad65c9850d59439a2a5ad97a70bb +DIST transformers-4.37.2.gh.tar.gz 16632049 BLAKE2B 22501598da911cb685598cb3b33e157ef091425c0c7478d05a0af396c182e8f776435d6b2fe708eaf2550ce6136f195ffac3b464f357ae8e023a030c218fcd3d SHA512 37bdf35e0774f7f26a19465b5e5c64709a85a1d001e01382996891173c59d6e31c1b536ef186b9d6a3dbe85e658ac3bf11f78e2e7f73c6d1d18992035afe3852 diff --git a/sci-libs/transformers/transformers-4.27.4.ebuild b/sci-libs/transformers/transformers-4.27.4.ebuild deleted file mode 100644 index ded81afb2f59..000000000000 --- a/sci-libs/transformers/transformers-4.27.4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" -HOMEPAGE=" - https://pypi.org/project/transformers/ - https://huggingface.co/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" # Need dataset module, not yet packaged - -RDEPEND=" - dev-python/filelock[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sci-libs/tokenizers[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sci-libs/transformers/transformers-4.29.2.ebuild b/sci-libs/transformers/transformers-4.29.2.ebuild deleted file mode 100644 index 944e547fdfbd..000000000000 --- a/sci-libs/transformers/transformers-4.29.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" -HOMEPAGE=" - https://pypi.org/project/transformers/ - https://huggingface.co/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" # Need some modules, not yet packaged - -RDEPEND=" - dev-python/filelock[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sci-libs/tokenizers[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sci-libs/transformers/transformers-4.30.2-r1.ebuild b/sci-libs/transformers/transformers-4.30.2-r1.ebuild deleted file mode 100644 index c74ee13c79fc..000000000000 --- a/sci-libs/transformers/transformers-4.30.2-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" -HOMEPAGE=" - https://pypi.org/project/transformers/ - https://huggingface.co/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" # Need some modules, not yet packaged - -RDEPEND=" - dev-python/filelock[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sci-libs/safetensors[${PYTHON_USEDEP}] - sci-libs/tokenizers[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sci-libs/transformers/transformers-4.31.0.ebuild b/sci-libs/transformers/transformers-4.31.0.ebuild deleted file mode 100644 index c74ee13c79fc..000000000000 --- a/sci-libs/transformers/transformers-4.31.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" -HOMEPAGE=" - https://pypi.org/project/transformers/ - https://huggingface.co/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" # Need some modules, not yet packaged - -RDEPEND=" - dev-python/filelock[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sci-libs/safetensors[${PYTHON_USEDEP}] - sci-libs/tokenizers[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sci-libs/transformers/transformers-4.37.2.ebuild b/sci-libs/transformers/transformers-4.37.2.ebuild new file mode 100644 index 000000000000..729e1ae55368 --- /dev/null +++ b/sci-libs/transformers/transformers-4.37.2.ebuild @@ -0,0 +1,39 @@ +# 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="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" +HOMEPAGE=" + https://pypi.org/project/transformers/ + https://huggingface.co/ +" +SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" # Need some modules, not yet packaged + +RDEPEND=" + sci-libs/tokenizers[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + sci-libs/huggingface_hub[${PYTHON_USEDEP}] + >=sci-libs/safetensors-0.4.1[${PYTHON_USEDEP}] + ') +" + +distutils_enable_tests pytest diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest index 2db7f00749f6..360dcde13929 100644 --- a/sci-libs/trilinos/Manifest +++ b/sci-libs/trilinos/Manifest @@ -1,6 +1,4 @@ -DIST trilinos-13.4.0-patches-r0.tar.xz 8740 BLAKE2B 333ab9ff1acb2f4b08007c7b99b96f023f6c742e4f991fc0ab9dd6595be7e3e319a77d5e329790cedca72d7a9060df837549d28e8a6cb4b8a838570d455ae356 SHA512 f30c16801cadec2a612ab2f7d3ca05c5ddfdfc513343a182562253cdfb58d38fa8b771ab07f7bc6bcb2505d146469da2ddda478f74447de746d5eca850da123e -DIST trilinos-13.4.0.tar.gz 168733479 BLAKE2B 3c4a1c89b792ec771c6347eebb6bb54a82fa5f172d1c5934bbd42c8bc9708a71451bd030ec0f5264191a62169b3c1305ac7a1290b3ab4845fb6e8ffef15ee03c SHA512 27a5636bac8106a0705948ca4705b739878f0d8afa74264d1cd31036811084457e27e03e86dfad59a80d5e9ee798237fa930b50574ec3e43979e53c6ab5da535 -DIST trilinos-13.4.1.tar.gz 168720416 BLAKE2B 5201c36aa998045f4eab99b67fce25f9a2f2a9524b8ca1147cd8db9ccc306e3df61336df3b2ee981317c8defbae2df9e36546a0e5ddfed3142213e437e4dfba0 SHA512 9c0fb3af2fa625cd0af1309bfa61c212e12657820707348c81355d506e07f540da5e42aa30237fbc80adf257bb636029345f248abaf7ef96fcdaed1c28ec3a19 -DIST trilinos-14.0.0.tar.gz 179086187 BLAKE2B 0e0c3e3fa4b88164cd7e90720ec42eb007f8e89734e5537a7eba1f17754faf30c21fa1d77f7e8a7968bdb8bb230596a1adc74f8170577fd7b4eccb2e88c5b8f6 SHA512 b08fcf4f6bf2605267c44c038f352949e5bfe14b853de77e4c80e28f66c088ead1699b1e49f8475f1b98ce5a21238b98a299e760f1373e585c78b65120fa18e5 -DIST trilinos-14.2.0.tar.gz 178867695 BLAKE2B 07ff61775399014091aae9c14ad12a69ab19853bc3489c15775490aa3f6e8ae868ac4e90bf046d10bf1ecb1d5558992f0afb0ce656f947336559fcf10085c038 SHA512 c676ff2b59904dc05a0ff434dd164bc96076999a5851c160c5851c124d3c519dd0cc3f088eba19f2000c7d1c2377f4efb2b2b8f9f3ee641b2180f3b99b28ea0b DIST trilinos-14.4.0.tar.gz 188325969 BLAKE2B 909e3ebe229d035263d835e0d68977516d2a5df168785021fe300f7904e149586a82a6dba271cc1472455472397ee5467443244fb68fb27c00cf4e9b3d10a282 SHA512 497fc4fb4ab4338fffef7111635f3dc3b12cb7302bc3f56bafb5cc75b7c68e94cc22fcacd9dd625803a0f38e4fbce5105cab61df76e033a4581568c36a53fe8a +DIST trilinos-15.0.0.tar.gz 182971338 BLAKE2B 0e459b9d070085a2a5bf06de8274ceec628f8913ab87c87a9502baf8065bfdabeca827ea9fa0f274c163bff1e7dc252eabf79ca250c0470d1da5e13492287d28 SHA512 a364e67686cdd4e1e34aa0e14b6cc051ed21a72b63719c47260d7839d47590b9e652be76cb9d61e513c7933b965fc8141c3ff898167e22353b33c9491a525c84 +DIST trilinos-15.1.1.tar.gz 183340366 BLAKE2B 4d1184fac143ae2b2950d0bf35bae8f813436f894734e5a9aa96d7622ed265cc41a04001a846437a1d1921258c20ae165e9e55f1754241541bde7136c08a6e5c SHA512 5a1a7d321dd3b47fafe0422884d1a7bf6731d5ee806a4fd1bf31f179ca5d6f4290cda4515d0d7786024ea15c17e88422a9518370c5cfb32b4b44761de232e0de +DIST trilinos-16.0.0.tar.gz 198059287 BLAKE2B b23389d6aa49e34b87f614e9c4a835b224bcd4054028b106c94358a4125a5544df2013ce3560a56e76d68e900df613d7ae002fea0dacd8bd93ea002a4db7d53b SHA512 ed8b9f6ec8d35879f28f066685f70c492ee83ffdc42cfed75750216c0c689c81b00355520a7db441e56d83a6a153b0dbe4f8422d163a942cdcc6786235f64688 diff --git a/sci-libs/trilinos/files/trilinos-14.0.0-missing_includes_gcc_13.patch b/sci-libs/trilinos/files/trilinos-14.0.0-missing_includes_gcc_13.patch deleted file mode 100644 index ee9836d84249..000000000000 --- a/sci-libs/trilinos/files/trilinos-14.0.0-missing_includes_gcc_13.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp b/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp -index e82e8be9..b41b0d03 100644 ---- a/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp -+++ b/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp -@@ -43,6 +43,7 @@ - #define TEUCHOS_BIG_UINT_DECL_HPP - - #include <iosfwd> -+#include <cstdint> - - /*! \file Teuchos_BigUIntDecl.hpp - \brief Arbitrary-precision unsigned integer declaration. -diff --git a/packages/teuchos/core/src/Teuchos_PrintDouble.hpp b/packages/teuchos/core/src/Teuchos_PrintDouble.hpp -index cf2fe0f3..7c95b1b5 100644 ---- a/packages/teuchos/core/src/Teuchos_PrintDouble.hpp -+++ b/packages/teuchos/core/src/Teuchos_PrintDouble.hpp -@@ -43,6 +43,7 @@ - #define TEUCHOS_PRINT_DOUBLE_HPP - - #include <iosfwd> -+#include <cstdint> - - /*! \file Teuchos_PrintDouble.hpp - \brief Declares Teuchos::print_double diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml index 0d48858c237f..61a49ed97f40 100644 --- a/sci-libs/trilinos/metadata.xml +++ b/sci-libs/trilinos/metadata.xml @@ -19,7 +19,6 @@ <flag name="all-packages">Enable all supported Trilinos packages (per default only a subset is built)</flag> <flag name="arprec">Add support for arprec (<pkg>sci-libs/arprec</pkg>)</flag> <flag name="clp">Add support for clp (<pkg>sci-libs/coinor-clp</pkg>)</flag> - <flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag> <flag name="eigen">Add support for eigen (<pkg>dev-cpp/eigen</pkg>)</flag> <flag name="glpk">Add support for glpk (<pkg>sci-mathematics/glpk</pkg>)</flag> <flag name="gtest">Add support for gtest (<pkg>dev-cpp/gtest</pkg>)</flag> @@ -44,4 +43,7 @@ <flag name="tvmet">Add support for tvmet (<pkg>dev-libs/tvmet</pkg>)</flag> <flag name="yaml">Add support for yaml (<pkg>dev-cpp/yaml-cpp</pkg>)</flag> </use> + <upstream> + <remote-id type="github">trilinos/Trilinos</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/trilinos/trilinos-13.4.1.ebuild b/sci-libs/trilinos/trilinos-13.4.1.ebuild deleted file mode 100644 index 34f7303abddb..000000000000 --- a/sci-libs/trilinos/trilinos-13.4.1.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake toolchain-funcs - -DESCRIPTION="Scientific library collection for large scale problems" -HOMEPAGE="http://trilinos.sandia.gov/" -MY_PV="${PV//\./-}" -PATCHSET="r0" -SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~tamiko/distfiles/${PN}-13.4.0-patches-${PATCHSET}.tar.xz" - -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="BSD LGPL-2.1" -SLOT="0" - -IUSE=" - adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre - matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse - superlu taucs tbb test threads tvmet yaml zlib X -" - -# TODO: fix export cmake function for tests -RESTRICT="test" - -RDEPEND=" - !dev-cpp/kokkos - dev-libs/boost:= - sys-libs/binutils-libs:= - virtual/blas - virtual/lapack - virtual/mpi - adolc? ( sci-libs/adolc ) - arprec? ( sci-libs/arprec ) - clp? ( sci-libs/coinor-clp ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) - eigen? ( dev-cpp/eigen:3 ) - glpk? ( sci-mathematics/glpk ) - gtest? ( dev-cpp/gtest ) - hdf5? ( sci-libs/hdf5:=[mpi] ) - hypre? ( sci-libs/hypre:= ) - hwloc? ( sys-apps/hwloc:= ) - matio? ( sci-libs/matio ) - mkl? ( sci-libs/mkl ) - metis? ( sci-libs/metis ) - mumps? ( sci-libs/mumps ) - netcdf? ( sci-libs/netcdf:= ) - petsc? ( sci-mathematics/petsc ) - qd? ( sci-libs/qd ) - scalapack? ( sci-libs/scalapack ) - scotch? ( sci-libs/scotch:= ) - sparse? ( sci-libs/cxsparse sci-libs/umfpack ) - superlu? ( sci-libs/superlu:= ) - taucs? ( sci-libs/taucs ) - tbb? ( dev-cpp/tbb:= ) - tvmet? ( dev-libs/tvmet ) - yaml? ( dev-cpp/yaml-cpp:= ) - zlib? ( sys-libs/zlib ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" - -PATCHES=( - "${WORKDIR}"/patches -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -trilinos_conf() { - local dirs libs d - for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do - dirs="${dirs};${d:2}" - done - [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" ) - for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do - libs="${libs};${d:2}" - done - [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" ) - dirs="" - for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do - dirs="${dirs};${d:2}" - done - [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) -} - -# -# The following packages are currently disabled: -# - Adelus/Zadelus due to underlinkage. -# - Moertel due to underlinkage -# - SEACAS is incompatible with netcdf, see -# https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf -# - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}" - -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF - -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake" - -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" - -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" - -DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)" - -DTrilinos_ENABLE_Adelus=OFF - -DTrilinos_ENABLE_Moertel=OFF - -DTrilinos_ENABLE_PyTrilinos=OFF - -DTrilinos_ENABLE_SEACAS=OFF - -DTrilinos_ENABLE_Amesos=ON - -DTrilinos_ENABLE_AztecOO=ON - -DTrilinos_ENABLE_COMPLEX_DOUBLE=ON - -DTrilinos_ENABLE_COMPLEX_FLOAT=ON - -DTrilinos_ENABLE_EpetraExt=ON - -DTrilinos_ENABLE_Epetra=ON - -DTrilinos_ENABLE_Ifpack=ON - -DTrilinos_ENABLE_ML=ON - -DTrilinos_ENABLE_MueLu=ON - -DTrilinos_ENABLE_OpenMP="$(usex openmp)" - -DTrilinos_ENABLE_ROL=ON - -DTrilinos_ENABLE_Sacado=ON - -DTrilinos_ENABLE_Teuchos=ON - -DTrilinos_ENABLE_Tpetra=ON - -DTrilinos_ENABLE_Zoltan=ON - -DTrilinos_ENABLE_TESTS="$(usex test)" - -DTPL_ENABLE_BinUtils=ON - -DTPL_ENABLE_BLAS=ON - -DTPL_ENABLE_LAPACK=ON - -DTPL_ENABLE_MPI=ON - -DTPL_ENABLE_ADOLC="$(usex adolc)" - -DTPL_ENABLE_AMD="$(usex sparse)" - -DTPL_ENABLE_ARPREC="$(usex arprec)" - -DTPL_ENABLE_BLACS="$(usex scalapack)" - -DTPL_ENABLE_BoostLib=ON - -DTPL_ENABLE_Boost=ON - -DTPL_ENABLE_Clp="$(usex clp)" - -DTPL_ENABLE_CSparse="$(usex sparse)" - -DTPL_ENABLE_CUDA="$(usex cuda)" - -DTPL_ENABLE_CUSPARSE="$(usex cuda)" - -DTPL_ENABLE_Eigen="$(usex eigen)" - -DTPL_ENABLE_GLPK="$(usex glpk)" - -DTPL_ENABLE_gtest="$(usex gtest)" - -DTPL_ENABLE_HDF5="$(usex hdf5)" - -DTPL_ENABLE_HWLOC="$(usex hwloc)" - -DTPL_ENABLE_HYPRE="$(usex hypre)" - -DTPL_ENABLE_Matio="$(usex matio)" - -DTPL_ENABLE_METIS="$(usex metis)" - -DTPL_ENABLE_MKL="$(usex mkl)" - -DTPL_ENABLE_MUMPS="$(usex mumps)" - -DTPL_ENABLE_Netcdf="$(usex netcdf)" - -DTPL_ENABLE_PARDISO_MKL="$(usex mkl)" - -DTPL_ENABLE_PETSC="$(usex petsc)" - -DTPL_ENABLE_Pthread="$(usex threads)" - -DTPL_ENABLE_QD="$(usex qd)" - -DTPL_ENABLE_SCALAPACK="$(usex scalapack)" - -DTPL_ENABLE_Scotch="$(usex scotch)" - -DTPL_ENABLE_SuperLU="$(usex superlu)" - -DTPL_ENABLE_TAUCS="$(usex taucs)" - -DTPL_ENABLE_TBB="$(usex tbb)" - -DTPL_ENABLE_Thrust="$(usex cuda)" - -DTPL_ENABLE_TVMET="$(usex tvmet)" - -DTPL_ENABLE_UMFPACK="$(usex sparse)" - -DTPL_ENABLE_X11="$(usex X)" - -DTPL_ENABLE_yaml-cpp="$(usex yaml)" - -DTPL_ENABLE_Zlib="$(usex zlib)" - ) - - # - # Make sure some critical configuration options are always set - # correctly independently of what Trilinos dependency resolver thinks - # it should be doing. - # - local mycmakeargs+=( - -DAmesos2_ENABLE_LAPACK=ON - -DAmesos2_ENABLE_MUMPS=OFF - -DTpetra_INST_SERIAL=ON - ) - - use eigen && \ - mycmakeargs+=( - -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3" - ) - use hypre && \ - mycmakeargs+=( - -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre" - ) - use scotch && \ - mycmakeargs+=( - -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" - ) - - # cxsparse is a rewrite of csparse + extras - use sparse && \ - mycmakeargs+=( - -DCSparse_LIBRARY_NAMES="cxsparse" - ) - - # mandatory blas and lapack - trilinos_conf blas BLAS - trilinos_conf lapack LAPACK - use superlu && trilinos_conf superlu SuperLU - use metis && trilinos_conf metis METIS - - # blacs library is included in scalapack these days - if use scalapack; then - trilinos_conf scalapack SCALAPACK - mycmakeargs+=( - -DBLACS_LIBRARY_NAMES="scalapack" - -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" - ) - fi - - # - # Make sure we use the compiler wrappers in order to build trilinos. - # - [ ! -z "${CC}"] && export OMPI_CC="${CC}" MPICH_CC="${CC}" && tc-export OMPI_CC MPICH_CC - [ ! -z "${CXX}"] && export OMPI_CXX="${CXX}" MPICH_CXX="${CXX}" && tc-export OMPI_CXX MPICH_CXX - export CC=mpicc CXX=mpicxx && tc-export CC CXX - - # Trilinos needs a custom build type: - local CMAKE_BUILD_TYPE=Release - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # Clean up the mess: - mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed" - mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed" - rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed" - - # - # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker - # has a chance to pick up the libraries... - # - cat >> "${T}"/99trilinos <<- EOF - LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos" - PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin" - EOF - doenvd "${T}"/99trilinos -} diff --git a/sci-libs/trilinos/trilinos-14.4.0.ebuild b/sci-libs/trilinos/trilinos-14.4.0.ebuild index 8e143ef76619..5cf7866ed9cd 100644 --- a/sci-libs/trilinos/trilinos-14.4.0.ebuild +++ b/sci-libs/trilinos/trilinos-14.4.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Scientific library collection for large scale problems" HOMEPAGE="http://trilinos.sandia.gov/" @@ -12,9 +12,11 @@ MY_PV="${PV//\./-}" PATCHSET="r0" SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" + LICENSE="BSD LGPL-2.1" SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE=" adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre @@ -62,8 +64,6 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig" -S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" - PATCHES=( ) @@ -94,18 +94,21 @@ trilinos_conf() { # # The following packages are currently disabled: -# - Adelus/Zadelus due to underlinkage. -# - Moertel due to underlinkage # - SEACAS is incompatible with netcdf, see # https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf # src_configure() { + # Trilinos is a massive C++ project. Fixing all of the lto warnings and + # making safe for lto compilation/linking will be a massive + # undertaking. Thus, simply filter lto flags. bug #862987 + filter-lto + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${EPREFIX}" + -DCMAKE_SKIP_RPATH=ON -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" -DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)" diff --git a/sci-libs/trilinos/trilinos-14.2.0.ebuild b/sci-libs/trilinos/trilinos-15.0.0.ebuild index 4ba10c76e0d2..6cbf380341aa 100644 --- a/sci-libs/trilinos/trilinos-14.2.0.ebuild +++ b/sci-libs/trilinos/trilinos-15.0.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Scientific library collection for large scale problems" HOMEPAGE="http://trilinos.sandia.gov/" @@ -12,9 +12,11 @@ MY_PV="${PV//\./-}" PATCHSET="r0" SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" + LICENSE="BSD LGPL-2.1" SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE=" adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre @@ -62,8 +64,6 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig" -S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" - PATCHES=( ) @@ -92,28 +92,21 @@ trilinos_conf() { [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) } -# -# The following packages are currently disabled: -# - Adelus/Zadelus due to underlinkage. -# - Moertel due to underlinkage -# - SEACAS is incompatible with netcdf, see -# https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf -# - src_configure() { + # Trilinos is a massive C++ project. Fixing all of the lto warnings and + # making safe for lto compilation/linking will be a massive + # undertaking. Thus, simply filter lto flags. bug #862987 + filter-lto + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${EPREFIX}" + -DCMAKE_SKIP_RPATH=ON -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF - -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake" -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" -DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)" - -DTrilinos_ENABLE_Adelus=OFF - -DTrilinos_ENABLE_Moertel=OFF -DTrilinos_ENABLE_PyTrilinos=OFF - -DTrilinos_ENABLE_SEACAS=OFF -DTrilinos_ENABLE_Amesos=ON -DTrilinos_ENABLE_AztecOO=ON -DTrilinos_ENABLE_EpetraExt=ON diff --git a/sci-libs/trilinos/trilinos-14.0.0.ebuild b/sci-libs/trilinos/trilinos-15.1.1.ebuild index 9c6599250eda..6cbf380341aa 100644 --- a/sci-libs/trilinos/trilinos-14.0.0.ebuild +++ b/sci-libs/trilinos/trilinos-15.1.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Scientific library collection for large scale problems" HOMEPAGE="http://trilinos.sandia.gov/" @@ -12,9 +12,11 @@ MY_PV="${PV//\./-}" PATCHSET="r0" SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" + LICENSE="BSD LGPL-2.1" SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE=" adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre @@ -62,10 +64,7 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig" -S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" - PATCHES=( - "${FILESDIR}"/${P}-missing_includes_gcc_13.patch ) pkg_pretend() { @@ -93,28 +92,21 @@ trilinos_conf() { [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) } -# -# The following packages are currently disabled: -# - Adelus/Zadelus due to underlinkage. -# - Moertel due to underlinkage -# - SEACAS is incompatible with netcdf, see -# https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf -# - src_configure() { + # Trilinos is a massive C++ project. Fixing all of the lto warnings and + # making safe for lto compilation/linking will be a massive + # undertaking. Thus, simply filter lto flags. bug #862987 + filter-lto + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${EPREFIX}" + -DCMAKE_SKIP_RPATH=ON -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF - -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake" -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" -DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)" - -DTrilinos_ENABLE_Adelus=OFF - -DTrilinos_ENABLE_Moertel=OFF -DTrilinos_ENABLE_PyTrilinos=OFF - -DTrilinos_ENABLE_SEACAS=OFF -DTrilinos_ENABLE_Amesos=ON -DTrilinos_ENABLE_AztecOO=ON -DTrilinos_ENABLE_EpetraExt=ON diff --git a/sci-libs/trilinos/trilinos-13.4.0-r3.ebuild b/sci-libs/trilinos/trilinos-16.0.0.ebuild index 9996b79bd35d..6cbf380341aa 100644 --- a/sci-libs/trilinos/trilinos-13.4.0-r3.ebuild +++ b/sci-libs/trilinos/trilinos-16.0.0.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Scientific library collection for large scale problems" HOMEPAGE="http://trilinos.sandia.gov/" MY_PV="${PV//\./-}" PATCHSET="r0" -SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz" +SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" LICENSE="BSD LGPL-2.1" SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE=" adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre @@ -63,10 +64,7 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig" -S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" - PATCHES=( - "${WORKDIR}"/patches ) pkg_pretend() { @@ -94,32 +92,23 @@ trilinos_conf() { [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) } -# -# The following packages are currently disabled: -# - Adelus/Zadelus due to underlinkage. -# - Moertel due to underlinkage -# - SEACAS is incompatible with netcdf, see -# https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf -# - src_configure() { + # Trilinos is a massive C++ project. Fixing all of the lto warnings and + # making safe for lto compilation/linking will be a massive + # undertaking. Thus, simply filter lto flags. bug #862987 + filter-lto + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${EPREFIX}" + -DCMAKE_SKIP_RPATH=ON -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF - -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake" -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" -DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)" - -DTrilinos_ENABLE_Adelus=OFF - -DTrilinos_ENABLE_Moertel=OFF -DTrilinos_ENABLE_PyTrilinos=OFF - -DTrilinos_ENABLE_SEACAS=OFF -DTrilinos_ENABLE_Amesos=ON -DTrilinos_ENABLE_AztecOO=ON - -DTrilinos_ENABLE_COMPLEX_DOUBLE=ON - -DTrilinos_ENABLE_COMPLEX_FLOAT=ON -DTrilinos_ENABLE_EpetraExt=ON -DTrilinos_ENABLE_Epetra=ON -DTrilinos_ENABLE_Ifpack=ON @@ -236,14 +225,23 @@ src_install() { cmake_src_install # Clean up the mess: + + # Let us move the bin directory out of the way to avoid potential + # clashes due to very generically named binaries such as + # »nvcc_wrapper«, etc. mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed" + + # Move the cmake directory to the right location: + mkdir -p "${ED}/usr/$(get_libdir)"/cmake mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed" + # Fix up include paths: + sed -i -e 's#external_packages#trilinos/external_packages#g' \ + "${ED}/usr/$(get_libdir)"/cmake/**/*.cmake || die "sed failed" rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed" - # - # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker - # has a chance to pick up the libraries... - # + # Register $(get_libdir)/trilinos in LDPATH so that the dynamic linker + # has a chance to pick up the libraries, also add Trilinos' binaries ot + # the PATH environment variable. cat >> "${T}"/99trilinos <<- EOF LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos" PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin" diff --git a/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild b/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild new file mode 100644 index 000000000000..ee68d7850d4e --- /dev/null +++ b/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool toolchain-funcs + +DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +IUSE="+cholmod doc" + +BDEPEND="virtual/pkgconfig + doc? ( virtual/latex-base )" +DEPEND=" + sci-libs/amd + >=sci-libs/suitesparseconfig-5.4.0 + virtual/blas + cholmod? ( sci-libs/cholmod )" +RDEPEND="${DEPEND}" + +src_prepare() { + default + elibtoolize +} + +src_configure() { + econf \ + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ + $(use_with doc) \ + $(use_with cholmod) +} + +src_compile() { + use doc && export VARTEXFONTS="${T}/fonts" + default +} + +src_install() { + default + + # no static archives + find "${D}" -name '*.la' -delete || die +} diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild index dc4a12bb49ba..35e0ed26dac3 100644 --- a/sci-libs/umfpack/umfpack-5.7.9.ebuild +++ b/sci-libs/umfpack/umfpack-5.7.9.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=7 -inherit toolchain-funcs +inherit libtool toolchain-funcs DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" @@ -23,6 +23,11 @@ DEPEND=" cholmod? ( sci-libs/cholmod )" RDEPEND="${DEPEND}" +src_prepare() { + default + elibtoolize +} + src_configure() { econf \ --disable-static \ diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest index ccc9454c73e3..9f69fdc2758b 100644 --- a/sci-libs/volk/Manifest +++ b/sci-libs/volk/Manifest @@ -1 +1,2 @@ -DIST volk-3.0.0.tar.xz 394044 BLAKE2B 04e832916375610571387db521348df2a37f5460500c4bd6d223dd6af9c0a207f3b22c599fccbf9bd51b8a87ed90cb5239512c19fc6ddd02320b7aa27c3be588 SHA512 5d1ff90f28ec6ef2d21370d74025139ccc9872e5a477b271ffe6662725b7705203715ea4ffc430554ec2fec56e8d9b40a945e75186761995d3075218e1f16313 +DIST volk-3.1.0.tar.xz 420088 BLAKE2B 709c3561675b0f71a1400d7b9332aa18c6d2ae848c993914cb40484890f631bde48da12ab9756be38cca9fbb20d0d851cb40ff5bfe3722ff72cd0b4daff1b11d SHA512 0c39c06e5121782461c0ea2c84402c84f9609a2a09ce7218e976472081d09531746ea1cde767f329a69d72d51cf5715bf7f2df1b26a8d8ddd1694e8239f5ff21 +DIST volk-3.1.2.tar.xz 381388 BLAKE2B c67049921cf0817ff263ae3b0b14b2939e69e461fa731b47f0f923ebe730e67a8715f20738b1991fc9956abd12eccfa50a421460feef12e7678d26a25d73acce SHA512 6fd99b037e2c2481f4886a70021403a8641567a0c0280496194da7ef1b8cf7dbecf91d5bfc1b1c3449788de360206bae5036d796a01bbec211ccf9ccbbc357ee diff --git a/sci-libs/volk/volk-3.1.0.ebuild b/sci-libs/volk/volk-3.1.0.ebuild new file mode 100644 index 000000000000..0a400d90ff06 --- /dev/null +++ b/sci-libs/volk/volk-3.1.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +#https://github.com/gnuradio/volk/issues/383 +CMAKE_BUILD_TYPE="None" +inherit cmake python-single-r1 + +DESCRIPTION="vector optimized library of kernels" +HOMEPAGE="http://libvolk.org" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gnuradio/volk.git" +else + SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi + +LICENSE="GPL-3" +SLOT="0/$(ver_cut 1-2)" +IUSE="orc test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RDEPEND="${PYTHON_DEPS} + orc? ( dev-lang/orc )" +DEPEND="${RDEPEND} + $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]')" + +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DENABLE_ORC=$(usex orc) + -DPYTHON_EXECUTABLE="${PYTHON}" + -DENABLE_TESTING="$(usex test)" + -DENABLE_PROFILING=OFF + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die + python_optimize +} + +src_test() { + local myctestargs=( + -E "(check_lgpl)" + ) + cmake_src_test +} diff --git a/sci-libs/volk/volk-3.1.2.ebuild b/sci-libs/volk/volk-3.1.2.ebuild new file mode 100644 index 000000000000..a6c27ce5a74e --- /dev/null +++ b/sci-libs/volk/volk-3.1.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +#https://github.com/gnuradio/volk/issues/383 +CMAKE_BUILD_TYPE="None" +inherit cmake python-single-r1 + +DESCRIPTION="vector optimized library of kernels" +HOMEPAGE="http://libvolk.org" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gnuradio/volk.git" +else + SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm ~riscv ~x86" +fi + +LICENSE="GPL-3" +SLOT="0/$(ver_cut 1-2)" +IUSE="orc test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RDEPEND="${PYTHON_DEPS} + orc? ( dev-lang/orc )" +DEPEND="${RDEPEND} + $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]')" + +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DENABLE_ORC=$(usex orc) + -DPYTHON_EXECUTABLE="${PYTHON}" + -DENABLE_TESTING="$(usex test)" + -DENABLE_PROFILING=OFF + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die + python_optimize +} + +src_test() { + local myctestargs=( + -E "(check_lgpl)" + ) + cmake_src_test +} diff --git a/sci-libs/volk/volk-3.0.0-r1.ebuild b/sci-libs/volk/volk-9999.ebuild index 39eb8873bba8..f86ccd6d99f6 100644 --- a/sci-libs/volk/volk-3.0.0-r1.ebuild +++ b/sci-libs/volk/volk-9999.ebuild @@ -11,11 +11,17 @@ inherit cmake python-single-r1 DESCRIPTION="vector optimized library of kernels" HOMEPAGE="http://libvolk.org" -SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gnuradio/volk.git" +else + SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi LICENSE="GPL-3" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~riscv ~x86" IUSE="orc test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -41,11 +47,6 @@ src_install() { # Remove stray python files generated by the build system find "${ED}" -name '*.pyc' -exec rm -f {} \; || die find "${ED}" -name '*.pyo' -exec rm -f {} \; || die - # https://github.com/gnuradio/volk/issues/626 - rm -f "${ED}/usr/bin/list_cpu_features" - rm -rf "${ED}/usr/include/cpu_features" - rm -rf "${ED}/usr/$(get_libdir)/cmake/CpuFeatures" - rm -rf "${ED}/usr/lib64/libcpu_features.a" python_optimize } diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 3aaf0aa0c9c1..51b1e50afdd1 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,12 +1,18 @@ 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 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 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 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 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 vtkDocHtml-9.3.0.tar.gz 165538725 BLAKE2B 27874998679090d5442ecb3a394b53db05a0215cfee9f912bd01af1d5567efc51b4f56dacb960401195da4f3d385b335bbefc922a45d0199c99d619df0941f08 SHA512 8bf9cc87c4653a65ccc39d88d70b421a7b4353986d380cbf558cbf6e8a96435695a5d54aa7ce5bb1240cb46ca0fd9225a51183a39d1af1101d3f2876a2afc10b diff --git a/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch b/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch new file mode 100644 index 000000000000..e330e1837c90 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch @@ -0,0 +1,128 @@ +From: 31058da34eeb26165011b07fe41baf825f7df1a3 Mon Sep 17 00:00:00 2001 +From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> +From: https://github.com/microsoft/vcpkg/pull/29730 +Date: Sat, 18 Feb 2023 10:12:04 +0100 +Subject: [PATCH 1/3] [vtk] update pegtl to version 3 + +--- a/IO/MotionFX/vtkMotionFXCFGGrammar.h ++++ b/IO/MotionFX/vtkMotionFXCFGGrammar.h +@@ -23,7 +23,7 @@ + + // for debugging + // clang-format off +-#include VTK_PEGTL(pegtl/contrib/tracer.hpp) ++#include VTK_PEGTL(pegtl/contrib/trace.hpp) + // clang-format on + + namespace MotionFX +--- a/IO/MotionFX/vtkMotionFXCFGReader.cxx ++++ b/IO/MotionFX/vtkMotionFXCFGReader.cxx +@@ -1213,7 +1213,7 @@ bool PositionFileMotion::read_position_file(const std::string& rootDir) const + } + return true; + } +- catch (const tao::pegtl::input_error& e) ++ catch (const tao::pegtl::parse_error& e) + { + vtkGenericWarningMacro("PositionFileMotion::read_position_file failed: " << e.what()); + } +@@ -1232,7 +1232,7 @@ bool UniversalTransformMotion::read_universaltransform_file(const std::string& r + in, numbers, this->transforms); + return true; + } +- catch (const tao::pegtl::input_error& e) ++ catch (const tao::pegtl::parse_error& e) + { + vtkGenericWarningMacro( + "UniversalTransformMotion::read_universaltransform_file failed: " << e.what()); +@@ -1267,7 +1267,7 @@ public: + if (getenv("MOTIONFX_DEBUG_GRAMMAR") != nullptr) + { + tao::pegtl::read_input<> in2(filename); +- tao::pegtl::parse<MotionFX::CFG::Grammar, tao::pegtl::nothing, tao::pegtl::tracer>(in2); ++ tao::pegtl::complete_trace<MotionFX::CFG::Grammar>(in2); + } + return false; + } +--- a/ThirdParty/pegtl/CMakeLists.txt ++++ b/ThirdParty/pegtl/CMakeLists.txt +@@ -5,7 +5,6 @@ vtk_module_third_party( + VERSION "2.8.3" + EXTERNAL + PACKAGE PEGTL +- VERSION 2.0.0 + TARGETS PEGTL::PEGTL + STANDARD_INCLUDE_DIRS) + +--- a/CMake/FindPEGTL.cmake ++++ b/CMake/FindPEGTL.cmake +@@ -19,31 +19,43 @@ + # Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com> + # Redistribution and use is allowed according to the terms of the 2-clause BSD license. + +-find_path(PEGTL_INCLUDE_DIR +- NAMES pegtl/version.hpp +- PATH_SUFFIXES tao +- DOC "Path to PEGTL headers") +-mark_as_advanced(PEGTL_INCLUDE_DIR) ++message(STATUS "Searching for PEGTL") ++find_package(PEGTL CONFIG REQUIRED) ++if(TARGET taocpp::pegtl) ++ message(STATUS "Searching for PEGTL - found target taocpp::pegtl") ++ set_target_properties(taocpp::pegtl PROPERTIES IMPORTED_GLOBAL TRUE) ++ if(NOT TARGET PEGTL::PEGTL) ++ add_library(PEGTL::PEGTL IMPORTED INTERFACE) ++ target_link_libraries(PEGTL::PEGTL INTERFACE taocpp::pegtl) ++ endif() ++else() ++ find_path(PEGTL_INCLUDE_DIR ++ NAMES pegtl/version.hpp ++ PATH_SUFFIXES tao ++ DOC "Path to PEGTL headers") ++ mark_as_advanced(PEGTL_INCLUDE_DIR) + +-if (PEGTL_INCLUDE_DIR) +- file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header +- REGEX "TAO_PEGTL_VERSION") +- string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") +- set(PEGTL_VERSION "${CMAKE_MATCH_1}") +- unset(_pegtl_version_header) +- unset(_pegtl_version_match) +-endif () ++ if (PEGTL_INCLUDE_DIR) ++ file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header ++ REGEX "TAO_PEGTL_VERSION") ++ string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") ++ set(PEGTL_VERSION "${CMAKE_MATCH_1}") ++ unset(_pegtl_version_header) ++ unset(_pegtl_version_match) ++ endif () + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(PEGTL +- REQUIRED_VARS PEGTL_INCLUDE_DIR +- VERSION_VAR PEGTL_VERSION) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(PEGTL ++ REQUIRED_VARS PEGTL_INCLUDE_DIR ++ VERSION_VAR PEGTL_VERSION) + +-if (PEGTL_FOUND) +- set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") +- if (NOT TARGET PEGTL::PEGTL) +- add_library(PEGTL::PEGTL INTERFACE IMPORTED) +- set_target_properties(PEGTL::PEGTL PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") +- endif () +-endif () ++ if (PEGTL_FOUND) ++ set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") ++ if (NOT TARGET PEGTL::PEGTL) ++ add_library(PEGTL::PEGTL INTERFACE IMPORTED) ++ set_target_properties(PEGTL::PEGTL PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") ++ endif () ++ message(STATUS "Searching for PEGTL - found") ++ endif () ++endif () +\ No newline at end of file diff --git a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch new file mode 100644 index 000000000000..b7b2e233cdb4 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch @@ -0,0 +1,15 @@ +--- 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-ThrustPatches.patch b/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch new file mode 100644 index 000000000000..82525e75d914 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch @@ -0,0 +1,51 @@ +From 4a4466e7c8cd44d2be2bd3fe6f359faa8e9547aa Mon Sep 17 00:00:00 2001 +From: Kenneth Moreland <morelandkd@ornl.gov> +Date: Tue, 4 Jun 2024 10:04:42 -0400 +Subject: [PATCH] Disable Thrust patch that is no longer needed in modern + Thrust + +There is a Thrust patch that works around an issue in Thrust 1.9.4 +(https://github.com/NVIDIa/ThirdParty/vtkm/vtkvtkm/vtk-m/thrust/issues/972). The underlying issue +should be fixed in recent versions. In recent versions of CUDA, the patch +breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818). + +This change fixes the problem by disabling the patch where it is not +needed. +--- /dev/null ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/docs/changelog/obsolete-thrust-patch.md +@@ -0,0 +1,9 @@ ++# Disable Thrust patch that is no longer needed in modern Thrust ++ ++There is a Thrust patch that works around an issue in Thrust 1.9.4 ++(https://github.com/NVIDIa/ThirdParty/vtkm/vtkvtkm/vtk-m/thrust/issues/972). The underlying issue ++should be fixed in recent versions. In recent versions of CUDA, the patch ++breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818). ++ ++This change fixes the problem by disabling the patch where it is not ++needed. +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ThrustPatches.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ThrustPatches.h +@@ -170,9 +170,9 @@ ALIGN_RE_PAIR(vtkm::Int64, vtkm::Float64); + #undef ALIGN_RE_PAIR + } + } +-#endif //THRUST_VERSION >= 100900 ++#endif //THRUST_VERSION >= 100900 && THRUST_VERSION < 100906 + +-#if THRUST_VERSION >= 100904 ++#if (THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909) + //So for thrust 1.9.4+ (CUDA 10.1+) the stateless_resource_allocator has a bug + //where it is not marked as __host__ __device__ && __thrust_exec_check_disable__. + //To fix this we add a new partial specialization on cuda::memory_resource +@@ -236,7 +236,7 @@ public: + }; + } + } +-#endif //THRUST_VERSION >= 100903 ++#endif //(THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909) + + + #if THRUST_VERSION < 100900 +-- +GitLab + diff --git a/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch b/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch new file mode 100644 index 000000000000..7dd005ff4191 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch @@ -0,0 +1,42 @@ +From: dd7acfb4548dc76f1191aa96778f35c0cda80d35 Mon Sep 17 00:00:00 2001 +From: David Gobbi <david.gobbi@gmail.com> +From: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10712 +Date: Sat, 18 Nov 2023 15:57:18 -0700 +Subject: [PATCH] Fix Java error with integer, enum overloads + +The Java wrappers simply cast enum types to 'jint', and do not +distinguish them as individual types that are distinct from 'int' +or 'unsigned int'. So when a method is overloaded with both 'int' +and an enum type, only one of the overloads can be wrapped. The +'int' (or 'unsigned int') is the one that is chosen. +--- a/Wrapping/Tools/vtkParseJava.c ++++ b/Wrapping/Tools/vtkParseJava.c +@@ -248,9 +248,10 @@ void return_result_native(FILE* fp) + * return 0 if the types do not map to the same type */ + static int CheckMatch(unsigned int type1, unsigned int type2, const char* c1, const char* c2) + { ++ /* VTK_PARSE_UNKNOWN is used for enum types, which are mapped to java's int type */ + static unsigned int byteTypes[] = { VTK_PARSE_UNSIGNED_CHAR, VTK_PARSE_SIGNED_CHAR, 0 }; + static unsigned int shortTypes[] = { VTK_PARSE_UNSIGNED_SHORT, VTK_PARSE_SHORT, 0 }; +- static unsigned int intTypes[] = { VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; ++ static unsigned int intTypes[] = { VTK_PARSE_UNKNOWN, VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; + static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG, + VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 }; + +--- a/Wrapping/Tools/vtkWrapJava.c ++++ b/Wrapping/Tools/vtkWrapJava.c +@@ -639,9 +639,10 @@ void OutputFunctionResult(FILE* fp) + * return 0 if the types do not map to the same type */ + static int CheckMatch(unsigned int type1, unsigned int type2, const char* c1, const char* c2) + { ++ /* VTK_PARSE_UNKNOWN is used for enum types, which are mapped to java's int type */ + static unsigned int byteTypes[] = { VTK_PARSE_UNSIGNED_CHAR, VTK_PARSE_SIGNED_CHAR, 0 }; + static unsigned int shortTypes[] = { VTK_PARSE_UNSIGNED_SHORT, VTK_PARSE_SHORT, 0 }; +- static unsigned int intTypes[] = { VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; ++ static unsigned int intTypes[] = { VTK_PARSE_UNKNOWN, VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; + static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG, + VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 }; + +-- +GitLab + diff --git a/sci-libs/vtk/files/vtk-9.3.0-java.patch b/sci-libs/vtk/files/vtk-9.3.0-java.patch new file mode 100644 index 000000000000..4b9125515eac --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-java.patch @@ -0,0 +1,11 @@ +--- a/Wrapping/Java/Testing/Java/CMakeLists.txt ++++ b/Wrapping/Java/Testing/Java/CMakeLists.txt +@@ -22,6 +22,8 @@ if (WIN32) + endif () + set(vtk_test_classpath + "$<TARGET_FILE:VTK::vtkjava>") ++list(APPEND vtk_test_classpath ++ ${java_classpath}) + string(REPLACE ";" "${classpath_separator}" vtk_test_classpath "${vtk_test_classpath}") + + add_library(vtkjava_tests STATIC diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch new file mode 100644 index 000000000000..0e6410c18ea0 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch @@ -0,0 +1,29 @@ +--- a/IO/OCCT/CMakeLists.txt ++++ b/IO/OCCT/CMakeLists.txt +@@ -5,11 +5,11 @@ vtk_module_find_package( + ) + + set(opencascade_req_targets +- TKSTEP +- TKIGES ++ TKDESTEP ++ TKDEIGES + TKMesh +- TKXDESTEP +- TKXDEIGES) ++ TKXSDRAWSTEP ++ TKXSDRAWIGES) + set(opencascade_missing_targets) + foreach (opencascade_req_target IN LISTS opencascade_req_targets) + if (NOT TARGET "${opencascade_req_target}") +--- a/IO/OCCT/vtkOCCTReader.cxx ++++ b/IO/OCCT/vtkOCCTReader.cxx +@@ -348,7 +348,7 @@ public: + int GetHash(const TDF_Label& label) + { + TopoDS_Shape aShape; +- return this->ShapeTool->GetShape(label, aShape) ? aShape.HashCode(INT_MAX) : 0; ++ return this->ShapeTool->GetShape(label, aShape) ? opencascade::hash(aShape) : 0; + } + + //---------------------------------------------------------------------------- diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch b/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch new file mode 100644 index 000000000000..d7e0e3f9556c --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch @@ -0,0 +1,15 @@ +From: https://gitlab.archlinux.org/archlinux/packaging/packages/vtk/-/blob/main/vtk-occt.patch +From: Sven-Hendrik Haase <svenstaro@archlinux.org> +--- a/IO/OCCT/vtkOCCTReader.h ++++ b/IO/OCCT/vtkOCCTReader.h +@@ -48,8 +48,8 @@ public: + * It can be either STEP or IGES. + * Default is FILE_FORMAT::STEP + */ +- VTK_DEPRECATED_IN_9_3_0("Use SetFormat with unsigned int instead.") +- vtkSetEnumMacro(FileFormat, Format); ++ // VTK_DEPRECATED_IN_9_3_0("Use SetFormat with unsigned int instead.") ++ // vtkSetEnumMacro(FileFormat, Format); + vtkSetClampMacro(FileFormat, unsigned int, Format::STEP, Format::IGES); + ///@} + diff --git a/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch new file mode 100644 index 000000000000..261f3736eb3d --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch @@ -0,0 +1,65 @@ +From: ccee5db79d6037c4d752b5f29dc30fb0dfd039bf Mon Sep 17 00:00:00 2001 +From: Timothée Couble <timothee.couble@kitware.com> +From: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10692 +Date: Fri, 10 Nov 2023 10:03:07 +0100 +Subject: [PATCH 1/2] IOPDAL: Always links with pdalcpp + +pdal_base and pdal_utils libraries are removed in PDAL 2.6.0 +link with pdalcpp instead starting from this version. +--- a/IO/PDAL/CMakeLists.txt ++++ b/IO/PDAL/CMakeLists.txt +@@ -3,14 +3,20 @@ vtk_module_find_package(PACKAGE PDAL VERSION 2.1) + set(classes + vtkPDALReader) + +-set(pdal_libraries pdal_util) +-if (APPLE OR WIN32) ++set(pdal_libraries) ++if (PDAL_VERSION VERSION_LESS "2.6") ++ set(pdal_libraries pdal_util) ++ if (APPLE OR WIN32) ++ list(APPEND pdal_libraries ++ pdalcpp) ++ else() ++ list(APPEND pdal_libraries ++ pdal_base) ++ endif() ++else () + list(APPEND pdal_libraries + pdalcpp) +-else() +- list(APPEND pdal_libraries +- pdal_base) +-endif() ++endif () + + vtk_module_add_module(VTK::IOPDAL + CLASSES ${classes}) +-- +GitLab + + +From 5bf45b44760bac09b0079827346e78af38d981af Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com> +Date: Fri, 10 Nov 2023 10:12:32 +0100 +Subject: [PATCH 2/2] Add support for PDAL 2.0 version + +--- a/IO/PDAL/CMakeLists.txt ++++ b/IO/PDAL/CMakeLists.txt +@@ -23,4 +23,13 @@ vtk_module_add_module(VTK::IOPDAL + vtk_module_link(VTK::IOPDAL + PRIVATE + ${pdal_libraries}) ++ ++# PDAL 2.0 didn't include interfaces to its exported targets. ++# Resolved in https://github.com/PDAL/PDAL/issues/2262. ++if (PDAL_VERSION VERSION_LESS "2.1") ++ vtk_module_include(VTK::IOPDAL ++ PRIVATE ++ ${PDAL_INCLUDE_DIRS}) ++endif () ++ + vtk_add_test_mangling(VTK::IOPDAL) +-- +GitLab + 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 new file mode 100644 index 000000000000..52c37250c7e7 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch @@ -0,0 +1,20 @@ +--- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx ++++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx +@@ -334,7 +334,7 @@ + auto TransformForScalarRange(const ArrayHandleType& src, + const vtkm::cont::ArrayHandle<vtkm::UInt8>& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly) + { +- DecoratorForScalarRanage decorator{ ghostValueToSkip, finitesOnly }; ++ DecoratorForScalarRanage decorator{ { ghostValueToSkip, finitesOnly } }; + return vtkm::cont::make_ArrayHandleDecorator(src.GetNumberOfValues(), decorator, src, ghost); + } + +@@ -342,7 +342,7 @@ + auto TransformForVectorRange(const ArrayHandleType& src, + const vtkm::cont::ArrayHandle<vtkm::UInt8>& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly) + { +- DecoratorForVectorRanage decorator{ ghostValueToSkip, finitesOnly }; ++ DecoratorForVectorRanage decorator{ { ghostValueToSkip, finitesOnly } }; + return vtkm::cont::make_ArrayHandleDecorator(src.GetNumberOfValues(), decorator, src, ghost); + } + diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml index 6c18a5feb9e9..6fb9cf742a2d 100644 --- a/sci-libs/vtk/metadata.xml +++ b/sci-libs/vtk/metadata.xml @@ -1,27 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>negril.nx+gentoo@gmail.com</email> + <name>Paul Zander</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> </maintainer> - <maintainer type="person" proxied="yes"> - <email>waebbl-gentoo@posteo.net</email> - <name>Bernd Waibel</name> - </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> - <description>Gentoo Proxy Maintainers</description> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="all-modules">Build all modules</flag> <flag name="boost">Add support for boost</flag> - <flag name="cuda">Add support for CUDA</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> <flag name="las">Build support for LiDAR files</flag> <flag name="logging">Build the logging module</flag> + <flag name="opencascade">Enable OpenCASCADE support</flag> <flag name="openvdb">Build support to handle VDB data files</flag> <flag name="pdal">Build support to handle point cloud data files</flag> <flag name="qt6">Use Qt6 packages instead of Qt5</flag> diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild index b02f2ee03056..7460dc7f2461 100644 --- a/sci-libs/vtk/vtk-9.2.5.ebuild +++ b/sci-libs/vtk/vtk-9.2.5.ebuild @@ -103,7 +103,7 @@ RDEPEND=" mysql? ( dev-db/mariadb-connector-c ) odbc? ( dev-db/unixODBC ) openvdb? ( media-gfx/openvdb:= ) - pdal? ( sci-libs/pdal:= ) + pdal? ( <sci-libs/pdal-2.6.0:= ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} diff --git a/sci-libs/vtk/vtk-9.2.6.ebuild b/sci-libs/vtk/vtk-9.2.6-r1.ebuild index 7f96653bff6a..bb87bdb1068e 100644 --- a/sci-libs/vtk/vtk-9.2.6.ebuild +++ b/sci-libs/vtk/vtk-9.2.6-r1.ebuild @@ -103,7 +103,7 @@ RDEPEND=" mysql? ( dev-db/mariadb-connector-c ) odbc? ( dev-db/unixODBC ) openvdb? ( media-gfx/openvdb:= ) - pdal? ( sci-libs/pdal:= ) + pdal? ( <sci-libs/pdal-2.6.0:= ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} @@ -164,6 +164,7 @@ PATCHES=( "${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 ) diff --git a/sci-libs/vtk/vtk-9.3.0.ebuild b/sci-libs/vtk/vtk-9.3.0.ebuild new file mode 100644 index 000000000000..cc7a1a438652 --- /dev/null +++ b/sci-libs/vtk/vtk-9.3.0.ebuild @@ -0,0 +1,915 @@ +# 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)" +MY_PV2="${PV/_rc/.rc}" + +DESCRIPTION="The Visualization Toolkit" +HOMEPAGE="https://www.vtk.org/" +SRC_URI=" + https://www.vtk.org/files/release/${MY_PV}/VTK-${MY_PV2}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKData-${MY_PV2}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${MY_PV2}.tar.gz + doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${MY_PV2}.tar.gz ) + examples? ( + https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${MY_PV2}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${MY_PV2}.tar.gz + ) + test? ( + https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${MY_PV2}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${MY_PV2}.tar.gz + ) +" +S="${WORKDIR}/VTK-${MY_PV2}" + +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 gles2-only imaging + java las +logging mpi mysql odbc opencascade 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 opencascade openvdb pdal + postgres rendering views + ) + cuda? ( video_cards_nvidia vtkm !tbb ) + java? ( rendering ) + python? ( ${PYTHON_REQUIRED_USE} ) + qt5? ( rendering ) + qt6? ( rendering ) + sdl? ( rendering ) + tk? ( python rendering ) + web? ( python ) + rendering? ( freetype 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/libharu-2.4.0:= + 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-11:= ) + las? ( sci-geosciences/liblas ) + mpi? ( virtual/mpi[cxx,romio] ) + mysql? ( dev-db/mariadb-connector-c ) + 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}] )') + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + ) + qt6? ( + !qt5? ( + 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} ) +" + +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-pdal-2.6.0.patch" + "${FILESDIR}/${PN}-9.3.0-too-many-initializer-values.patch" + "${FILESDIR}/${PN}-9.3.0-java.patch" + "${FILESDIR}/${PN}-9.3.0-opencascade.patch" + "${FILESDIR}/${PN}-9.3.0-fix-Java-error-with-integer-enum-overloads.patch" + "${FILESDIR}/${PN}-9.3.0-ThrustPatches.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}" +} + +vtk_check_compiler() { + [[ -z "$1" ]] && die "no compiler specified" + local compiler="$1" + local package="sys-devel/${compiler}" + local version="${package}" + local CUDAHOSTCXX_test + while + CUDAHOSTCXX="${CUDAHOSTCXX_test}" + version=$(best_version "${version}") + if [[ -z "${version}" ]]; then + if [[ -z "${CUDAHOSTCXX}" ]]; then + die "could not find supported version of ${package}" + fi + break + fi + CUDAHOSTCXX_test="$( + dirname "$( + realpath "$( + which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")" + )" + )" + )" + version="<${version}" + do ! echo "int main(){}" | nvcc "-ccbin=${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done +} + +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 + + use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" + + 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 + + use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" + + 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: 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 "../../VTK-${MY_PV2}/.ExternalData/README.rst" . || die + ln -sf "../../VTK-${MY_PV2}/.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_DEBUG_MODULE=ON + -DVTK_DEBUG_MODULE_ALL=ON + -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=OFF + + -DVTK_GROUP_ENABLE_Imaging="$(usex imaging "YES" "NO")" + -DVTK_GROUP_ENABLE_Rendering="$(usex rendering "YES" "NO")" + -DVTK_GROUP_ENABLE_StandAlone="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="YES" + -DVTK_MODULE_ENABLE_VTK_IOExportPDF="YES" + -DVTK_MODULE_ENABLE_VTK_IOLAS="$(usex las "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IONetCDF="YES" + -DVTK_MODULE_ENABLE_VTK_IOOCCT="$(usex opencascade "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOOggTheora="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 freetype "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig="$(usex freetype "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_cgns="YES" + -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="YES" + -DVTK_MODULE_ENABLE_VTK_hdf5="YES" + -DVTK_MODULE_ENABLE_VTK_jpeg="YES" + -DVTK_MODULE_ENABLE_VTK_jsoncpp="YES" + -DVTK_MODULE_ENABLE_VTK_libharu="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="YES" + -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="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_SMP_ENABLE_OPENMP="$(usex openmp)" + -DVTK_SMP_ENABLE_STDTHREAD="$(usex threads)" + -DVTK_SMP_ENABLE_TBB="$(usex tbb)" + + -DVTK_UNIFIED_INSTALL_TREE=ON + + -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 + tc-is-gcc && vtk_check_compiler "gcc" + tc-is-clang && vtk_check_compiler "clang" + [[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS" + : "${CUDAARCHS:=$(__nvcc_device_query)}" + einfo "building for CUDAARCHS = ${CUDAARCHS}" + + export CUDAARCHS + export CUDAHOSTCXX + unset NVCCFLAGS + 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="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 + export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" + 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 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="YES" + -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 qt5; 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" + ) + has_version "dev-qt/qtopengl:5[gles2-only]" || use gles2-only && mycmakeargs+=( + # Force using EGL & GLES + -DVTK_OPENGL_HAS_EGL=ON + -DVTK_OPENGL_USE_GLES=ON + ) + elif use qt6; then + mycmakeargs+=( + -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" + -DVTK_QT_VERSION="6" + ) + has_version "dev-qt/qtbase:6[gles2-only]" || use gles2-only && mycmakeargs+=( + # Force using EGL & GLES + -DVTK_OPENGL_HAS_EGL=ON + -DVTK_OPENGL_USE_GLES=ON + ) + else + mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) + fi + + if use qt5 || 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_NO_INSTALL_README_LICENSE=ON # bug #793221 + -DVTKm_Vectorization=native + ) + 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() { + if use cuda; then + cuda_add_sandbox -w + fi + + # don't work at all + REALLY_BAD_TESTS=( + "VTK::RenderingRayTracing-HeaderTest$" # (Failed) # 82 + "VTK::RenderingFreeTypeFontConfigCxx-TestSystemFontRendering$" # (Failed) # 309 + "VTK::IOMPIParallelPython-MPI-Plot3DMPIIO$" # (Failed) # 376 + "VTK::IOExportPDFCxx-TestPDFTransformedText-VerifyRasterizedPDFPNG$" # (Failed) # 483 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster$" # (Failed) # 494 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed) # 518 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed) # 519 + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItem$" # (Failed) # 732 + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItemWidget$" # (Failed) # 733 + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderWindow$" # (Failed) # 734 + "VTK::FiltersSelectionCxx-TestLinearSelector3D$" # (Failed) # 1102 + "VTK::FiltersParallelDIY2Cxx-MPI-TestProbeLineFilter$" # (Failed) # 1180 + "VTK::FiltersFlowPathsCxx-TestEvenlySpacedStreamlines2D$" # (Failed) # 1215 + "VTK::ChartsCoreCxx-TestChartDoubleColors$" # (Failed) # 1555 + "VTK::ChartsCoreCxx-TestChartDoubleColorsOpaque$" # (Failed) # 1556 + "VTK::ChartsCoreCxx-TestParallelCoordinatesDouble$" # (Failed) # 1599 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExternalFaces$" # (Failed) # 2142 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMHistogram$" # (Failed) # 2146 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes$" # (Failed) # 2148 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes2$" # (Failed) # 2149 + "VTK::FiltersGeneralCxx-TestContourTriangulatorHoles$" # (Failed) # 2305 + "VTK::FiltersCoreCxx-TestDecimatePolylineFilter$" # (Failed) # 2497 + "VTK::FiltersCorePython-TestSphereTreeFilter$" # (Failed) # 2617 + "VTK::CommonDataModelCxx-TestTriangle$" # (Failed) # 2770 + "VTK::CommonDataModelCxx-UnitTestCells$" # (Failed) # 2793 + "VTK::CommonDataModelCxx-TestHyperTreeGridGeometricLocator$" # (Failed) # 2799 + ) + + # don't work in src_test but when on their own + BAD_TESTS=( + "VTK::IOMotionFXCxx-TestMotionFXCFGReaderPositionFile$" # (Subprocess aborted) # 374 + + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run) # 517 + + "VTK::FiltersParallelDIY2Cxx-MPI-TestGhostCellsGenerator$" # (Timeout) # 1173 + "VTK::FiltersParallelDIY2Cxx-MPI-TestRedistributeDataSetFilterOnIOSS$" # (Timeout) # 1185 + "VTK::FiltersParallelDIY2Cxx-TestOverlappingCellsDetector$" # (Timeout) # 1193 + "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilter$" # (Timeout) # 1196 + "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilterOnIOSS$" # (Timeout) # 1197 + "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilterWithPolyData$" # (Timeout) # 1198 + "VTK::CommonCoreCxx-TestSMP$" # 2945 + + # "VTK::IOMovieCxx-TestAVIWriter$" # (Skipped) # 470 + # "VTK::IOMovieCxx-TestMP4Writer$" # (Skipped) # 471 + + "VTK::RenderingMatplotlibCxx-TestContextMathTextImage$" # (NUMERICAL) # 243 + "VTK::RenderingMatplotlibCxx-TestMathTextActor$" # (NUMERICAL) # 244 + "VTK::RenderingMatplotlibCxx-TestMathTextActor3D$" # (NUMERICAL) # 245 + "VTK::RenderingMatplotlibCxx-TestRenderString$" # (NUMERICAL) # 246 + "VTK::RenderingMatplotlibCxx-TestStringToPath$" # (NUMERICAL) # 247 + "VTK::RenderingMatplotlibCxx-TestIndexedLookupScalarBar$" # (NUMERICAL) # 248 + "VTK::RenderingMatplotlibCxx-TestScalarBarCombinatorics$" # (NUMERICAL) # 249 + "VTK::RenderingLICOpenGL2Cxx-TestImageDataLIC2D$" # (NUMERICAL) # 266 + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DXSlice$" # (NUMERICAL) # 267 + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DYSlice$" # (NUMERICAL) # 268 + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DZSlice$" # (NUMERICAL) # 269 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaults$" # (NUMERICAL) # 270 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlended$" # (NUMERICAL) # 271 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMapped$" # (NUMERICAL) # 272 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff$" # (NUMERICAL) # 273 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain$" # (NUMERICAL) # 274 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain$" # (NUMERICAL) # 275 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff$" # (NUMERICAL) # 276 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaultsColor$" # (NUMERICAL) # 277 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain$" # (NUMERICAL) # 278 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain$" # (NUMERICAL) # 279 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask$" # (NUMERICAL) # 280 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask$" # (NUMERICAL) # 281 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask$" # (NUMERICAL) # 282 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarDefaults$" # (NUMERICAL) # 283 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarContrastEnhanced$" # (NUMERICAL) # 284 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOff$" # (NUMERICAL) # 285 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform$" # (NUMERICAL) # 286 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin$" # (NUMERICAL) # 287 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICMultiBlockContrastEnhancedPerlin$" # (NUMERICAL) # 288 + "VTK::RenderingExternalCxx-TestGLUTRenderWindow$" # (Failed) # 311 + "VTK::ImagingOpenGL2Cxx-TestOpenGLImageGradient$" # (NUMERICAL) # 722 + # "VTK::InteractionWidgetsCxx-TestPickingManagerSeedWidget$" # (Timeout) # 838 + "VTK::InteractionWidgetsCxx-TestResliceCursorWidget2$" # (Failed) # 847 + "VTK::InteractionWidgetsCxx-TestResliceCursorWidget3$" # (Failed) # 848 + "VTK::InteractionWidgetsPython-TestTensorWidget2$" # (Failed) # 919 + # "VTK::FiltersModelingPython-TestCookieCutter4$" # (Timeout) # 1319 + "VTK::RenderingOpenGL2Cxx-TestGlyph3DMapperPickability$" # (Failed) # 1404 + "VTK::RenderingCoreCxx-TestTextureRGBADepthPeeling$" # (Failed) # 2020 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMCleanGrid$" # (NUMERICAL) # 2138 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClip$" # (NUMERICAL) # 2140 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClipWithImplicitFunction$" # (NUMERICAL) # 2141 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExtractVOI$" # (NUMERICAL) # 2143 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMLevelOfDetail$" # (NUMERICAL) # 2147 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointElevation$" # (NUMERICAL) # 2152 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointTransform$" # (NUMERICAL) # 2153 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPolyDataNormals$" # (NUMERICAL) # 2155 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold$" # (NUMERICAL) # 2157 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold2$" # (NUMERICAL) # 2158 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMTriangleMeshPointNormals$" # (NUMERICAL) # 2159 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpScalar$" # (NUMERICAL) # 2160 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpVector$" # (NUMERICAL) # 2161 + "VTK::AcceleratorsVTKmCoreCxx-TestVTKMImplicitDataArray$" # (NUMERICAL) # 2897 + ) + + SEQUENTIAL_TESTS=( + # TODO requires die -n + # "VTK::IOExportGL2PSCxx-.*$" + "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D$" + "VTK::IOExportGL2PSCxx-TestGL2PSContext$" + "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper$" + "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper$" + "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster$" + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster$" # (Failed) # 494 + "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSContext-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSContext-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-VerifyRasterizedPDFPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-VerifyRasterizedPDFPNG$" + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run) # 517 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed) # 518 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed) # 519 + "VTK::InteractionWidgetsCxx-TestPickingManagerSeedWidget$" # (Timeout) # 838 + "VTK::FiltersModelingPython-TestCookieCutter4$" # (Timeout) # 1319 + ) + + CMAKE_SKIP_TESTS=( + "${BAD_TESTS[@]}" + "${REALLY_BAD_TESTS[@]}" + "${SEQUENTIAL_TESTS[@]}" + ) + + virtx cmake_src_test + unset CMAKE_SKIP_TESTS + + myctestargs=( + -R "($( IFS='|'; echo "${SEQUENTIAL_TESTS[*]}"))" + -j1 + ) + # TODO requires die -n + # nonfatal \ + virtx cmake_src_test || einfo "These tests are known to fail" + + # TODO requires die -n + # myctestargs=( + # -R "($( IFS='|'; echo "${REALLY_BAD_TESTS[*]}"))" + # --timeout 600 + # ) + # nonfatal \ + # virtx cmake_src_test || einfo "These tests are known to fail" + + # TODO requires die -n + # myctestargs=( + # -R "($( IFS='|'; echo "${BAD_TESTS[*]}"))" + # --timeout 600 + # ) + # nonfatal \ + # virtx cmake_src_test || einfo "These tests are known to only fail inside 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/xdmf2/xdmf2-1.0_p141226-r4.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild index dcb07730f55c..e1064c8fca4b 100644 --- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild +++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.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=7 @@ -17,7 +17,7 @@ IUSE="doc test" RESTRICT="!test? ( test )" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND=" dev-libs/boost:= diff --git a/sci-libs/xgks-pmel/Manifest b/sci-libs/xgks-pmel/Manifest deleted file mode 100644 index 22f455f7aad6..000000000000 --- a/sci-libs/xgks-pmel/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xgks-pmel-2.5.5.tar.gz 1006581 BLAKE2B d44a956080382a7cb9758d54bc16528007a1b06abdb591cdff5cbdec4a292122916ff38503baca7ffb5a059eab21f26e5d9d6d71720a484201027032a62bf721 SHA512 001ef5742ebd93534569d650833ef04a82b01de819ceb2c3d3c750df58fd5bf9bbd538a79370b1d553db54477f409f6ab24958d3708260fb9ba7c8894ceb91c8 diff --git a/sci-libs/xgks-pmel/files/aclocal.patch b/sci-libs/xgks-pmel/files/aclocal.patch deleted file mode 100644 index dbedb2e49f29..000000000000 --- a/sci-libs/xgks-pmel/files/aclocal.patch +++ /dev/null @@ -1,146 +0,0 @@ ---- a/port/aclocal.m4 -+++ b/port/aclocal.m4 -@@ -582,26 +582,6 @@ - ])]) - - --# Check for ncdump(1) --# --define([UC_PROG_NCDUMP], [dnl --AC_PROGRAM_CHECK(NCDUMP, ncdump, ncdump, UC_ABSPATH($exec_prefix)/ncdump)dnl --if test `which "$NCDUMP" | wc -w` != 1; then -- UC_NEED_VALUE(NCDUMP, [netCDF lister], /usr/local/unidata/bin/ncdump)dnl --fi --]) -- -- --# Check for ncgen(1) --# --define([UC_PROG_NCGEN], [dnl --AC_PROGRAM_CHECK(NCGEN, ncgen, ncgen, UC_ABSPATH($exec_prefix)/ncgen)dnl --if test `which "$NCGEN" | wc -w` != 1; then -- UC_NEED_VALUE(NCGEN, [netCDF generator], /usr/local/unidata/bin/ncgen)dnl --fi --]) -- -- - # Test a script. - # - define([UC_TEST_SCRIPT], -@@ -719,16 +699,6 @@ - ]) - - --# Check for McIDAS library. --# --define([UC_LIB_MCIDAS], [dnl --echo checking for MCIDAS library --UC_TEST_LIB(LD_MCIDAS, /home/mcidas/lib /home/mcidasd/lib, mcidas, McIDAS, dnl -- -L/home/mcidas/lib -lmcidas)dnl --AC_PROVIDE([$0])dnl --]) -- -- - # Check for X11 library. - # - define([UC_LIB_X11], [dnl -@@ -745,77 +715,6 @@ - define([UC_X11], [AC_REQUIRE([UC_CPP_X11])AC_REQUIRE([UC_LIB_X11])]) - - --# Check for netCDF header-file directory. --# --define([UC_CPP_NETCDF], [dnl --echo checking for netCDF header-file --UC_TEST_DIR(CPP_NETCDF, UC_ABSPATH($prefix/[[[include]]]), netcdf.h, -- [netCDF [[include]]-directory], [-I/usr/local/unidata/[[include]]])dnl --CPP_NETCDF=`case ${CPP_NETCDF} in -I*) echo ${CPP_NETCDF};; *) echo -I${CPP_NETCDF-};; esac` --AC_PROVIDE([$0])dnl --]) -- -- --# Check for netCDF library. --# --define([UC_LIB_NETCDF], [dnl --echo checking for netCDF library --UC_TEST_LIB(LD_NETCDF, UC_ABSPATH($prefix/lib), netcdf, -- netCDF, -L/usr/local/unidata/lib -lnetcdf)dnl --AC_PROVIDE([$0])dnl --]) -- -- --# Check for netCDF implementation (header file and library). --# --define([UC_NETCDF], [AC_REQUIRE([UC_CPP_NETCDF])AC_REQUIRE([UC_LIB_NETCDF])]) -- -- --# Check for netCDF operators library. --# --define([UC_LIB_NCOPERS], [dnl --echo checking for netCDF operators library --UC_TEST_LIB(LD_NCOPERS, UC_ABSPATH($prefix/lib), ncopers, -- netCDF-operators, [-L/usr/local/unidata/lib -lncopers])dnl --AC_PROVIDE([$0])dnl --]) -- -- --# Check for LDM header-file directory. --# --define([UC_CPP_LDM], [dnl --echo checking for LDM header-file --UC_TEST_DIR(CPP_LDM, UC_ABSPATH($prefix/[[[include]]]) dnl -- UC_ABSPATH($prefix/../[[[include]]]) dnl -- UC_ABSPATH($prefix/../ldm/[[[include]]]), ldm.h, -- [LDM [[include]]-directory], [-I/usr/local/unidata/[[include]]])dnl --CPP_LDM=`case ${CPP_LDM} in -I*) echo ${CPP_LDM};; *) echo -I${CPP_LDM-};; esac` --if test -z "$CPP_LDM"; then -- UC_NEED_VALUE(CPP_LDM, [LDM include directory], -I/home/ldm/include)dnl --fi --AC_PROVIDE([$0])dnl --]) -- -- --# Check for LDM library. --# --define([UC_LIB_LDM], [dnl --echo checking for LDM library --UC_TEST_LIB(LD_LDM, UC_ABSPATH($prefix/lib) dnl -- UC_ABSPATH($prefix/../lib) UC_ABSPATH($prefix/../ldm/lib), ldm, -- LDM, -L/usr/local/unidata/lib -lldm)dnl --if test -z "$LD_LDM"; then -- UC_NEED_VALUE(LD_LDM, [LDM library], -L/home/ldm/lib -lldm)dnl --fi --AC_PROVIDE([$0])dnl --]) -- -- --# Check for LDM implementation (header file and library). --# --define([UC_LDM], [AC_REQUIRE([UC_CPP_LDM])AC_REQUIRE([UC_LIB_LDM])]) -- -- - # Check for udres(3) library. - # - define([UC_LIB_UDRES], [dnl ---- a/port/configure.in -+++ b/port/configure.in -@@ -24,8 +24,6 @@ - UC_PROG_FORTC - UC_PROG_NEQN - UC_PROG_TBL --UC_PROG_NCDUMP --UC_PROG_NCGEN - UC_PROG_INSTALL - - UC_UDPOSIX ---- a/port/master.mk.in -+++ b/port/master.mk.in -@@ -19,8 +19,6 @@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - FC = @FC@ --NCDUMP = @NCDUMP@ --NCGEN = @NCGEN@ - NEQN = @NEQN@ - OS = @OS@ - SHELL = /bin/sh diff --git a/sci-libs/xgks-pmel/metadata.xml b/sci-libs/xgks-pmel/metadata.xml deleted file mode 100644 index fafca56c2a24..000000000000 --- a/sci-libs/xgks-pmel/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-geosciences@gentoo.org</email> - <name>Gentoo Geosciences Project</name> - </maintainer> - <longdescription> - XGKS is a level 2C implementation of the ANSI Graphical Kernel System (GKS) for - X-windows, with a C and Fortran interface. This version has support for PMEL's - Ferret visualization tool. - </longdescription> -</pkgmetadata> diff --git a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild deleted file mode 100644 index 9c3d8b3a73bc..000000000000 --- a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fortran-2 toolchain-funcs - -DESCRIPTION="PMEL fork of XGKS, an X11-based version of the ANSI Graphical Kernel System" -HOMEPAGE="http://www.gentoogeek.org/viewvc/Linux/xgks-pmel/" -SRC_URI="http://www.gentoogeek.org/files/${P}.tar.gz" - -LICENSE="UCAR-Unidata" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/flex - sys-apps/groff" - -PATCHES=( "${FILESDIR}"/aclocal.patch ) - -src_configure() { - sed -i -e "s:lib64:$(get_libdir):g" port/master.mk.in \ - fontdb/Makefile.in || die - - CFLAGS="${CFLAGS}" LD_X11='-L/usr/$(get_libdir) -lX11' \ - FC="$(tc-getFC)" CC="$(tc-getCC)" OS=linux \ - ./configure --prefix=/usr --exec_prefix=/usr/bin \ - || die -} - -src_compile() { - sed -i -e "s:port/all port/install:port/all:g" Makefile \ - || die - - # Fails parallel build, bug #295724 - emake -j1 - emake -C src/fortran -j1 -} - -src_install() { - pushd progs >/dev/null || die - local tool - for tool in defcolors font mi pline pmark; do - newbin ${tool} xgks-${tool} - done - popd >/dev/null || die - - dolib.a src/lib/libxgks.a - - dodoc COPYRIGHT HISTORY README - doman doc/{xgks.3,xgks_synop.3} - if use doc; then - newdoc doc/binding/cbinding.me cbinding - newdoc doc/userdoc/userdoc.me userdoc - - docinto examples - dodoc progs/{hanoi.c,star.f} - fi - - insinto /usr/include/xgks - doins src/lib/gks*.h - doins src/lib/gksm/gksm*.h - doins src/fortran/f*.h - doins src/lib/w*.h - doins src/lib/{input.h,metafile.h,polylines.h,polymarkers.h,text.h} - - insinto /usr/include - doins src/lib/xgks.h - doins port/udposix.h - - insinto /usr/share/xgksfonts - doins fontdb/{[1-9],*.gksfont} -} diff --git a/sci-libs/xylib/metadata.xml b/sci-libs/xylib/metadata.xml index b767e81c5621..f99666ec7813 100644 --- a/sci-libs/xylib/metadata.xml +++ b/sci-libs/xylib/metadata.xml @@ -6,11 +6,12 @@ <name>Gentoo Science Project</name> </maintainer> <longdescription lang="en"> - xylib is a portable C++ library for reading files that contain x-y - data from powder diffraction, spectroscopy or other experimental - methods. It supports many formats. + xylib is a portable C++ library for reading files that contain x-y + data from powder diffraction, spectroscopy or other experimental + methods. It supports many formats. </longdescription> <upstream> <remote-id type="sourceforge">xylib</remote-id> + <remote-id type="github">wojdyr/xylib</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/xylib/xylib-1.6.ebuild b/sci-libs/xylib/xylib-1.6-r1.ebuild index 49e226d26949..1428662cc66d 100644 --- a/sci-libs/xylib/xylib-1.6.ebuild +++ b/sci-libs/xylib/xylib-1.6-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +WX_GTK_VER=3.2-gtk3 -WX_GTK_VER=3.0-gtk3 - -inherit wxwidgets +inherit desktop wxwidgets DESCRIPTION="Experimental x-y data reading library" HOMEPAGE="https://github.com/wojdyr/xylib" @@ -19,10 +18,11 @@ IUSE="bzip2 gui zlib" RDEPEND=" bzip2? ( app-arch/bzip2 ) gui? ( x11-libs/wxGTK:${WX_GTK_VER} ) - zlib? ( sys-libs/zlib )" -DEPEND=" - ${RDEPEND} - dev-libs/boost" + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND} + dev-libs/boost +" src_configure() { use gui && setup-wxwidgets @@ -36,7 +36,8 @@ src_configure() { src_install() { default - - # no static archives find "${ED}" -name '*.la' -delete || die + + newicon gui/xyconvert48.xpm xyconvert.xpm + make_desktop_entry xyconvert xyConvert xyconvert.xpm } |