diff options
Diffstat (limited to 'sci-libs')
479 files changed, 11507 insertions, 4951 deletions
diff --git a/sci-libs/XNNPACK/Manifest b/sci-libs/XNNPACK/Manifest index 60b8d1d259f6..f095db09ce21 100644 --- a/sci-libs/XNNPACK/Manifest +++ b/sci-libs/XNNPACK/Manifest @@ -1 +1,2 @@ DIST XNNPACK-2022.02.17.tar.gz 6761154 BLAKE2B 59be5d9efe6f46d22bc41d3152e6cd3103f6dfafd94cdf3229b86ecf44a46175c613760f3de35c98a24ccdec1783f205c1eceaf21133706fedd5f384529748eb SHA512 aacbe907bb2b7429143f4ec612881fb709fe37e7b3a7f4fd68193dee6bbe82e17d20b2c6f5a8025845a09f8269c1dfeaebfc5bd64ef196fa376d82ac9a44cb8f +DIST XNNPACK-2022.12.22.tar.gz 8342018 BLAKE2B 50426a47121418ef00a29b390ab4bb28211c17faaa7f4eacbf3a363fc3511b8655687e7f7f93f13b06a72ff9bcbde033305372687b6f2df1e1d5abaa910fe8be SHA512 1742ad4de3aa1a67cd5a3cbf15d82afc2cc8569a2abac92542f748a440ef37fef4e9d9c302b7b2813e3176934b637c761c1c0956d20ab1ba28b280d9b121d91b diff --git a/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild b/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild new file mode 100644 index 000000000000..c30a840eaf57 --- /dev/null +++ b/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild @@ -0,0 +1,84 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +CommitId=51a987591a6fc9f0fc0707077f53d763ac132cbf + +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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+assembly jit +memopt +sparse static-libs test" + +RDEPEND=" + dev-libs/cpuinfo + dev-libs/pthreadpool +" +DEPEND="${RDEPEND} + dev-libs/FP16 + dev-libs/FXdiv +" + +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( static-libs )" + +S="${WORKDIR}"/${PN}-${CommitId} + +PATCHES=( + "${FILESDIR}"/${PN}-2022.02.17-gentoo.patch +) + +src_prepare() { + sed -i \ + -e "/PRIVATE fp16)/d" \ + -e "/PRIVATE fxdiv)/d" \ + -e "/PRIVATE clog)/d" \ + -e "/TARGET_LINK_LIBRARIES/s: fp16::" \ + CMakeLists.txt \ + || die + dropTest=( + "add-nd-test" + "subtract-nd-test" + "f32-velu-test" + "qc8-dwconv-minmax-fp32-test" + "qs8-dwconv-minmax-fp32-test" + "qs8-vadd-minmax-test" + "qs8-vaddc-minmax-test" + "qu8-dwconv-minmax-fp32-test" + "qu8-vadd-minmax-test" + "qu8-vaddc-minmax-test" + ) + for id in ${dropTest[@]} + do + sed -i \ + -e "/ADD_TEST(${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 + ) + + cmake_src_configure + cd "${BUILD_DIR}" +} diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild index 319992e2bc19..f3cb7554fab1 100644 --- a/sci-libs/adolc/adolc-2.7.2.ebuild +++ b/sci-libs/adolc/adolc-2.7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/ADOL-C-releases-${PV}" fi diff --git a/sci-libs/alglib/alglib-3.17.0.ebuild b/sci-libs/alglib/alglib-3.17.0.ebuild index e8fbf3344823..1b837edafa87 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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ S="${WORKDIR}"/cpp LICENSE="GPL-2+" SLOT="0/3.8" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest index d2a28a0930ce..fe9a4be11e6d 100644 --- a/sci-libs/amd/Manifest +++ b/sci-libs/amd/Manifest @@ -1 +1,2 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57 diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild index 11ef66de0ef0..01cba33f2c7c 100644 --- a/sci-libs/amd/amd-2.4.6-r1.ebuild +++ b/sci-libs/amd/amd-2.4.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="doc fortran" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/amd/amd-3.0.3.ebuild b/sci-libs/amd/amd-3.0.3.ebuild new file mode 100644 index 000000000000..e135d6975e08 --- /dev/null +++ b/sci-libs/amd/amd-3.0.3.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED="fortran" +inherit cmake-multilib fortran-2 + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fortran test" +RESTRICT="!test? ( test )" + +DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( virtual/latex-base )" + +S="${WORKDIR}/${Sparse_P}/${PN^^}" + +multilib_src_configure() { + local mycmakeargs=( + -DNSTATIC=ON + -DNFORTRAN=$(usex fortran OFF ON) + -DDEMO=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + # Run demo files + local demofiles=( + amd_demo + amd_l_demo + amd_demo2 + amd_simple + ) + if use fortran; then + demofiles+=( + amd_f77simple + amd_f77demo + ) + fi + for i in ${demofiles[@]}; do + ./"${i}" > "${i}.out" || die "failed to run test ${i}" + diff "${S}/Demo/${i}.out" "${i}.out" || die "failed testing ${i}" + done + einfo "All tests passed" +} + +multilib_src_install() { + if use doc; then + pushd "${S}/Doc" + emake clean + rm -rf *.pdf + emake + popd + DOCS="${S}/Doc/*.pdf" + fi + cmake_src_install +} diff --git a/sci-libs/amd/metadata.xml b/sci-libs/amd/metadata.xml index 056fcec28700..1ecd509a217e 100644 --- a/sci-libs/amd/metadata.xml +++ b/sci-libs/amd/metadata.xml @@ -10,4 +10,7 @@ factorization (or for LU factorization with diagonal pivoting). There are versions in both C and Fortran. </longdescription> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/arborx/Manifest b/sci-libs/arborx/Manifest index fdd46ae98bd0..4cf219e6a8a7 100644 --- a/sci-libs/arborx/Manifest +++ b/sci-libs/arborx/Manifest @@ -1 +1 @@ -DIST arborx-1.2.tar.gz 380705 BLAKE2B eb0006e69edb6cfd1d402dfe5a58db76954c34f847ce8acd1c0f2bd2044a29a434fc01df67829fce4ec911f5c882c1625aa7a50bc39a5d33dfb2c26d6a4cbb4f SHA512 d48650b11fc26770c43f4821999647acb0c7675367e416ad025ab21eb50da66c732f03bc6decf840d25dac26ff7f1f5dca77b7514dffc619cef8d401e83a8795 +DIST arborx-1.4.1.tar.gz 408999 BLAKE2B 83e172f89ac8ff82d4add40fd036457d9c563b44c11b15d86aa884dc03742f3e22a13cc4b6f068ef377fcd8e63d239f704dd1821772079d2f9f8c169b1f31fae SHA512 3799deed5eae1e6092c19a62894207ac0ccd81ba84c8d42734fa3d0e5a3fc9d6a8f7b1442d2203b06f4e251970569f67506d419fb6695039c11e78dfd740e565 diff --git a/sci-libs/arborx/arborx-1.2.ebuild b/sci-libs/arborx/arborx-1.4.1-r1.ebuild index 68330b8a5df7..84b2bc0e85a4 100644 --- a/sci-libs/arborx/arborx-1.2.ebuild +++ b/sci-libs/arborx/arborx-1.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,6 +24,13 @@ 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)" diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index d8c0ddb187dc..c7308e237c4e 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,4 +1 @@ -DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd -DIST armadillo-10.7.1.tar.xz 6258792 BLAKE2B cc820638dd7b571b5654e14bb82ced3586cb2950b1fb5aebf6bdd9439151353c4750296aaa4d15144ade6ed13e52743ac41e3cf34b824809931c3c031804bddf SHA512 b9be6a38165a4d23a61715a3c3f970dcb9b813bebd51b7372a4e8349ab2c351cd5c74f662d860911b30b2b816f2eb1255768fab1497ec087a63a07f56f74327f -DIST armadillo-10.8.2.tar.xz 6262832 BLAKE2B f8a5a66464614661bcccffb8138434d117ad07dcea5f89ddde45df293df5dd4f10def2085b85d37386337fd8bd0152914a957e0b1b7919a47ec8b1a79e92b90b SHA512 720fadad491dfeeb894544b0305cd64a0e0402e66fc788949ecd54c0b1a3b9c3ede9f75b081f832931d59d2bd59529cebb9d5b57b8582df869765cac01c2979b -DIST armadillo-11.4.0.tar.xz 6804388 BLAKE2B cb44d248cf817f66cc0b6aa968535e266282775b20035f46f3158687100c0f49c6cf4fad8d1f2ec1741f9bceb06c5a841f20f3b7e59146f2fe57c86d00741434 SHA512 21d58b383229f55bf6a3b217c04901982b484b6d806dd3c4a72ebe5a9614f63f9429ca31ea7cfc26672b70e01a0b9263a9d4edf69a0080706ade87852f94970c +DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f855039cc81c3300c83e5e932ee4cda233731b53623303c1c739feae9b007f8f6309c09debe79923e3876e8145015152 SHA512 a9f8cd19384eed787787b9e189901a1800e6e1dd06917f4f13e8a215c83f317de3e5b0ae8625783f88d9a7b0ab25f5c7784ccf0493c08a9ee3ea7fdfbbe36195 diff --git a/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild b/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild deleted file mode 100644 index bf6e45bd7854..000000000000 --- a/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake toolchain-funcs multilib - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="https://arma.sourceforge.net" -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0/10" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( lapack )" - -# atlas? ( sci-libs/atlas[lapack] ) - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack ) - superlu? ( >=sci-libs/superlu-5.2 ) -" - -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5 ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) -" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5 ) - mkl? ( sci-libs/mkl ) -" - -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 hdf5; then - mycmakeargs+=( - -DDETECT_HDF5=ON - -DHDF5_LIBRARIES="-lhdf5" - -DHDF5_INCLUDE_DIRS=/usr/include - ) - else - mycmakeargs+=( - -DDETECT_HDF5=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() { - pushd examples > /dev/null - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="-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}" ./example1 || 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/armadillo-10.7.1.ebuild b/sci-libs/armadillo/armadillo-10.7.1.ebuild deleted file mode 100644 index 879006ea7c98..000000000000 --- a/sci-libs/armadillo/armadillo-10.7.1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake toolchain-funcs multilib - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="https://arma.sourceforge.net" -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0/10" -KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( lapack )" - -# atlas? ( sci-libs/atlas[lapack] ) - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack ) - superlu? ( >=sci-libs/superlu-5.2 ) -" - -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5 ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) -" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5 ) - mkl? ( sci-libs/mkl ) -" - -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 hdf5; then - mycmakeargs+=( - -DDETECT_HDF5=ON - -DHDF5_LIBRARIES="-lhdf5" - -DHDF5_INCLUDE_DIRS=/usr/include - ) - else - mycmakeargs+=( - -DDETECT_HDF5=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() { - pushd examples > /dev/null - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="-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}" ./example1 || 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/armadillo-10.8.2.ebuild b/sci-libs/armadillo/armadillo-10.8.2.ebuild deleted file mode 100644 index 637bacec3260..000000000000 --- a/sci-libs/armadillo/armadillo-10.8.2.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake toolchain-funcs multilib - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="https://arma.sourceforge.net" -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0/10" -KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( lapack )" - -# atlas? ( sci-libs/atlas[lapack] ) - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack ) - superlu? ( >=sci-libs/superlu-5.2 ) -" - -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5:= ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) -" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5:= ) - mkl? ( sci-libs/mkl ) -" - -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 hdf5; then - mycmakeargs+=( - -DDETECT_HDF5=ON - -DHDF5_LIBRARIES="-lhdf5" - -DHDF5_INCLUDE_DIRS=/usr/include - ) - else - mycmakeargs+=( - -DDETECT_HDF5=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() { - pushd examples > /dev/null - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="-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}" ./example1 || 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/armadillo-11.4.0.ebuild b/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild index efbac097f195..8139c09c283a 100644 --- a/sci-libs/armadillo/armadillo-11.4.0.ebuild +++ b/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 +EAPI=8 inherit cmake toolchain-funcs multilib @@ -12,36 +10,29 @@ HOMEPAGE="https://arma.sourceforge.net" SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" LICENSE="Apache-2.0" -SLOT="0/11" -KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" +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 ) - hdf5? ( sci-libs/hdf5:= ) lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) -" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5:= ) - mkl? ( sci-libs/mkl ) " PATCHES=( - "${FILESDIR}/${P}-extratests.patch" + "${FILESDIR}/${PN}-12.0.1-extratests.patch" ) src_prepare() { @@ -93,17 +84,6 @@ src_configure() { -DBLAS_FOUND=OFF ) fi - if use hdf5; then - mycmakeargs+=( - -DDETECT_HDF5=ON - -DHDF5_LIBRARIES="-lhdf5" - -DHDF5_INCLUDE_DIRS=/usr/include - ) - else - mycmakeargs+=( - -DDETECT_HDF5=OFF - ) - fi if use lapack; then mycmakeargs+=( -DLAPACK_FOUND=ON diff --git a/sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch b/sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch deleted file mode 100644 index 7efb67b5b139..000000000000 --- a/sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN armadillo-11.4.0.orig/tests2/Makefile armadillo-11.4.0/tests2/Makefile ---- armadillo-11.4.0.orig/tests2/Makefile 2022-10-03 19:26:59.699937940 +0200 -+++ armadillo-11.4.0/tests2/Makefile 2022-10-03 19:27:24.954277418 +0200 -@@ -3,7 +3,7 @@ - #LIB_FLAGS = -lblas -llapack - #LIB_FLAGS = -lopenblas -llapack - --CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -+#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 - #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -fopenmp - #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -DARMA_DONT_USE_WRAPPER - #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -fsanitize=address -fsanitize=leak -fsanitize=undefined -fsanitize=bounds -fsanitize=bounds-strict -g diff --git a/sci-libs/armadillo/files/armadillo-12.0.1-extratests.patch b/sci-libs/armadillo/files/armadillo-12.0.1-extratests.patch new file mode 100644 index 000000000000..e677c4ab3069 --- /dev/null +++ b/sci-libs/armadillo/files/armadillo-12.0.1-extratests.patch @@ -0,0 +1,12 @@ +diff -ruN armadillo-12.0.1.orig/tests2/Makefile armadillo-12.0.1/tests2/Makefile +--- armadillo-12.0.1.orig/tests2/Makefile 2016-06-16 18:26:01.000000000 +0200 ++++ armadillo-12.0.1/tests2/Makefile 2023-04-02 16:32:47.256287438 +0200 +@@ -4,7 +4,7 @@ + #LIB_FLAGS = -lopenblas -llapack + + #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 +-CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og ++#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og + #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og -fopenmp + #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og -DARMA_DONT_USE_WRAPPER + #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og -fsanitize=address -fsanitize=leak -fsanitize=undefined -fsanitize=bounds -fsanitize=bounds-strict -g diff --git a/sci-libs/arpack/arpack-3.8.0.ebuild b/sci-libs/arpack/arpack-3.8.0-r1.ebuild index 638ce2890cf1..33421451eea4 100644 --- a/sci-libs/arpack/arpack-3.8.0.ebuild +++ b/sci-libs/arpack/arpack-3.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -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 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="doc examples mpi" RDEPEND=" @@ -35,6 +35,7 @@ src_prepare() { src_configure() { econf \ --disable-static \ + --enable-icb \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ $(use_enable mpi) diff --git a/sci-libs/arpack/arpack-3.9.0.ebuild b/sci-libs/arpack/arpack-3.9.0-r1.ebuild index cfd783760a46..543b592a542d 100644 --- a/sci-libs/arpack/arpack-3.9.0.ebuild +++ b/sci-libs/arpack/arpack-3.9.0-r1.ebuild @@ -35,6 +35,7 @@ src_prepare() { src_configure() { econf \ --disable-static \ + --enable-icb \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ $(use_enable mpi) diff --git a/sci-libs/arpack/arpack-9999.ebuild b/sci-libs/arpack/arpack-9999.ebuild index 4130db5de749..543b592a542d 100644 --- a/sci-libs/arpack/arpack-9999.ebuild +++ b/sci-libs/arpack/arpack-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,6 +35,7 @@ src_prepare() { src_configure() { econf \ --disable-static \ + --enable-icb \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ $(use_enable mpi) diff --git a/sci-libs/atlas/atlas-3.10.2.ebuild b/sci-libs/atlas/atlas-3.10.2.ebuild index b763f1f14b3f..6bddbb7be902 100644 --- a/sci-libs/atlas/atlas-3.10.2.ebuild +++ b/sci-libs/atlas/atlas-3.10.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2 LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc fortran generic lapack static-libs threads" RDEPEND="" diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest index 5e90ff7400e3..feff64952906 100644 --- a/sci-libs/blis/Manifest +++ b/sci-libs/blis/Manifest @@ -1,3 +1 @@ -DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206 -DIST blis-0.8.1.tar.gz 13442609 BLAKE2B cc4167aaa6461b73876f428de2ab02107803fd6d63df101bf30de4c6ca57241e29f09dfb82fe1cfec8c661b2d9efe65ab854ad7719bf36e27f8a33bf3dd4bb92 SHA512 f920e6ae699af899caca27274b55bb944c886c882dfc06bc2f66d069c08e6d4999c130626cd96297308c1b7e85e77e6552bf981cce37dbbaa5acdf0cb5078e02 DIST blis-0.9.0.tar.gz 15078619 BLAKE2B f7c9632024e0adbba370a4077a7a47f05c54779ad6195b2ccda0950df8e784b8988b4338758ec2fabd424a69009010f8f02cbaef0eda1d74f6794127b43b4f70 SHA512 01e1990eefa4387839ac404089e4ffa32922ceaa30a1747c08a931c67706bcf29fed9d25e30c0faa36bba4f460821290e7973ed6b657d2cd95e126caaf853f81 diff --git a/sci-libs/blis/blis-0.6.0.ebuild b/sci-libs/blis/blis-0.6.0.ebuild deleted file mode 100644 index 1a2cb188cd4c..000000000000 --- a/sci-libs/blis/blis-0.6.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_9 ) -inherit python-any-r1 - -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 ~ppc64 ~x86" -IUSE="doc eselect-ldso openmp pthread serial 64bit-index" -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}" - -PATCHES=( - "${FILESDIR}"/${P}-rpath.patch - "${FILESDIR}"/${P}-blas-provider.patch -) - -src_configure() { - local BLIS_FLAGS=() - local confname - # 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 ) - # 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 \ - --enable-verbose-make \ - --prefix="${BROOT}"/usr \ - --libdir="${BROOT}"/usr/$(get_libdir) \ - --disable-static \ - --enable-blas \ - --enable-cblas \ - "${BLIS_FLAGS[@]}" \ - --enable-shared \ - $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() { - emake check -} - -src_install() { - default - use doc && dodoc README.md docs/*.md - - if use eselect-ldso; then - dodir /usr/$(get_libdir)/blas/blis - 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/blis-0.8.1.ebuild b/sci-libs/blis/blis-0.8.1.ebuild deleted file mode 100644 index 6fcbb32c9459..000000000000 --- a/sci-libs/blis/blis-0.8.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit python-any-r1 - -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 ~ppc64 ~x86" -IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index" -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}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.0-rpath.patch - "${FILESDIR}"/${PN}-0.6.0-blas-provider.patch - "${FILESDIR}"/${P}-pkg-config.patch -) - -src_configure() { - local BLIS_FLAGS=() - local confname - # 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 ) - # 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 \ - --enable-verbose-make \ - --prefix="${BROOT}"/usr \ - --libdir="${BROOT}"/usr/$(get_libdir) \ - $(use_enable static-libs static) \ - --enable-blas \ - --enable-cblas \ - "${BLIS_FLAGS[@]}" \ - --enable-shared \ - $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() { - emake check -} - -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-0.6.0-rpath.patch b/sci-libs/blis/files/blis-0.6.0-rpath.patch deleted file mode 100644 index a8b5a46870d1..000000000000 --- a/sci-libs/blis/files/blis-0.6.0-rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common.mk b/common.mk -index ef0acfb..e1ce31d 100644 ---- a/common.mk -+++ b/common.mk -@@ -527,7 +527,7 @@ LIBBLIS_L := $(LIBBLIS_SO) - LIBBLIS_LINK := $(LIBBLIS_SO_PATH) - ifeq ($(IS_WIN),no) - # For Linux and OS X: set rpath property of shared object. --LDFLAGS += -Wl,-rpath,$(BASE_LIB_PATH) -+#LDFLAGS += -Wl,-rpath,$(BASE_LIB_PATH) - endif - endif - endif diff --git a/sci-libs/blis/metadata.xml b/sci-libs/blis/metadata.xml index 0793096590bb..c2cbc3c280d1 100644 --- a/sci-libs/blis/metadata.xml +++ b/sci-libs/blis/metadata.xml @@ -4,6 +4,7 @@ <upstream> <bugs-to>https://github.com/flame/blis/issues/</bugs-to> <doc>https://github.com/flame/blis</doc> + <remote-id type="github">flame/blis</remote-id> </upstream> <maintainer type="person" proxied="yes"> <name>Mo Zhou</name> diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest index 69758a8152ae..6a7b83ca6e7d 100644 --- a/sci-libs/bliss/Manifest +++ b/sci-libs/bliss/Manifest @@ -1,2 +1 @@ -DIST bliss-0.73.zip 94108 BLAKE2B 836184b31fa28db3328c21e7563366a93cf1645b02b96e185838e3c2513393b1d0a54783ca14c6d7f1a1d5055800bc3d7acde3c584e61e66c9ab93936824353b SHA512 30f505945c577d8bcb265a349f5bc9d4dcd96555fa3add285199cdd95ea2710f04409008ff06432daffab62c132e884845eae7f823191407906202862509e05d DIST bliss-0.77.zip 117888 BLAKE2B ce4b2fa568c5520fe41748bf59a493af1c33ec9cc0732aca5e5ba657ca726e118e26763355778e3def5716d62e7d3aceceb592ef67e5e148c250d3ffffab67d7 SHA512 d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17 diff --git a/sci-libs/bliss/bliss-0.73-r2.ebuild b/sci-libs/bliss/bliss-0.73-r2.ebuild deleted file mode 100644 index 9293ac0a67aa..000000000000 --- a/sci-libs/bliss/bliss-0.73-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip" -DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs" -HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/" - -LICENSE="LGPL-3" -SLOT="0/1" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc gmp static-libs" - -RDEPEND="gmp? ( dev-libs/gmp:0= )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( app-doc/doxygen )" - -#patches from http://pkgs.fedoraproject.org/cgit/rpms/bliss.git/tree/ -PATCHES=( - "${FILESDIR}"/${P}-error.patch - "${FILESDIR}"/${P}-rehn.patch - "${FILESDIR}"/${P}-clang.patch - "${FILESDIR}"/${P}-autotools.patch -) - -src_prepare() { - default - cp "${FILESDIR}/${P}.1.in" "${PN}.1.in" || die - rm Makefile || die - eautoreconf -} - -src_configure() { - econf $(use_with gmp) $(use_enable static-libs static) -} - -src_compile() { - emake all $(usex doc html "") -} - -src_install() { - default - use static-libs || find "${ED}" -name '*.la' -delete - use doc && dodoc -r html -} diff --git a/sci-libs/bliss/bliss-0.77.ebuild b/sci-libs/bliss/bliss-0.77.ebuild index cd1ab52001da..1d14bb380cb3 100644 --- a/sci-libs/bliss/bliss-0.77.ebuild +++ b/sci-libs/bliss/bliss-0.77.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ HOMEPAGE="https://users.aalto.fi/~tjunttil/bliss/index.html" LICENSE="LGPL-3" SLOT="0/1" -KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="gmp" RDEPEND="gmp? ( dev-libs/gmp:0= )" diff --git a/sci-libs/bliss/files/bliss-0.73-autotools.patch b/sci-libs/bliss/files/bliss-0.73-autotools.patch deleted file mode 100644 index efdbcb81b42a..000000000000 --- a/sci-libs/bliss/files/bliss-0.73-autotools.patch +++ /dev/null @@ -1,99 +0,0 @@ -Replace simple Makefile by autotools -- allow shared library -- parallel build -- added pkg-config support - -Author: Christoph Junghans <junghans@gentoo.org> - -diff -Naur bliss-0.72-fedora/config/.dummy bliss-0.72/config/.dummy ---- bliss-0.72-fedora/config/.dummy 1969-12-31 17:00:00.000000000 -0700 -+++ bliss-0.72/config/.dummy 2013-04-28 14:43:06.143760368 -0600 -@@ -0,0 +1 @@ -+Dummy file to make patch create config dir, which is needed for autotools -diff -Naur bliss-0.72-fedora/configure.ac bliss-0.72/configure.ac ---- bliss-0.72-fedora/configure.ac 1969-12-31 17:00:00.000000000 -0700 -+++ bliss-0.72/configure.ac 2013-04-28 14:40:42.283242722 -0600 -@@ -0,0 +1,32 @@ -+AC_PREREQ([2.65]) -+AC_INIT([bliss], [0.73], [Tommi.Junttil@kk.fi]) -+ -+AC_CONFIG_AUX_DIR(config) -+AC_CONFIG_MACRO_DIR(config) -+ -+AM_INIT_AUTOMAKE([1.8 foreign]) -+ -+SHARED_VERSION_INFO="1:0:0" -+AC_SUBST(SHARED_VERSION_INFO) -+ -+# Checks for programs. -+AC_PROG_CXX -+ -+LT_INIT -+# Checks for libraries. -+AC_ARG_WITH([gmp], -+ [AS_HELP_STRING([--with-gmp], [enable support for GNU Multiple Precision Arithmetic Library @<:@default=check@:>@])], -+ [], [with_gmp=no]) -+AS_IF([test "x$with_gmp" != xno], -+ [AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Cannot find gmp.h header])) -+ AC_CHECK_LIB([gmp],_init,,AC_MSG_ERROR([Cannot find gmp library])) -+ AC_SUBST([GMP],[-lgmp]) -+ [CPPFLAGS="$CPPFLAGS -DBLISS_USE_GMP"]]) -+ -+AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,no) -+AM_CONDITIONAL(HAVE_DOXYGEN,[test .$DOXYGEN != .no]) -+ -+AC_CONFIG_FILES([Makefile]) -+AC_CONFIG_FILES([bliss.pc]) -+AC_CONFIG_FILES([bliss.1]) -+AC_OUTPUT -diff -Naur bliss-0.72-fedora/bliss.pc.in bliss-0.72/bliss.pc.in ---- bliss-0.72-fedora/bliss.pc.in 1969-12-31 17:00:00.000000000 -0700 -+++ bliss-0.72/bliss.pc.in 2013-04-28 14:40:54.223285686 -0600 -@@ -0,0 +1,13 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: bliss -+Description: Library for Computing Automorphism Groups and Canonical Labelings of Graphs -+URL: http://www.tcs.hut.fi/Software/bliss/index.shtml -+Version: @VERSION@ -+Requires: -+Libs: -L${libdir} -lbliss @GMP@ -+Libs.private: -lm -+Cflags: -I${includedir} -diff -Naur bliss-0.72-fedora/Makefile.am bliss-0.72/Makefile.am ---- bliss-0.72-fedora/Makefile.am 1969-12-31 17:00:00.000000000 -0700 -+++ bliss-0.72/Makefile.am 2013-04-28 14:47:26.944698789 -0600 -@@ -0,0 +1,30 @@ -+ACLOCAL_AMFLAGS = -I config -+ -+lib_LTLIBRARIES = libbliss.la -+ -+libbliss_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ -+libbliss_la_SOURCES = \ -+ defs.cc graph.cc partition.cc orbit.cc uintseqhash.cc heap.cc \ -+ timer.cc utils.cc bliss_C.cc -+ -+pkginclude_HEADERS = \ -+ bignum.hh bliss_C.h defs.hh graph.hh heap.hh kqueue.hh kstack.hh \ -+ orbit.hh partition.hh timer.hh uintseqhash.hh utils.hh -+ -+bin_PROGRAMS = bliss -+bliss_SOURCES = bliss.cc -+bliss_LDADD = libbliss.la -+dist_man1_MANS = bliss.1 -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = bliss.pc -+ -+html-local: Doxyfile -+if HAVE_DOXYGEN -+ $(DOXYGEN) $(srcdir)/Doxyfile -+else -+ @echo "doxygen was not found, please re-run configure" -+endif -+ -+clean-local: -+ -rm -rf html diff --git a/sci-libs/bliss/files/bliss-0.73-clang.patch b/sci-libs/bliss/files/bliss-0.73-clang.patch deleted file mode 100644 index 8a2e4bb6ca47..000000000000 --- a/sci-libs/bliss/files/bliss-0.73-clang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bliss.cc.orig 2020-07-10 10:34:44.946000000 -0600 -+++ ./bliss.cc 2020-07-10 10:35:36.076000000 -0600 -@@ -59,7 +59,7 @@ - else program_name = argv0; - if(!program_name or *program_name == 0) program_name = "bliss"; - -- fprintf(fp, "bliss version %s (compiled "__DATE__")\n", bliss::version); -+ fprintf(fp, "bliss version %s (compiled %s)\n", bliss::version, __DATE__); - fprintf(fp, "Copyright 2003-2015 Tommi Junttila\n"); - fprintf(fp, - "\n" diff --git a/sci-libs/bliss/files/bliss-0.73-error.patch b/sci-libs/bliss/files/bliss-0.73-error.patch deleted file mode 100644 index cd0f5457219f..000000000000 --- a/sci-libs/bliss/files/bliss-0.73-error.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./bliss.cc.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./bliss.cc 2015-09-04 15:04:09.946602735 -0600 -@@ -276,13 +276,16 @@ main(const int argc, const char** argv) - if(opt_canonize == false) - { - /* No canonical labeling, only automorphism group */ -- g->find_automorphisms(stats, &report_aut, stdout); -+ if (!g->find_automorphisms(stats, &report_aut, stdout)) -+ exit(1); - } - else - { - /* Canonical labeling and automorphism group */ - const unsigned int* cl = g->canonical_form(stats, &report_aut, stdout); - -+ if (!cl) -+ exit(1); - fprintf(stdout, "Canonical labeling: "); - bliss::print_permutation(stdout, g->get_nof_vertices(), cl, 1); - fprintf(stdout, "\n"); -@@ -290,6 +293,8 @@ main(const int argc, const char** argv) - if(opt_output_can_file) - { - bliss::AbstractGraph* cf = g->permute(cl); -+ if (!cf) -+ exit(1); - FILE* const fp = fopen(opt_output_can_file, "w"); - if(!fp) - _fatal("Cannot open '%s' for outputting the canonical form, aborting", opt_output_can_file); ---- ./bliss_C.cc.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./bliss_C.cc 2015-09-04 15:04:09.945602814 -0600 -@@ -131,7 +131,7 @@ BlissGraph *bliss_permute(BlissGraph *gr - } - - extern "C" --void -+int - bliss_find_automorphisms(BlissGraph *graph, - void (*hook)(void *user_param, - unsigned int n, -@@ -142,7 +142,8 @@ bliss_find_automorphisms(BlissGraph *gra - bliss::Stats s; - assert(graph); - assert(graph->g); -- graph->g->find_automorphisms(s, hook, hook_user_param); -+ if (!graph->g->find_automorphisms(s, hook, hook_user_param)) -+ return 0; - - if(stats) - { -@@ -154,6 +155,7 @@ bliss_find_automorphisms(BlissGraph *gra - stats->nof_generators = s.get_nof_generators(); - stats->max_level = s.get_max_level(); - } -+ return 1; - } - - -@@ -173,7 +175,7 @@ bliss_find_canonical_labeling(BlissGraph - - canonical_labeling = graph->g->canonical_form(s, hook, hook_user_param); - -- if(stats) -+ if(canonical_labeling && stats) - { - stats->group_size_approx = s.get_group_size_approx(); - stats->nof_nodes = s.get_nof_nodes(); ---- ./bliss_C.h.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./bliss_C.h 2015-09-04 15:04:09.947602656 -0600 -@@ -156,6 +156,7 @@ unsigned int bliss_hash(BlissGraph *grap - * The argument \a perm should be an array of - * N=bliss::bliss_get_nof_vertices(\a graph) elements describing - * a bijection on {0,...,N-1}. -+ * Returns NULL if insufficient memory or internal error. - */ - BlissGraph *bliss_permute(BlissGraph *graph, const unsigned int *perm); - -@@ -174,8 +175,9 @@ BlissGraph *bliss_permute(BlissGraph *gr - * if you want to use the automorphism later, you have to take a copy of it. - * Do not call bliss_* functions in the hook. - * If \a stats is non-null, then some search statistics are copied there. -+ * \return nonzero if successful, zero if insufficient memory or internal error - */ --void -+int - bliss_find_automorphisms(BlissGraph *graph, - void (*hook)(void *user_param, - unsigned int N, -@@ -194,6 +196,7 @@ bliss_find_automorphisms(BlissGraph *gra - * then bliss_permute() with the returned canonical labeling. - * Note that the computed canonical version may depend on the applied version - * of bliss. -+ * Returns NULL if insufficient memory or internal error. - */ - const unsigned int * - bliss_find_canonical_labeling(BlissGraph *graph, ---- ./defs.cc.orig 2015-09-01 10:23:12.000000000 -0600 -+++ ./defs.cc 2015-09-04 15:04:09.947602656 -0600 -@@ -32,7 +32,6 @@ fatal_error(const char* fmt, ...) - vfprintf(stderr, fmt, ap); - fprintf(stderr, "\nAborting!\n"); - va_end(ap); -- exit(1); - } - - } ---- ./graph.cc.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./graph.cc 2015-09-04 15:04:09.927604245 -0600 -@@ -34,7 +34,10 @@ - namespace bliss { - - #define _INTERNAL_ERROR() fatal_error("%s:%d: internal error",__FILE__,__LINE__) --#define _OUT_OF_MEMORY() fatal_error("%s:%d: out of memory",__FILE__,__LINE__) -+#define _OUT_OF_MEMORY(label) do { \ -+ fatal_error("%s:%d: out of memory",__FILE__,__LINE__); \ -+ goto label; \ -+ } while (0) - - /*------------------------------------------------------------------------- - * -@@ -279,20 +282,6 @@ AbstractGraph::reset_permutation(unsigne - *perm = i; - } - --bool --AbstractGraph::is_automorphism(unsigned int* const perm) --{ -- _INTERNAL_ERROR(); -- return false; --} -- --bool --AbstractGraph::is_automorphism(const std::vector<unsigned int>& perm) const --{ -- _INTERNAL_ERROR(); -- return false; --} -- - - - -@@ -618,7 +607,7 @@ typedef struct { - } PathInfo; - - --void -+bool - AbstractGraph::search(const bool canonical, Stats& stats) - { - const unsigned int N = get_nof_vertices(); -@@ -658,7 +647,7 @@ AbstractGraph::search(const bool canonic - if(N == 0) - { - /* Nothing to do, return... */ -- return; -+ return true; - } - - /* Initialize the partition ... */ -@@ -696,10 +685,10 @@ AbstractGraph::search(const bool canonic - */ - if(first_path_labeling) free(first_path_labeling); - first_path_labeling = (unsigned int*)calloc(N, sizeof(unsigned int)); -- if(!first_path_labeling) _OUT_OF_MEMORY(); -+ if(!first_path_labeling) _OUT_OF_MEMORY(oom1); - if(best_path_labeling) free(best_path_labeling); - best_path_labeling = (unsigned int*)calloc(N, sizeof(unsigned int)); -- if(!best_path_labeling) _OUT_OF_MEMORY(); -+ if(!best_path_labeling) _OUT_OF_MEMORY(oom2); - - /* - * Is the initial partition discrete? -@@ -710,7 +699,7 @@ AbstractGraph::search(const bool canonic - update_labeling(best_path_labeling); - /* Update statistics */ - stats.nof_leaf_nodes = 1; -- return; -+ return true; - } - - /* -@@ -718,20 +707,39 @@ AbstractGraph::search(const bool canonic - */ - if(first_path_labeling_inv) free(first_path_labeling_inv); - first_path_labeling_inv = (unsigned int*)calloc(N, sizeof(unsigned int)); -- if(!first_path_labeling_inv) _OUT_OF_MEMORY(); -+ if(!first_path_labeling_inv) _OUT_OF_MEMORY(oom3); - if(best_path_labeling_inv) free(best_path_labeling_inv); - best_path_labeling_inv = (unsigned int*)calloc(N, sizeof(unsigned int)); -- if(!best_path_labeling_inv) _OUT_OF_MEMORY(); -+ if(!best_path_labeling_inv) _OUT_OF_MEMORY(oom4); - - /* - * Allocate space for the automorphisms - */ - if(first_path_automorphism) free(first_path_automorphism); - first_path_automorphism = (unsigned int*)malloc(N * sizeof(unsigned int)); -- if(!first_path_automorphism) _OUT_OF_MEMORY(); -+ if(!first_path_automorphism) _OUT_OF_MEMORY(oom5); - if(best_path_automorphism) free(best_path_automorphism); - best_path_automorphism = (unsigned int*)malloc(N * sizeof(unsigned int)); -- if(!best_path_automorphism) _OUT_OF_MEMORY(); -+ if(!best_path_automorphism) { -+ _OUT_OF_MEMORY(oom6); -+ oom6: -+ free(first_path_automorphism); -+ first_path_automorphism = NULL; -+ oom5: -+ free(best_path_labeling_inv); -+ best_path_labeling_inv = NULL; -+ oom4: -+ free(first_path_labeling_inv); -+ first_path_labeling_inv = NULL; -+ oom3: -+ free(best_path_labeling); -+ best_path_labeling = NULL; -+ oom2: -+ free(first_path_labeling); -+ first_path_labeling = NULL; -+ oom1: -+ return false; -+ } - - /* - * Initialize orbit information so that all vertices are in their own orbits -@@ -1203,8 +1211,10 @@ AbstractGraph::search(const bool canonic - - #if defined(BLISS_VERIFY_EQUITABLEDNESS) - /* The new partition should be equitable */ -- if(!is_equitable()) -+ if(!is_equitable()) { - fatal_error("consistency check failed - partition after refinement is not equitable"); -+ return false; -+ } - #endif - - /* -@@ -1596,8 +1606,10 @@ AbstractGraph::search(const bool canonic - - #if defined(BLISS_VERIFY_AUTOMORPHISMS) - /* Verify that it really is an automorphism */ -- if(!is_automorphism(best_path_automorphism)) -+ if(!is_automorphism(best_path_automorphism)) { - fatal_error("Best path automorhism validation check failed"); -+ return false; -+ } - #endif - - unsigned int gca_level_with_first = 0; -@@ -1664,6 +1676,7 @@ AbstractGraph::search(const bool canonic - - - _INTERNAL_ERROR(); -+ return false; - - - handle_first_path_automorphism: -@@ -1699,8 +1712,10 @@ AbstractGraph::search(const bool canonic - - #if defined(BLISS_VERIFY_AUTOMORPHISMS) - /* Verify that it really is an automorphism */ -- if(!is_automorphism(first_path_automorphism)) -+ if(!is_automorphism(first_path_automorphism)) { - fatal_error("First path automorphism validation check failed"); -+ return false; -+ } - #endif - - if(opt_use_long_prune) -@@ -1747,12 +1762,13 @@ AbstractGraph::search(const bool canonic - /* Release component recursion data in partition */ - if(opt_use_comprec) - p.cr_free(); -+ return true; - } - - - - --void -+bool - AbstractGraph::find_automorphisms(Stats& stats, - void (*hook)(void *user_param, - unsigned int n, -@@ -1762,7 +1778,8 @@ AbstractGraph::find_automorphisms(Stats& - report_hook = hook; - report_user_param = user_param; - -- search(false, stats); -+ if (!search(false, stats)) -+ return false; - - if(first_path_labeling) - { -@@ -1774,6 +1791,7 @@ AbstractGraph::find_automorphisms(Stats& - free(best_path_labeling); - best_path_labeling = 0; - } -+ return true; - } - - -@@ -1788,7 +1806,8 @@ AbstractGraph::canonical_form(Stats& sta - report_hook = hook; - report_user_param = user_param; - -- search(true, stats); -+ if (!search(true, stats)) -+ return NULL; - - return best_path_labeling; - } -@@ -3479,15 +3498,17 @@ Digraph::initialize_certificate() - * Check whether perm is an automorphism. - * Slow, mainly for debugging and validation purposes. - */ --bool -+int - Digraph::is_automorphism(unsigned int* const perm) - { - std::set<unsigned int, std::less<unsigned int> > edges1; - std::set<unsigned int, std::less<unsigned int> > edges2; - - #if defined(BLISS_CONSISTENCY_CHECKS) -- if(!is_permutation(get_nof_vertices(), perm)) -+ if(!is_permutation(get_nof_vertices(), perm)) { - _INTERNAL_ERROR(); -+ return -1; -+ } - #endif - - for(unsigned int i = 0; i < get_nof_vertices(); i++) -@@ -3506,7 +3527,7 @@ Digraph::is_automorphism(unsigned int* c - ei++) - edges2.insert(*ei); - if(!(edges1 == edges2)) -- return false; -+ return 0; - - edges1.clear(); - for(std::vector<unsigned int>::iterator ei = v1.edges_out.begin(); -@@ -3519,10 +3540,10 @@ Digraph::is_automorphism(unsigned int* c - ei++) - edges2.insert(*ei); - if(!(edges1 == edges2)) -- return false; -+ return 0; - } - -- return true; -+ return 1; - } - - bool -@@ -4337,8 +4358,10 @@ Graph* - Graph::permute(const unsigned int* perm) const - { - #if defined(BLISS_CONSISTENCY_CHECKS) -- if(!is_permutation(get_nof_vertices(), perm)) -+ if(!is_permutation(get_nof_vertices(), perm)) { - _INTERNAL_ERROR(); -+ return NULL; -+ } - #endif - - Graph* const g = new Graph(get_nof_vertices()); -@@ -5278,15 +5301,17 @@ Graph::initialize_certificate() - * - *-------------------------------------------------------------------------*/ - --bool -+int - Graph::is_automorphism(unsigned int* const perm) - { - std::set<unsigned int, std::less<unsigned int> > edges1; - std::set<unsigned int, std::less<unsigned int> > edges2; - - #if defined(BLISS_CONSISTENCY_CHECKS) -- if(!is_permutation(get_nof_vertices(), perm)) -+ if(!is_permutation(get_nof_vertices(), perm)) { - _INTERNAL_ERROR(); -+ return -1; -+ } - #endif - - for(unsigned int i = 0; i < get_nof_vertices(); i++) -@@ -5306,10 +5331,10 @@ Graph::is_automorphism(unsigned int* con - edges2.insert(*ei); - - if(!(edges1 == edges2)) -- return false; -+ return 0; - } - -- return true; -+ return 1; - } - - ---- ./graph.hh.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./graph.hh 2015-09-04 15:09:17.261182632 -0600 -@@ -159,7 +159,7 @@ public: - * Check whether \a perm is an automorphism of this graph. - * Unoptimized, mainly for debugging purposes. - */ -- virtual bool is_automorphism(const std::vector<unsigned int>& perm) const; -+ virtual bool is_automorphism(const std::vector<unsigned int>& perm) const = 0; - - - /** Activate/deactivate failure recording. -@@ -211,8 +211,10 @@ public: - * if you want to use the automorphism later, you have to take a copy of it. - * Do not call any member functions in the hook. - * The search statistics are copied in \a stats. -+ * \return true if successful, false if insufficient memory to search or -+ * other internal error. - */ -- void find_automorphisms(Stats& stats, -+ bool find_automorphisms(Stats& stats, - void (*hook)(void* user_param, - unsigned int n, - const unsigned int* aut), -@@ -232,6 +234,8 @@ public: - * Note that the computed canonical version may depend on the applied version - * of bliss as well as on some other options (for instance, the splitting - * heuristic selected with bliss::Graph::set_splitting_heuristic()). -+ * This function returns NULL if there is insufficient memory, or another -+ * internal error occurs. - */ - const unsigned int* canonical_form(Stats& stats, - void (*hook)(void* user_param, -@@ -436,7 +440,7 @@ protected: - void reset_permutation(unsigned int *perm); - - /* Mainly for debugging purposes */ -- virtual bool is_automorphism(unsigned int* const perm); -+ virtual int is_automorphism(unsigned int* const perm) = 0; - - std::vector<unsigned int> certificate_current_path; - std::vector<unsigned int> certificate_first_path; -@@ -450,7 +454,11 @@ protected: - virtual Partition::Cell* find_next_cell_to_be_splitted(Partition::Cell *cell) = 0; - - -- void search(const bool canonical, Stats &stats); -+ /** -+ * \return true if successful, false if insufficient memory to complete or -+ * other internal error -+ */ -+ bool search(const bool canonical, Stats &stats); - - - void (*report_hook)(void *user_param, -@@ -634,7 +642,7 @@ protected: - - void initialize_certificate(); - -- bool is_automorphism(unsigned int* const perm); -+ int is_automorphism(unsigned int* const perm); - - - bool nucr_find_first_component(const unsigned int level); -@@ -875,7 +883,7 @@ protected: - - void initialize_certificate(); - -- bool is_automorphism(unsigned int* const perm); -+ int is_automorphism(unsigned int* const perm); - - void sort_edges(); - diff --git a/sci-libs/bliss/files/bliss-0.73-rehn.patch b/sci-libs/bliss/files/bliss-0.73-rehn.patch deleted file mode 100644 index f37eedb4a6bd..000000000000 --- a/sci-libs/bliss/files/bliss-0.73-rehn.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- ./graph.cc.orig 2015-09-04 15:04:09.927604245 -0600 -+++ ./graph.cc 2015-09-04 15:09:46.999819514 -0600 -@@ -597,16 +597,6 @@ public: - }; - - -- -- --typedef struct { -- unsigned int splitting_element; -- unsigned int certificate_index; -- unsigned int subcertificate_length; -- UintSeqHash eqref_hash; --} PathInfo; -- -- - bool - AbstractGraph::search(const bool canonical, Stats& stats) - { -@@ -753,7 +743,6 @@ AbstractGraph::search(const bool canonic - initialize_certificate(); - - std::vector<TreeNode> search_stack; -- std::vector<PathInfo> first_path_info; - std::vector<PathInfo> best_path_info; - - search_stack.clear(); -@@ -5477,7 +5466,7 @@ Graph::nucr_find_first_component(const u - component.clear(); - component_elements = 0; - sh_return = 0; -- unsigned int sh_first = 0; -+ unsigned int sh_first = 1 << 31; - unsigned int sh_size = 0; - unsigned int sh_nuconn = 0; - ---- ./graph.hh.orig 2015-09-04 15:09:17.261182632 -0600 -+++ ./graph.hh 2015-09-04 15:09:47.001819355 -0600 -@@ -109,9 +109,12 @@ public: - unsigned long int get_max_level() const {return max_level;} - }; - -- -- -- -+typedef struct { -+ unsigned int splitting_element; -+ unsigned int certificate_index; -+ unsigned int subcertificate_length; -+ UintSeqHash eqref_hash; -+} PathInfo; - - - /** -@@ -524,7 +527,7 @@ protected: - */ - unsigned int cr_component_elements; - -- -+ std::vector<PathInfo> first_path_info; - - - }; -@@ -756,6 +759,10 @@ public: - void set_splitting_heuristic(const SplittingHeuristic shs) {sh = shs; } - - -+ /** -+ * Get an information vector about the first path. -+ */ -+ std::vector<PathInfo> get_first_path_info() { return first_path_info; } - }; - - diff --git a/sci-libs/bliss/files/bliss-0.73.1.in b/sci-libs/bliss/files/bliss-0.73.1.in deleted file mode 100644 index f652c3d1307a..000000000000 --- a/sci-libs/bliss/files/bliss-0.73.1.in +++ /dev/null @@ -1,55 +0,0 @@ -.TH "BLISS" "1" "@VERSION@" "Tommi Junttila & Petteri Kaski" "User Commands" -.SH "NAME" -bliss \- Compute automorphism groups and canonical labelings of graphs -.SH "SYNOPSIS" -.B bliss -[\fIOPTIONS\fR] [<\fIGRAPH FILE\fR>] -.SH "DESCRIPTION" -.PP -Bliss is an open source tool for computing automorphism groups and -canonical forms of graphs. The graphs are specified in DIMACS format. -.TP -\fB\-directed\fR -the input graph is directed -.TP -\fB\-can\fR -compute canonical form -.TP -\fB\-ocan\fR=\fIf\fR -compute canonical form and output it in file \fIf\fR -.TP -\fB\-v\fR=\fIN\fR -set verbosity level to N [N >= 0, default: 1] -.TP -\fB\-sh\fR=\fIX\fR -select splitting heuristics, where X is: -.TS -tab(;); -R L. -f;first non-singleton cell -fl;first largest non-singleton cell -fs;first smallest non-singleton cell -fm;first maximally non-trivially connected non-singleton cell -flm;first largest maximally non-trivially connected -;non-singleton cell -fsm;first smallest maximally non-trivially connected -;non-singleton cell (default) -.TE -.TP -\fB\-fr\fR=\fIX\fR -use failure recording? [X=y/n, default: y] -.TP -\fB\-cr\fR=\fIX\fR -use component recursion? [X=y/n, default: y] -.TP -\fB\-version\fR -print the version number and exit -.TP -\fB\-help\fR -print this help and exit -.SH "AUTHORS" -Bliss was written by Tommi Junttila <Tommi.Junttila@tkk.fi> and -Petteri Kaski <petteri.kaski@aalto.fi>. -.PP -This man page was written by Jerry James <loganjerry@gmail.com>. -It is distributed under the same terms as bliss. diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest index 1f444c0b51e5..4db498aa9d39 100644 --- a/sci-libs/brial/Manifest +++ b/sci-libs/brial/Manifest @@ -1,2 +1 @@ -DIST brial-1.2.11.tar.bz2 1260892 BLAKE2B 910f4ffd728235c8b18deb0d36c76778ce2c392644b7eaba06a9c00a832b4ccb0c2cd69f4d9ab9770e060b54491bd6b613e4e1324a32f57d7c32f200fb0a900d SHA512 00532b6361c709fce44940bfd22563046cfcbc06d41282a01a26f9bcb25fa86df1406685d7ba4b1ebbb08cd7fa8b9811c81eccf78e72ea96960ef7a059c2e926 DIST brial-1.2.12.tar.bz2 1259569 BLAKE2B bf9415b2980d76d00239eceea113d6dbb916f5dcec3bdecb05db0ad1988761e4d25ab9a0419c68a3b2501f1f9dc6e2d31418aea7c727cfd01f4ae76eea8f81e2 SHA512 c44902f0f935d614b8c2d437d6c895f650ff4b77501ac3ba035e21671719f4080c88a173819f8db8e8b7dda121736146d8388b70ad7cda75207a1b22b93f5af6 diff --git a/sci-libs/brial/brial-1.2.11.ebuild b/sci-libs/brial/brial-1.2.11.ebuild deleted file mode 100644 index ac707772a283..000000000000 --- a/sci-libs/brial/brial-1.2.11.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="A C++ library for polynomials over boolean rings" -HOMEPAGE="https://github.com/BRiAl/BRiAl" -SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2" - -# The top-level license is GPL2+, but cudd/LICENSE is BSD. -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="png" - -BDEPEND="virtual/pkgconfig" -DEPEND="dev-libs/boost - sci-libs/m4ri[png=]" -RDEPEND="${DEPEND}" - -src_configure() { - tc-export PKG_CONFIG - - # with-boost-libdir added to deal with some rather quirky setups - # see https://github.com/cschwan/sage-on-gentoo/issues/551 - econf \ - --with-boost="${ESYSROOT}"/usr \ - --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/brial/brial-1.2.12.ebuild b/sci-libs/brial/brial-1.2.12.ebuild index 31821f7a6cde..1a4d4a95fd64 100644 --- a/sci-libs/brial/brial-1.2.12.ebuild +++ b/sci-libs/brial/brial-1.2.12.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2" # The top-level license is GPL2+, but cudd/LICENSE is BSD. LICENSE="BSD GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="png" BDEPEND="virtual/pkgconfig" diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest index 61f58e3f7bdf..7489d0d176c8 100644 --- a/sci-libs/btf/Manifest +++ b/sci-libs/btf/Manifest @@ -1 +1,2 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960 diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild index 33a2422291ed..8ba08b047dd7 100644 --- a/sci-libs/btf/btf-1.2.6.ebuild +++ b/sci-libs/btf/btf-1.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" DEPEND="sci-libs/suitesparseconfig" RDEPEND="${DEPEND}" diff --git a/sci-libs/btf/btf-2.0.3.ebuild b/sci-libs/btf/btf-2.0.3.ebuild new file mode 100644 index 000000000000..f3d679bc9c50 --- /dev/null +++ b/sci-libs/btf/btf-2.0.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Algorithm for matrix permutation into block triangular form" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${Sparse_P}/${PN^^}" + +multilib_src_configure() { + local mycmakeargs=( + -DNSTATIC=ON + ) + cmake_src_configure +} diff --git a/sci-libs/btf/metadata.xml b/sci-libs/btf/metadata.xml index f15848939958..9f70db2d6ffd 100644 --- a/sci-libs/btf/metadata.xml +++ b/sci-libs/btf/metadata.xml @@ -11,4 +11,7 @@ its block upper triangular form (more precisely, it computes a Dulmage-Mendelsohn decomposition). </longdescription> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 616b75a49763..0ee75499ccbe 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1 +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 diff --git a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild index afc6a29fc8df..e0d99129a9ac 100644 --- a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild +++ b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild @@ -17,13 +17,14 @@ SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" +IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" RESTRICT="test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} ffmpeg? ( opencv ) mpi? ( distributed ) tensorpipe? ( distributed ) + gloo? ( distributed ) " # ?? ( cuda rocm ) # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 @@ -44,7 +45,9 @@ RDEPEND=" dev-libs/cudnn-frontend:0/8 <dev-util/nvidia-cuda-toolkit-12:=[profiler] ) + fbgemm? ( dev-libs/FBGEMM ) ffmpeg? ( media-video/ffmpeg:= ) + gloo? ( sci-libs/gloo[cuda?] ) mpi? ( sys-cluster/openmpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( $(python_gen_cond_dep ' @@ -84,6 +87,10 @@ PATCHES=( src_prepare() { filter-lto #bug 862672 + sed -i \ + -e "/third_party\/gloo/d" \ + cmake/Dependencies.cmake \ + || die cmake_src_prepare pushd torch/csrc/jit/serialization || die flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die @@ -116,11 +123,11 @@ src_configure() { -DUSE_DISTRIBUTED=$(usex distributed) -DUSE_MPI=$(usex mpi) -DUSE_FAKELOWP=OFF - -DUSE_FBGEMM=OFF # TODO + -DUSE_FBGEMM=$(usex fbgemm) -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_GFLAGS=ON -DUSE_GLOG=ON - -DUSE_GLOO=OFF + -DUSE_GLOO=$(usex gloo) -DUSE_KINETO=OFF # TODO -DUSE_LEVELDB=OFF -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma @@ -160,6 +167,7 @@ src_configure() { if use cuda; then addpredict "/dev/nvidiactl" # bug 867706 + addpredict "/dev/char" mycmakeargs+=( -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" diff --git a/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild b/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild new file mode 100644 index 000000000000..eaf3e07d46ac --- /dev/null +++ b/sci-libs/caffe2/caffe2-2.0.0-r5.ebuild @@ -0,0 +1,197 @@ +# 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-single-r1 cmake cuda flag-o-matic + +MYPN=pytorch +MYP=${MYPN}-${PV} + +DESCRIPTION="A deep learning framework" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz + -> ${MYP}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( opencv ) + mpi? ( distributed ) + tensorpipe? ( distributed ) + gloo? ( distributed ) +" # ?? ( cuda rocm ) + +# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gflags:= + >=dev-cpp/glog-0.5.0 + dev-libs/cpuinfo + dev-libs/libfmt + dev-libs/protobuf:= + dev-libs/pthreadpool + dev-libs/sleef + sci-libs/lapack + >=sci-libs/onnx-1.12.0 + sci-libs/foxi + cuda? ( + =dev-libs/cudnn-8* + dev-libs/cudnn-frontend:0/8 + <dev-util/nvidia-cuda-toolkit-12:=[profiler] + ) + fbgemm? ( dev-libs/FBGEMM ) + ffmpeg? ( media-video/ffmpeg:= ) + gloo? ( sci-libs/gloo[cuda?] ) + mpi? ( sys-cluster/openmpi ) + nnpack? ( sci-libs/NNPACK ) + numpy? ( $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') ) + opencl? ( virtual/opencl ) + opencv? ( media-libs/opencv:= ) + qnnpack? ( sci-libs/QNNPACK ) + tensorpipe? ( sci-libs/tensorpipe ) + xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen + cuda? ( dev-libs/cutlass ) + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + sci-libs/kineto + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + ') +" + +S="${WORKDIR}"/${MYP} + +PATCHES=( + "${FILESDIR}"/${P}-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 +) + +src_prepare() { + filter-lto #bug 862672 + sed -i \ + -e "/third_party\/gloo/d" \ + cmake/Dependencies.cmake \ + || die + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd +} + +src_configure() { + if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then + ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0." + ewarn "These may not be optimal for your GPU." + ewarn "" + ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU," + ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2." + ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5,3.5" + ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell" + ewarn "" + ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" + ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" + fi + + local mycmakeargs=( + -DBUILD_CUSTOM_PROTOBUF=OFF + -DBUILD_SHARED_LIBS=ON + + -DUSE_CCACHE=OFF + -DUSE_CUDA=$(usex cuda) + -DUSE_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_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_NNPACK=$(usex nnpack) + -DUSE_QNNPACK=$(usex qnnpack) + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex tensorpipe) + -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_SYSTEM_CPUINFO=ON + -DUSE_SYSTEM_PYBIND11=ON + -DUSE_UCC=OFF + -DUSE_VALGRIND=OFF + -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 + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + ) + + if use cuda; then + addpredict "/dev/nvidiactl" # bug 867706 + addpredict "/dev/char" + + mycmakeargs+=( + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + ) + fi + cmake_src_configure +} + +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 +} diff --git a/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild b/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild new file mode 100644 index 000000000000..67ab76e8ed76 --- /dev/null +++ b/sci-libs/caffe2/caffe2-2.0.1-r4.ebuild @@ -0,0 +1,212 @@ +# 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-single-r1 cmake cuda flag-o-matic prefix + +MYPN=pytorch +MYP=${MYPN}-${PV} + +DESCRIPTION="A deep learning framework" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz + -> ${MYP}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( opencv ) + mpi? ( distributed ) + tensorpipe? ( distributed ) + distributed? ( tensorpipe ) + gloo? ( distributed ) +" # ?? ( cuda rocm ) + +# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gflags:= + >=dev-cpp/glog-0.5.0 + dev-libs/cpuinfo + dev-libs/libfmt + dev-libs/protobuf:= + dev-libs/pthreadpool + dev-libs/sleef + sci-libs/lapack + >=sci-libs/onnx-1.12.0 + sci-libs/foxi + cuda? ( + =dev-libs/cudnn-8* + dev-libs/cudnn-frontend:0/8 + <dev-util/nvidia-cuda-toolkit-12:=[profiler] + ) + fbgemm? ( dev-libs/FBGEMM ) + ffmpeg? ( media-video/ffmpeg:= ) + gloo? ( sci-libs/gloo[cuda?] ) + mpi? ( virtual/mpi ) + nnpack? ( sci-libs/NNPACK ) + numpy? ( $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') ) + opencl? ( virtual/opencl ) + opencv? ( media-libs/opencv:= ) + qnnpack? ( sci-libs/QNNPACK ) + tensorpipe? ( sci-libs/tensorpipe[cuda?] ) + xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen + cuda? ( dev-libs/cutlass ) + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + sci-libs/kineto + $(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}-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 +) + +src_prepare() { + filter-lto #bug 862672 + sed -i \ + -e "/third_party\/gloo/d" \ + cmake/Dependencies.cmake \ + || die + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd + # prefixify the hardcoded paths, after all patches are applied + hprefixify \ + aten/CMakeLists.txt \ + caffe2/CMakeLists.txt \ + cmake/Metal.cmake \ + cmake/Modules/*.cmake \ + cmake/Modules_CUDA_fix/FindCUDNN.cmake \ + cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \ + cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \ + cmake/public/LoadHIP.cmake \ + cmake/public/cuda.cmake \ + cmake/Dependencies.cmake \ + torch/CMakeLists.txt \ + CMakeLists.txt +} + +src_configure() { + if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then + ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0." + ewarn "These may not be optimal for your GPU." + ewarn "" + ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU," + ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2." + ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5" + ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell" + ewarn "" + ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" + ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" + fi + + local mycmakeargs=( + -DBUILD_CUSTOM_PROTOBUF=OFF + -DBUILD_SHARED_LIBS=ON + + -DUSE_CCACHE=OFF + -DUSE_CUDA=$(usex cuda) + -DUSE_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_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_NNPACK=$(usex nnpack) + -DUSE_QNNPACK=$(usex qnnpack) + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex tensorpipe) + -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_SYSTEM_CPUINFO=ON + -DUSE_SYSTEM_PYBIND11=ON + -DUSE_UCC=OFF + -DUSE_VALGRIND=OFF + -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 + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + ) + + if use cuda; then + addpredict "/dev/nvidiactl" # bug 867706 + addpredict "/dev/char" + + mycmakeargs+=( + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + ) + fi + cmake_src_configure +} + +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 +} diff --git a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch index a2771e3319d8..f72d44f475fa 100644 --- a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch +++ b/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch @@ -1,6 +1,41 @@ --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake -@@ -1557,7 +1557,6 @@ +@@ -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() @@ -8,7 +43,7 @@ add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) if(NOT USE_SYSTEM_ONNX) -@@ -1850,7 +1849,6 @@ +@@ -1850,7 +1850,6 @@ # set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) @@ -16,7 +51,7 @@ # Disable compiler feature checks for `fmt`. # -@@ -1859,9 +1857,7 @@ +@@ -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. @@ -168,26 +203,6 @@ if(NOT USE_SYSTEM_PTHREADPOOL AND USE_INTERNAL_PTHREADPOOL_IMPL) set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "") endif() ---- 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") --- 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 @@ diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch b/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch new file mode 100644 index 000000000000..ff64e4108087 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch @@ -0,0 +1,12 @@ +diff -uar pytorch-2.0.0/cmake/Dependencies.cmake pytorch-2.0.0orig/cmake/Dependencies.cmake +--- a/cmake/Dependencies.cmake 2023-04-23 09:43:20.767566047 -0400 ++++ b/cmake/Dependencies.cmake 2023-03-09 17:42:00.000000000 -0500 +@@ -1235,7 +1235,7 @@ + + # ---[ cuDNN + if(USE_CUDNN) +- 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.0.0-gcc13.patch b/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch new file mode 100644 index 000000000000..acbcebad0a5d --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch @@ -0,0 +1,41 @@ +--- a/c10/util/Registry.h 2023-03-09 17:42:00.000000000 -0500 ++++ b/c10/util/Registry.h 2023-04-09 20:38:33.108135511 -0400 +@@ -16,6 +16,7 @@ + #include <memory> + #include <mutex> + #include <string> ++#include <stdexcept> + #include <unordered_map> + #include <vector> + +--- a/torch/csrc/jit/passes/quantization/quantization_type.h 2023-03-09 17:42:00.000000000 -0500 ++++ b/torch/csrc/jit/passes/quantization/quantization_type.h 2023-04-09 20:43:43.124806308 -0400 +@@ -1,5 +1,6 @@ + #pragma once + #include <ostream> ++#include <cstdint> + + namespace torch { + namespace jit { + +--- a/torch/csrc/jit/runtime/logging.cpp 2023-03-09 17:42:00.000000000 -0500 ++++ b/torch/csrc/jit/runtime/logging.cpp 2023-04-09 20:47:49.758142941 -0400 +@@ -1,6 +1,7 @@ + #include <torch/csrc/jit/runtime/logging.h> + + #include <atomic> ++#include <stdexcept> + #include <mutex> + #include <unordered_map> + + +--- a/torch/csrc/lazy/core/multi_wait.cpp 2023-03-09 17:42:00.000000000 -0500 ++++ b/torch/csrc/lazy/core/multi_wait.cpp 2023-04-09 20:50:36.608145172 -0400 +@@ -1,6 +1,7 @@ + #include <torch/csrc/lazy/core/multi_wait.h> + + #include <chrono> ++#include <stdexcept> + #include <exception> + + namespace torch { diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch new file mode 100644 index 000000000000..fce7a395023e --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch @@ -0,0 +1,204 @@ +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -486,7 +486,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) +@@ -542,7 +542,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") +@@ -802,7 +802,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") +@@ -847,6 +847,7 @@ + endif() + + if(USE_FBGEMM) ++ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) + caffe2_update_option(USE_FBGEMM ON) + else() + caffe2_update_option(USE_FBGEMM OFF) +@@ -1554,7 +1555,6 @@ + set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) + endif() + endif() +- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL) + + add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) + if(NOT USE_SYSTEM_ONNX) +@@ -1819,7 +1819,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`. + # +@@ -1828,9 +1827,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 +@@ -65,7 +65,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 +@@ -799,12 +799,11 @@ + + # ---[ Build flags + if(NOT MSVC) +- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") ++ string(APPEND CMAKE_CXX_FLAGS " -fPIC") + # Eigen fails to build with some versions, so convert this to a warning + # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 + string(APPEND CMAKE_CXX_FLAGS " -Wall") + string(APPEND CMAKE_CXX_FLAGS " -Wextra") +- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS) +@@ -912,8 +911,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) +--- 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 +@@ -106,7 +106,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 "") +@@ -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 @@ + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +@@ -1095,8 +1098,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() diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index 531b9cbf5879..703eedf5322a 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -12,7 +12,9 @@ <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="gloo">Use sci-libs/gloo</flag> <flag name="nnpack">Use NNPACK</flag> <flag name="numpy">Add support for math operations through numpy</flag> <flag name="opencl">Use OpenCL</flag> diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest index 0b05cf134539..16b8f196b932 100644 --- a/sci-libs/camd/Manifest +++ b/sci-libs/camd/Manifest @@ -1 +1,2 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0 diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild index 1d5d70525512..435f8599933f 100644 --- a/sci-libs/camd/camd-2.4.6-r1.ebuild +++ b/sci-libs/camd/camd-2.4.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 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="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="doc" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/camd/camd-3.0.3.ebuild b/sci-libs/camd/camd-3.0.3.ebuild new file mode 100644 index 000000000000..b45cf3bd3ee6 --- /dev/null +++ b/sci-libs/camd/camd-3.0.3.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( virtual/latex-base )" + +S="${WORKDIR}/${Sparse_P}/${PN^^}" + +multilib_src_configure() { + local mycmakeargs=( + -DNSTATIC=ON + -DDEMO=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + # Run demo files + local demofiles=( + camd_demo + camd_l_demo + camd_demo2 + camd_simple + ) + for i in ${demofiles[@]}; do + ./"${i}" > "${i}.out" || die "failed to run test ${i}" + diff "${S}/Demo/${i}.out" "${i}.out" || die "failed testing ${i}" + done + einfo "All tests passed" +} + +multilib_src_install() { + if use doc; then + pushd "${S}/Doc" + emake clean + rm -rf *.pdf + emake + popd + DOCS="${S}/Doc/*.pdf" + fi + cmake_src_install +} diff --git a/sci-libs/camd/metadata.xml b/sci-libs/camd/metadata.xml index 1db724fb993a..728817ca7a84 100644 --- a/sci-libs/camd/metadata.xml +++ b/sci-libs/camd/metadata.xml @@ -10,4 +10,7 @@ for ordering a sparse matrix prior to Cholesky factorization (or for LU factorization with diagonal pivoting). </longdescription> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/cantera/cantera-2.6.0-r1.ebuild b/sci-libs/cantera/cantera-2.6.0-r1.ebuild deleted file mode 100644 index cba332f43a27..000000000000 --- a/sci-libs/cantera/cantera-2.6.0-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD="77 90" - -inherit fortran-2 python-single-r1 scons-utils toolchain-funcs - -DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport" -HOMEPAGE="https://www.cantera.org" -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" -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}] - ') - ) - python? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - ) - dev-cpp/yaml-cpp - !lapack? ( sci-libs/sundials:0= ) - lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] ) -" - -DEPEND=" - ${RDEPEND} - dev-cpp/eigen:3 - dev-libs/boost - dev-libs/libfmt - python? ( - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - ') - ) - test? ( - >=dev-cpp/gtest-1.11.0 - python? ( - $(python_gen_cond_dep ' - dev-python/h5py[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - ') - ) - ) -" - -PATCHES=( "${FILESDIR}/${P}_env.patch" ) - -pkg_setup() { - fortran-2_pkg_setup - python-single-r1_pkg_setup -} - -## Full list of configuration options of Cantera is presented here: -## http://cantera.org/docs/sphinx/html/compiling/config-options.html -src_configure() { - scons_vars=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - cc_flags="${CXXFLAGS}" - cxx_flags="-std=c++11" - debug="no" - FORTRAN="$(tc-getFC)" - FORTRANFLAGS="${FCFLAGS}" - optimize_flags="-Wno-inline" - renamed_shared_libraries="no" - use_pch="no" - ## In some cases other order can break the detection of right location of Boost: ## - system_fmt="y" - system_sundials="y" - system_eigen="y" - system_yamlcpp="y" - env_vars="all" - extra_inc_dirs="/usr/include/eigen3" - ) - use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" ) - use test || scons_vars+=( googletest="none" ) - - scons_targets=( - 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}" ) - else - scons_targets+=( python_package="none" ) - fi -} - -src_compile() { - escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr" -} - -src_test() { - escons test -} - -src_install() { - escons install stage_dir="${D}" libdirname="$(get_libdir)" - if ! use cti ; then - rm -r "${D}/usr/share/man" || die "Can't remove man files." - else - # Run the byte-compile of modules - python_optimize "${D}$(python_get_sitedir)/${PN}" - fi - - # User could remove this line if require static libs for development purpose - find "${ED}" -name '*.a' -delete || die -} - -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/cantera-2.6.0-r2.ebuild b/sci-libs/cantera/cantera-2.6.0-r2.ebuild index 5a8cb20337f7..b7276b05cc38 100644 --- a/sci-libs/cantera/cantera-2.6.0-r2.ebuild +++ b/sci-libs/cantera/cantera-2.6.0-r2.ebuild @@ -43,6 +43,7 @@ RDEPEND=" lapack? ( >=sci-libs/sundials-6.5.0:0=[lapack?] ) " +# <cython-3 for bug #913141 DEPEND=" ${RDEPEND} dev-cpp/eigen:3 @@ -50,7 +51,7 @@ DEPEND=" dev-libs/libfmt python? ( $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] + <dev-python/cython-3[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] ') ) diff --git a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild new file mode 100644 index 000000000000..e7186c4571c4 --- /dev/null +++ b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild @@ -0,0 +1,88 @@ +# 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/files/cartopy-0.21.1-fix-test_proj92.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch new file mode 100644 index 000000000000..e9f1d03eeeb2 --- /dev/null +++ b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch @@ -0,0 +1,126 @@ +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 new file mode 100644 index 000000000000..7ce52bb23364 --- /dev/null +++ b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch @@ -0,0 +1,46 @@ +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/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild index 4dcbba0d8ac3..3ea175a98181 100644 --- a/sci-libs/ccfits/ccfits-2.5.ebuild +++ b/sci-libs/ccfits/ccfits-2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" RDEPEND=">=sci-libs/cfitsio-3.080" diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest index dbe3369e605d..2fc03c4c6a01 100644 --- a/sci-libs/ccolamd/Manifest +++ b/sci-libs/ccolamd/Manifest @@ -1 +1,2 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild index 80535587a090..6e52b1703b4f 100644 --- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild +++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" BDEPEND="virtual/pkgconfig" DEPEND="sci-libs/suitesparseconfig" diff --git a/sci-libs/ccolamd/ccolamd-3.0.3.ebuild b/sci-libs/ccolamd/ccolamd-3.0.3.ebuild new file mode 100644 index 000000000000..30e5af46ce42 --- /dev/null +++ b/sci-libs/ccolamd/ccolamd-3.0.3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Constrained Column approximate minimum degree ordering algorithm" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=">=sci-libs/suitesparseconfig-7.0.0" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${Sparse_P}/${PN^^}" + +multilib_src_configure() { + local mycmakeargs=( + -DNSTATIC=ON + -DDEMO=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + # Run demo files + ./ccolamd_example > ccolamd_example.out || die "failed to run test ccolamd_example" + diff "${S}"/Demo/ccolamd_example.out ccolamd_example.out || die "failed testing ccolamd_example" + ./ccolamd_l_example > ccolamd_l_example.out || die "failed to run test ccolamd_l_example" + diff "${S}"/Demo/ccolamd_l_example.out ccolamd_l_example.out || die "failed testing ccolamd_l_example" +} diff --git a/sci-libs/ccolamd/metadata.xml b/sci-libs/ccolamd/metadata.xml index 412ff61d06aa..ba6e076c8fbd 100644 --- a/sci-libs/ccolamd/metadata.xml +++ b/sci-libs/ccolamd/metadata.xml @@ -10,4 +10,7 @@ algorithm, (like COLAMD), but it can also be given a set of ordering constraints. </longdescription> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/cdd+/cdd+-077a.ebuild b/sci-libs/cdd+/cdd+-077a.ebuild index 12930c685aba..85957bc5070c 100644 --- a/sci-libs/cdd+/cdd+-077a.ebuild +++ b/sci-libs/cdd+/cdd+-077a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~x86" DEPEND="dev-libs/gmp:0=" RDEPEND="${DEPEND}" diff --git a/sci-libs/cddlib/cddlib-094m-r1.ebuild b/sci-libs/cddlib/cddlib-094m-r1.ebuild index 6aa6754453b0..5cb23824058f 100644 --- a/sci-libs/cddlib/cddlib-094m-r1.ebuild +++ b/sci-libs/cddlib/cddlib-094m-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g SLOT="0" LICENSE="GPL-2+" -KEYWORDS="amd64 ~arm ~ppc ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples static-libs tools" DEPEND="dev-libs/gmp:0" diff --git a/sci-libs/cdf/cdf-3.8.0-r1.ebuild b/sci-libs/cdf/cdf-3.8.0-r1.ebuild index aeb793888314..7d3f32ecb62b 100644 --- a/sci-libs/cdf/cdf-3.8.0-r1.ebuild +++ b/sci-libs/cdf/cdf-3.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz LICENSE="CDF" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples java ncurses static-libs" RESTRICT="bindist" diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild index 28312cad9867..0266f174e0e4 100644 --- a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild +++ b/sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild @@ -24,7 +24,7 @@ RESTRICT="!test? ( test )" BDEPEND="${PYTHON_DEPS} >=dev-cpp/eigen-3.3.4:3 lapack? ( virtual/pkgconfig ) - doc? ( dev-libs/mathjax ) + doc? ( <dev-libs/mathjax-3 ) " RDEPEND=" dev-cpp/glog[gflags?,${MULTILIB_USEDEP}] diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild index 3df858d19d98..5f12eb26940e 100644 --- a/sci-libs/cfitsio/cfitsio-3.490.ebuild +++ b/sci-libs/cfitsio/cfitsio-3.490.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ 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 ~sparc-solaris ~sparc64-solaris" +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=" diff --git a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild index 98a327a36e48..9d0e3cc3f56e 100644 --- a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild +++ b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris" +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=" diff --git a/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild index e3858e96e7cc..bff628779a26 100644 --- a/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild +++ b/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris" +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=" diff --git a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild index fa8f7ebd1513..5983f292ee22 100644 --- a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild +++ b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris" +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=" diff --git a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild index f3ec0c5b3190..ee2715047953 100644 --- a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild +++ b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris" +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=" diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild index 6fe1ddee3b21..6945d82b5a92 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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" RDEPEND="virtual/blas" DEPEND="${RDEPEND}" diff --git a/sci-libs/cgnslib/cgnslib-4.3.0.ebuild b/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild index 039b318c01be..039b318c01be 100644 --- a/sci-libs/cgnslib/cgnslib-4.3.0.ebuild +++ b/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest index 1630f80a5d08..cf3192387aab 100644 --- a/sci-libs/cholmod/Manifest +++ b/sci-libs/cholmod/Manifest @@ -1,2 +1,3 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild index 6d21a365986a..1bc4d77580e2 100644 --- a/sci-libs/cholmod/cholmod-3.0.13.ebuild +++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="cuda doc +lapack +matrixops +modify +partition" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild index 7b9fdac3b254..458f30a8b9c7 100644 --- a/sci-libs/cholmod/cholmod-3.0.14.ebuild +++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 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+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +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" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/cholmod/cholmod-4.0.3.ebuild b/sci-libs/cholmod/cholmod-4.0.3.ebuild new file mode 100644 index 000000000000..4ab1d6076859 --- /dev/null +++ b/sci-libs/cholmod/cholmod-4.0.3.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib toolchain-funcs + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Sparse Cholesky factorization and update/downdate library" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )" +SLOT="0/4" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+cholesky cuda doc openmp +matrixops +modify +partition +supernodal test" +RESTRICT="!test? ( test )" + +DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV} + >=sci-libs/amd-3.0.3 + >=sci-libs/colamd-3.0.3 + supernodal? ( virtual/lapack ) + partition? ( + >=sci-libs/camd-3.0.3 + >=sci-libs/ccolamd-3.0.3 + ) + cuda? ( + dev-util/nvidia-cuda-toolkit + x11-drivers/nvidia-drivers + )" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( virtual/latex-base )" + +REQUIRED_USE="supernodal? ( cholesky ) + modify? ( cholesky ) + test? ( cholesky matrixops supernodal )" + +S="${WORKDIR}/${Sparse_P}/${PN^^}" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +multilib_src_configure() { + # Not that "N" prefixed options are negative options + # so they need to be turned OFF if you want that option. + # Fortran is turned off as it is only used to compile (untested) demo programs. + local mycmakeargs=( + -DNSTATIC=ON + -DENABLE_CUDA=$(usex cuda) + -DNOPENMP=$(usex openmp OFF ON) + -DNFORTRAN=ON + -DNCHOLESKY=$(usex cholesky OFF ON) + -DNMATRIXOPS=$(usex matrixops OFF ON) + -DNMODIFY=$(usex modify OFF ON) + -DNPARTITION=$(usex partition OFF ON) + -DNSUPERNODAL=$(usex supernodal OFF ON) + -DDEMO=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + # Run demo files + ./cholmod_demo < "${S}"/Demo/Matrix/bcsstk01.tri || die "failed testing" + ./cholmod_l_demo < "${S}"/Demo/Matrix/bcsstk01.tri || die "failed testing" + ./cholmod_demo < "${S}"/Demo/Matrix/lp_afiro.tri || die "failed testing" + ./cholmod_l_demo < "${S}"/Demo/Matrix/lp_afiro.tri || die "failed testing" + ./cholmod_demo < "${S}"/Demo/Matrix/can___24.mtx || die "failed testing" + ./cholmod_l_demo < "${S}"/Demo/Matrix/can___24.mtx || die "failed testing" + ./cholmod_demo < "${S}"/Demo/Matrix/c.tri || die "failed testing" + ./cholmod_l_demo < "${S}"/Demo/Matrix/c.tri || die "failed testing" + ./cholmod_simple < "${S}"/Demo/Matrix/c.tri || die "failed testing" + ./cholmod_simple < "${S}"/Demo/Matrix/can___24.mtx || die "failed testing" + ./cholmod_simple < "${S}"/Demo/Matrix/bcsstk01.tri || die "failed testing" +} + +multilib_src_install() { + if use doc; then + pushd "${S}/Doc" + rm -rf *.pdf + emake + popd + DOCS="${S}/Doc/*.pdf" + fi + cmake_src_install +} diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml index 9ba80d3ef6cc..4b106db7f098 100644 --- a/sci-libs/cholmod/metadata.xml +++ b/sci-libs/cholmod/metadata.xml @@ -7,6 +7,9 @@ </maintainer> <use> <flag name="cuda">Use nvidia cuda toolkit for speeding up computations</flag> + <flag name="cholesky"> + Enable sparse Cholesky factorisation + </flag> <flag name="matrixops"> Support basic sparse and dense matrix operations (add, multiply, scale, et cetera) @@ -17,7 +20,14 @@ </flag> <flag name="partition"> Enable graph partitioning and graph-partition-based orderings - through <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg> + through <pkg>sci-libs/metis</pkg> (using a bundled fork in 4.0.0+) + or <pkg>sci-libs/parmetis</pkg> + </flag> + <flag name="supernodal"> + supernodal cholesky factorisation </flag> </use> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild index 98ce8d0e6f95..49706b8cea37 100644 --- a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild +++ b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ 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" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="" RDEPEND="" diff --git a/sci-libs/clapack/clapack-3.2.1-r8.ebuild b/sci-libs/clapack/clapack-3.2.1-r8.ebuild index 30384df4db47..0d070b205532 100644 --- a/sci-libs/clapack/clapack-3.2.1-r8.ebuild +++ b/sci-libs/clapack/clapack-3.2.1-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.netlib.org/${PN}/${P}-CMAKE.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="test" # bug 433806 diff --git a/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild index 41bea4a55af2..92712ac85a99 100644 --- a/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild +++ b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ S="${WORKDIR}" LICENSE="richardson" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" RESTRICT="binchecks strip" diff --git a/sci-libs/clblas/clblas-2.12-r1.ebuild b/sci-libs/clblas/clblas-2.12-r2.ebuild index bed21d727f80..654c43bcf00f 100644 --- a/sci-libs/clblas/clblas-2.12-r1.ebuild +++ b/sci-libs/clblas/clblas-2.12-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) DOCS_BUILDER="doxygen" -DOCS_DEPEND="dev-libs/mathjax" +DOCS_DEPEND="<dev-libs/mathjax-3" DOCS_CONFIG_NAME="clBLAS.doxy" DOCS_DIR="doc" @@ -20,7 +20,7 @@ S="${WORKDIR}/${MYPN}-${PV}" LICENSE="Apache-2.0" SLOT="0/2" # soname version -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="+client examples ktest performance test" # the testsuite is hopelessly broken and upstream is pretty much dead RESTRICT="test" diff --git a/sci-libs/clblast/clblast-1.5.2-r1.ebuild b/sci-libs/clblast/clblast-1.5.2-r1.ebuild index 604dd3d840e1..ae12ba33513e 100644 --- a/sci-libs/clblast/clblast-1.5.2-r1.ebuild +++ b/sci-libs/clblast/clblast-1.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}/${MYPN}-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" # Cuda is still beta, default to opencl IUSE="client cuda examples +opencl test" REQUIRED_USE=" diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild index bb01f5560a4b..02a309963d6e 100644 --- a/sci-libs/cln/cln-1.3.6.ebuild +++ b/sci-libs/cln/cln-1.3.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2" LICENSE="GPL-2" SLOT="1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples" RDEPEND="dev-libs/gmp:0=" diff --git a/sci-libs/coinor-utils/Manifest b/sci-libs/coinor-utils/Manifest index 1f3f6c213142..bb45afeae108 100644 --- a/sci-libs/coinor-utils/Manifest +++ b/sci-libs/coinor-utils/Manifest @@ -1 +1,2 @@ DIST coinor-utils-2.11.4.tar.gz 1225148 BLAKE2B d55f9b3efbb3ce1c04fb9193ec70f62d8f130cd2f7ddf033c0df35f37006c542bd39e345662c271b4466b00c4bb1ec3cc14965bfe35f5b89370071d675113f4d SHA512 a7ac337b0f0bb11d578c44fd12d292ba8e77568362eaaaecbed8f4bc22ed85aaee911e2dd3153a2197b0165df082821969336d73fe1c5f0374a4636755d9a4ad +DIST coinor-utils-2.11.9.tar.gz 1234195 BLAKE2B 5fb097c9c0fc0e76f9b3c269357d70320a1386ea5850ea1f4520da44ef9337ed3540e9a3624676c6094f5571ef62bb3f4fd89d8b49643fb2901850597ad7195b SHA512 c9343edd0ce2dac5a7f025cc8d4a06e48cf966d9b9581d97e787ec801ceda9fbb7ab54c32618304573fed873ba7e291c2562f015fe0446a959b347d32365c2bb diff --git a/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild b/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild new file mode 100644 index 000000000000..894f4b5605b5 --- /dev/null +++ b/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PN=CoinUtils + +DESCRIPTION="COIN-OR Matrix, Vector and other utility classes" +HOMEPAGE="https://github.com/coin-or/CoinUtils/" +SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz + -> ${P}.tar.gz" +LICENSE="EPL-1.0" + +# major soname component +SLOT="0/3" + +KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 doc glpk blas lapack static-libs test zlib" +RESTRICT="!test? ( test )" + +# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR +# packages contain a check for it. Gentoo bug 601648 and upstream issue, +# +# https://github.com/coin-or/CoinUtils/issues/132 +# +BDEPEND="virtual/fortran + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) + test? ( sci-libs/coinor-sample )" +DEPEND="sys-libs/readline:0= + blas? ( virtual/blas ) + bzip2? ( app-arch/bzip2 ) + glpk? ( sci-mathematics/glpk:= ) + lapack? ( virtual/lapack ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.9-drop-register.patch +) + +src_prepare() { + # Needed to make the --with-coin-instdir in src_configure happy. + dodir /usr + + # They don't need to guess at this, but they do, and get it wrong... + sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \ + -i configure \ + || die "failed to fix the pkgconfig path in ${S}/configure" + + default +} + +src_configure() { + local myeconfargs=( + --enable-dependency-linking + --with-coin-instdir="${ED}/usr" + $(use_enable zlib) + $(use_enable bzip2 bzlib) + $(use_with doc dot) + ) + if use blas; then + myeconfargs+=( --with-blas-lib="$($(tc-getPKG_CONFIG) --libs blas)" ) + else + myeconfargs+=( --without-blas ) + fi + if use glpk; then + myeconfargs+=( + --with-glpk-incdir="${EPREFIX}"/usr/include + --with-glpk-lib=-lglpk + ) + else + myeconfargs+=( --without-glpk ) + fi + if use lapack; then + myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" ) + else + myeconfargs+=( --without-lapack ) + fi + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake all $(usex doc doxydoc "") +} + +src_test() { + # NOT redundant! The build system has a "make check" target that does + # nothing, so if you don't specify "test" here, you'll get a no-op. + emake test +} + +src_install() { + use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/") + + emake DESTDIR="${ED}" install + + # Duplicate junk, and in the wrong location. + rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die +} diff --git a/sci-libs/coinor-utils/files/coinor-utils-2.11.9-drop-register.patch b/sci-libs/coinor-utils/files/coinor-utils-2.11.9-drop-register.patch new file mode 100644 index 000000000000..f8ade78207d5 --- /dev/null +++ b/sci-libs/coinor-utils/files/coinor-utils-2.11.9-drop-register.patch @@ -0,0 +1,71 @@ +https://github.com/coin-or/CoinUtils/commit/1700ed92c2bc1562aabe65dee3b4885bd5c87fb9 +From: Stefan Vigerske <svigerske@gams.com> +Date: Wed, 18 Aug 2021 15:09:53 +0200 +Subject: [PATCH] remove use of register storage class specifier + +- removed in C++17 +--- + src/CoinOslC.h | 16 ++++++++-------- + src/CoinOslFactorization2.cpp | 4 ++-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/CoinOslC.h b/src/CoinOslC.h +index 2f6d10aae..d8103f86b 100644 +--- a/src/CoinOslC.h ++++ b/src/CoinOslC.h +@@ -33,30 +33,30 @@ + extern "C" { + #endif + +-int c_ekkbtrn(register const EKKfactinfo *fact, ++int c_ekkbtrn(const EKKfactinfo *fact, + double *dwork1, + int *mpt, int first_nonzero); +-int c_ekkbtrn_ipivrw(register const EKKfactinfo *fact, ++int c_ekkbtrn_ipivrw(const EKKfactinfo *fact, + double *dwork1, + int *mpt, int ipivrw, int *spare); + +-int c_ekketsj(register /*const*/ EKKfactinfo *fact, ++int c_ekketsj(/*const*/ EKKfactinfo *fact, + double *dwork1, + int *mpt2, double dalpha, int orig_nincol, + int npivot, int *nuspikp, + const int ipivrw, int *spare); +-int c_ekkftrn(register const EKKfactinfo *fact, ++int c_ekkftrn(const EKKfactinfo *fact, + double *dwork1, + double *dpermu, int *mpt, int numberNonZero); + +-int c_ekkftrn_ft(register EKKfactinfo *fact, ++int c_ekkftrn_ft(EKKfactinfo *fact, + double *dwork1, int *mpt, int *nincolp); +-void c_ekkftrn2(register EKKfactinfo *fact, double *dwork1, ++void c_ekkftrn2(EKKfactinfo *fact, double *dwork1, + double *dpermu1, int *mpt1, int *nincolp, + double *dwork1_ft, int *mpt_ft, int *nincolp_ft); + +-int c_ekklfct(register EKKfactinfo *fact); +-int c_ekkslcf(register const EKKfactinfo *fact); ++int c_ekklfct(EKKfactinfo *fact); ++int c_ekkslcf(const EKKfactinfo *fact); + inline void c_ekkscpy(int n, const int *marr1, int *marr2) + { + CoinMemcpyN(marr1, n, marr2); +diff --git a/src/CoinOslFactorization2.cpp b/src/CoinOslFactorization2.cpp +index ab3225923..177ac437b 100644 +--- a/src/CoinOslFactorization2.cpp ++++ b/src/CoinOslFactorization2.cpp +@@ -19,9 +19,9 @@ + extern int ets_count; + extern int ets_check; + #endif +-#define COIN_REGISTER register ++#define COIN_REGISTER + #define COIN_REGISTER2 +-#define COIN_REGISTER3 register ++#define COIN_REGISTER3 + #ifdef COIN_USE_RESTRICT + #define COIN_RESTRICT2 __restrict + #else + diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest index d892a2a7e321..a699b1aea285 100644 --- a/sci-libs/colamd/Manifest +++ b/sci-libs/colamd/Manifest @@ -1 +1,2 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137 diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild index 450bcbea42ac..347cfbd3e12c 100644 --- a/sci-libs/colamd/colamd-2.9.6.ebuild +++ b/sci-libs/colamd/colamd-2.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" BDEPEND="virtual/pkgconfig" DEPEND=">=sci-libs/suitesparseconfig-5.4.0" diff --git a/sci-libs/colamd/colamd-3.0.3.ebuild b/sci-libs/colamd/colamd-3.0.3.ebuild new file mode 100644 index 000000000000..b0a4af5bedc1 --- /dev/null +++ b/sci-libs/colamd/colamd-3.0.3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Column approximate minimum degree ordering algorithm" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${Sparse_P}/${PN^^}" + +multilib_src_configure() { + local mycmakeargs=( + -DNSTATIC=ON + -DDEMO=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + # Run demo files + ./colamd_example > colamd_example.out || die "failed to run test colamd_example" + diff "${S}"/Demo/colamd_example.out colamd_example.out || die "failed testing colamd_example" + ./colamd_l_example > colamd_l_example.out || die "failed to run test colamd_l_example" + diff "${S}"/Demo/colamd_l_example.out colamd_l_example.out || die "failed testing colamd_l_example" +} diff --git a/sci-libs/colamd/metadata.xml b/sci-libs/colamd/metadata.xml index 249c30df3a5c..568cb46d3cfe 100644 --- a/sci-libs/colamd/metadata.xml +++ b/sci-libs/colamd/metadata.xml @@ -15,4 +15,7 @@ matrix M such that M\'*M has the same pattern as A, and then uses COLAMD to compute a column ordering of M. </longdescription> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild index 144befd4d418..c28bec5db9b9 100644 --- a/sci-libs/colpack/colpack-1.0.10.ebuild +++ b/sci-libs/colpack/colpack-1.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="openmp" S="${WORKDIR}/${MYPN}-${PV}" diff --git a/sci-libs/cqrlib/cqrlib-1.1.4.ebuild b/sci-libs/cqrlib/cqrlib-1.1.4.ebuild index ad24b574fd1f..86556f4e6198 100644 --- a/sci-libs/cqrlib/cqrlib-1.1.4.ebuild +++ b/sci-libs/cqrlib/cqrlib-1.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/yayahjb/${PN}/archive/${MY_P}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="dev-libs/cvector" diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest index d3c7291aea21..ecf635014513 100644 --- a/sci-libs/cxsparse/Manifest +++ b/sci-libs/cxsparse/Manifest @@ -1 +1,2 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild index f52f3c13d2d4..a9f3846b1709 100644 --- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild +++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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" RDEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/sci-libs/cxsparse/cxsparse-4.0.3.ebuild b/sci-libs/cxsparse/cxsparse-4.0.3.ebuild new file mode 100644 index 000000000000..afd86a8e149e --- /dev/null +++ b/sci-libs/cxsparse/cxsparse-4.0.3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Extended sparse matrix package" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/4" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${Sparse_P}/CXSparse" + +multilib_src_configure() { + local mycmakeargs=( + -DNSTATIC=ON + -DDEMO=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + # Programs assume that they can access the Matrix folder in ${S} + ln -s "${S}/Matrix" || die "cannot link to the Matrix folder" + # Run demo files + ./cs_idemo < Matrix/t2 || die "failed testing" + ./cs_ldemo < Matrix/t2 || die "failed testing" + ./cs_demo1 < Matrix/t1 || die "failed testing" + ./cs_demo2 < Matrix/t1 || die "failed testing" + ./cs_demo2 < Matrix/fs_183_1 || die "failed testing" + ./cs_demo2 < Matrix/west0067 || die "failed testing" + ./cs_demo2 < Matrix/lp_afiro || die "failed testing" + ./cs_demo2 < Matrix/ash219 || die "failed testing" + ./cs_demo2 < Matrix/mbeacxc || die "failed testing" + ./cs_demo2 < Matrix/bcsstk01 || die "failed testing" + ./cs_demo3 < Matrix/bcsstk01 || die "failed testing" + ./cs_demo2 < Matrix/bcsstk16 || die "failed testing" + ./cs_demo3 < Matrix/bcsstk16 || die "failed testing" + ./cs_di_demo1 < Matrix/t1 || die "failed testing" + ./cs_di_demo2 < Matrix/t1 || die "failed testing" + ./cs_di_demo2 < Matrix/fs_183_1 || die "failed testing" + ./cs_di_demo2 < Matrix/west0067 || die "failed testing" + ./cs_di_demo2 < Matrix/lp_afiro || die "failed testing" + ./cs_di_demo2 < Matrix/ash219 || die "failed testing" + ./cs_di_demo2 < Matrix/mbeacxc || die "failed testing" + ./cs_di_demo2 < Matrix/bcsstk01 || die "failed testing" + ./cs_di_demo3 < Matrix/bcsstk01 || die "failed testing" + ./cs_di_demo2 < Matrix/bcsstk16 || die "failed testing" + ./cs_di_demo3 < Matrix/bcsstk16 || die "failed testing" + ./cs_dl_demo1 < Matrix/t1 || die "failed testing" + ./cs_dl_demo2 < Matrix/t1 || die "failed testing" + ./cs_dl_demo2 < Matrix/fs_183_1 || die "failed testing" + ./cs_dl_demo2 < Matrix/west0067 || die "failed testing" + ./cs_dl_demo2 < Matrix/lp_afiro || die "failed testing" + ./cs_dl_demo2 < Matrix/ash219 || die "failed testing" + ./cs_dl_demo2 < Matrix/mbeacxc || die "failed testing" + ./cs_dl_demo2 < Matrix/bcsstk01 || die "failed testing" + ./cs_dl_demo3 < Matrix/bcsstk01 || die "failed testing" + ./cs_dl_demo2 < Matrix/bcsstk16 || die "failed testing" + ./cs_dl_demo3 < Matrix/bcsstk16 || die "failed testing" + ./cs_ci_demo1 < Matrix/t2 || die "failed testing" + ./cs_ci_demo2 < Matrix/t2 || die "failed testing" + ./cs_ci_demo2 < Matrix/t3 || die "failed testing" + ./cs_ci_demo2 < Matrix/t4 || die "failed testing" + ./cs_ci_demo2 < Matrix/c_west0067 || die "failed testing" + ./cs_ci_demo2 < Matrix/c_mbeacxc || die "failed testing" + ./cs_ci_demo2 < Matrix/young1c || die "failed testing" + ./cs_ci_demo2 < Matrix/qc324 || die "failed testing" + ./cs_ci_demo2 < Matrix/neumann || die "failed testing" + ./cs_ci_demo2 < Matrix/c4 || die "failed testing" + ./cs_ci_demo3 < Matrix/c4 || die "failed testing" + ./cs_ci_demo2 < Matrix/mhd1280b || die "failed testing" + ./cs_ci_demo3 < Matrix/mhd1280b || die "failed testing" + ./cs_cl_demo1 < Matrix/t2 || die "failed testing" + ./cs_cl_demo2 < Matrix/t2 || die "failed testing" + ./cs_cl_demo2 < Matrix/t3 || die "failed testing" + ./cs_cl_demo2 < Matrix/t4 || die "failed testing" + ./cs_cl_demo2 < Matrix/c_west0067 || die "failed testing" + ./cs_cl_demo2 < Matrix/c_mbeacxc || die "failed testing" + ./cs_cl_demo2 < Matrix/young1c || die "failed testing" + ./cs_cl_demo2 < Matrix/qc324 || die "failed testing" + ./cs_cl_demo2 < Matrix/neumann || die "failed testing" + ./cs_cl_demo2 < Matrix/c4 || die "failed testing" + ./cs_cl_demo3 < Matrix/c4 || die "failed testing" + ./cs_cl_demo2 < Matrix/mhd1280b || die "failed testing" + ./cs_cl_demo3 < Matrix/mhd1280b || die "failed testing" +} diff --git a/sci-libs/cxsparse/metadata.xml b/sci-libs/cxsparse/metadata.xml index 2aa4c4bf0fff..7a0611fccc34 100644 --- a/sci-libs/cxsparse/metadata.xml +++ b/sci-libs/cxsparse/metadata.xml @@ -10,4 +10,7 @@ with support for double or complex matrices, with int or long integers. </longdescription> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/datasets/Manifest b/sci-libs/datasets/Manifest new file mode 100644 index 000000000000..ac1dc508ab82 --- /dev/null +++ b/sci-libs/datasets/Manifest @@ -0,0 +1,4 @@ +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 diff --git a/sci-libs/datasets/datasets-2.11.0-r2.ebuild b/sci-libs/datasets/datasets-2.11.0-r2.ebuild new file mode 100644 index 000000000000..a2f4ad26e65b --- /dev/null +++ b/sci-libs/datasets/datasets-2.11.0-r2.ebuild @@ -0,0 +1,52 @@ +# 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 new file mode 100644 index 000000000000..66b609fd2b57 --- /dev/null +++ b/sci-libs/datasets/datasets-2.12.0.ebuild @@ -0,0 +1,53 @@ +# 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.13.1.ebuild b/sci-libs/datasets/datasets-2.13.1.ebuild new file mode 100644 index 000000000000..60a16a43e361 --- /dev/null +++ b/sci-libs/datasets/datasets-2.13.1.ebuild @@ -0,0 +1,59 @@ +# 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}"/${PN}-2.12.0-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.14.4.ebuild b/sci-libs/datasets/datasets-2.14.4.ebuild new file mode 100644 index 000000000000..08ed796e9c2d --- /dev/null +++ b/sci-libs/datasets/datasets-2.14.4.ebuild @@ -0,0 +1,59 @@ +# 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/files/datasets-2.11.0-tests.patch b/sci-libs/datasets/files/datasets-2.11.0-tests.patch new file mode 100644 index 000000000000..e105c01bc63b --- /dev/null +++ b/sci-libs/datasets/files/datasets-2.11.0-tests.patch @@ -0,0 +1,242 @@ +--- 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 new file mode 100644 index 000000000000..6be3156bb70d --- /dev/null +++ b/sci-libs/datasets/files/datasets-2.12.0-tests.patch @@ -0,0 +1,242 @@ +--- 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.14.4-tests.patch new file mode 100644 index 000000000000..5dd322309b20 --- /dev/null +++ b/sci-libs/datasets/files/datasets-2.14.4-tests.patch @@ -0,0 +1,242 @@ +--- 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 +@@ -50,8 +50,8 @@ + # Audio + require_sndfile = pytest.mark.skipif( + # On Windows and OS X, soundfile installs sndfile +- find_spec("soundfile") is None or version.parse(importlib.metadata.version("soundfile")) < version.parse("0.12.0"), +- reason="test requires sndfile>=0.12.1: 'pip install \"soundfile>=0.12.1\"'; ", ++ True, ++ reason="test requires librosa", + ) + + # Beam +--- a/tests/features/test_audio.py 2023-05-06 09:03:58.680108142 +0200 ++++ a/tests/features/test_audio.py 2023-05-06 09:05:50.463407967 +0200 +@@ -57,6 +57,7 @@ + assert features.arrow_schema == pa.schema({"sequence_of_audios": pa.list_(Audio().pa_type)}) + + ++@pytest.mark.skip(reason="require librosa") + @pytest.mark.parametrize( + "build_example", + [ +@@ -81,6 +82,7 @@ + assert decoded_example.keys() == {"path", "array", "sampling_rate"} + + ++@pytest.mark.skip(reason="require librosa") + @pytest.mark.parametrize( + "build_example", + [ +@@ -148,6 +149,7 @@ + assert decoded_example["sampling_rate"] == 48000 + + ++@pytest.mark.skip(reason="require librosa") + @pytest.mark.parametrize("sampling_rate", [16_000, 48_000]) + def test_audio_decode_example_pcm(shared_datadir, sampling_rate): + audio_path = str(shared_datadir / "test_audio_16000.pcm") +@@ -414,6 +417,7 @@ + assert column[0]["sampling_rate"] == 16000 + + ++@pytest.mark.skip(reason="require librosa") + @pytest.mark.parametrize( + "build_data", + [ +@@ -438,6 +442,7 @@ + assert item["audio"].keys() == {"path", "array", "sampling_rate"} + + ++@pytest.mark.skip(reason="require librosa") + def test_dataset_concatenate_audio_features(shared_datadir): + # we use a different data structure between 1 and 2 to make sure they are compatible with each other + audio_path = str(shared_datadir / "test_audio_44100.wav") +@@ -451,6 +456,7 @@ + assert concatenated_dataset[1]["audio"]["array"].shape == dset2[0]["audio"]["array"].shape + + ++@pytest.mark.skip(reason="require librosa") + def test_dataset_concatenate_nested_audio_features(shared_datadir): + # we use a different data structure between 1 and 2 to make sure they are compatible with each other + audio_path = str(shared_datadir / "test_audio_44100.wav") +@@ -610,6 +616,7 @@ + assert isinstance(ds, Dataset) + + ++@require_sndfile + def test_dataset_with_audio_feature_undecoded(shared_datadir): + audio_path = str(shared_datadir / "test_audio_44100.wav") + data = {"audio": [audio_path]} +@@ -627,6 +634,7 @@ + assert column[0] == {"path": audio_path, "bytes": None} + + ++@require_sndfile + def test_formatted_dataset_with_audio_feature_undecoded(shared_datadir): + audio_path = str(shared_datadir / "test_audio_44100.wav") + data = {"audio": [audio_path]} +@@ -658,6 +666,7 @@ + assert column[0] == {"path": audio_path, "bytes": None} + + ++@require_sndfile + def test_dataset_with_audio_feature_map_undecoded(shared_datadir): + audio_path = str(shared_datadir / "test_audio_44100.wav") + data = {"audio": [audio_path]} +--- a/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:00:39.560876163 +0200 ++++ b/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:01:26.005212423 +0200 +@@ -1,10 +1,8 @@ + import shutil + import textwrap + +-import librosa + import numpy as np + import pytest +-import soundfile as sf + + from datasets import Audio, ClassLabel, Features, Value + from datasets.data_files import DataFilesDict, get_data_patterns +@@ -192,8 +190,11 @@ + return data_files_with_two_splits_and_metadata + + ++@pytest.mark.skip(reason="require soundfile") + @pytest.fixture + def data_files_with_zip_archives(tmp_path, audio_file): ++ import soundfile as sf ++ import librosa + data_dir = tmp_path / "audiofolder_data_dir_with_zip_archives" + data_dir.mkdir(parents=True, exist_ok=True) + archive_dir = data_dir / "archive" +--- a/tests/test_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 @@ + assert output_path == _readd_double_slash_removed_by_path(Path(expected_path).as_posix()) + + ++@pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, exists", + [ +@@ -301,6 +302,7 @@ + assert list(f) == TEST_URL_CONTENT.splitlines(keepends=True) + + ++@pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, expected_paths", + [ +@@ -331,6 +333,7 @@ + xlistdir(root_url, download_config=download_config) + + ++@pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, isdir", + [ +@@ -358,6 +361,7 @@ + assert xisdir(root_url, download_config=download_config) is False + + ++@pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, isfile", + [ +@@ -382,6 +386,7 @@ + assert xisfile(root_url + "qwertyuiop", download_config=download_config) is False + + ++@pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, size", + [ +@@ -407,6 +412,7 @@ + xgetsize(root_url + "qwertyuiop", download_config=download_config) + + ++@pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, expected_paths", + [ +@@ -450,6 +456,7 @@ + assert len(xglob("zip://qwertyuiop/*::" + root_url, download_config=download_config)) == 0 + + ++@pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, expected_outputs", + [ +@@ -540,6 +547,7 @@ + def test_xpath_as_posix(self, input_path, expected_path): + assert xPath(input_path).as_posix() == expected_path + ++ @pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, exists", + [ +@@ -555,6 +563,7 @@ + (tmp_path / "file.txt").touch() + assert xexists(input_path) is exists + ++ @pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, pattern, expected_paths", + [ +@@ -593,6 +602,7 @@ + output_paths = sorted(xPath(input_path).glob(pattern)) + assert output_paths == expected_paths + ++ @pytest.mark.skip(reason="not working in sandbox") + @pytest.mark.parametrize( + "input_path, pattern, expected_paths", + [ diff --git a/sci-libs/datasets/metadata.xml b/sci-libs/datasets/metadata.xml new file mode 100644 index 000000000000..94c112402049 --- /dev/null +++ b/sci-libs/datasets/metadata.xml @@ -0,0 +1,12 @@ +<?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">huggingface/datasets</remote-id> + <remote-id type="pypi">datasets</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild index 4a85f26eadb1..88c510729a28 100644 --- a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild +++ b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ HOMEPAGE="https://dicom.offis.de/dcmtk.php.en" SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz" LICENSE="OFFIS" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" SLOT="0" IUSE="doc png ssl tcpd tiff +threads xml zlib" diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index 6062fdd497e2..d5a5844c5276 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -6,3 +6,7 @@ DIST dealii-9.4.1-offline_documentation.tar.gz 392007419 BLAKE2B 81404b02ba7dc97 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.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 diff --git a/sci-libs/dealii/dealii-9.5.1.ebuild b/sci-libs/dealii/dealii-9.5.1.ebuild new file mode 100644 index 000000000000..60337976d7ad --- /dev/null +++ b/sci-libs/dealii/dealii-9.5.1.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2023 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 + DOC_PV=9.5.0 + 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${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 + +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 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:= ) + cgal? ( sci-mathematics/cgal ) + 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 ) + || ( + dev-cpp/kokkos + sci-libs/trilinos + ) + " + +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] dev-lang/perl )" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-dealii )" + +PATCHES=( +) + +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_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)" + -DDEAL_II_WITH_TBB=ON + -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 + + 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-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild index 3d175695c483..c6d3a65a9086 100644 --- a/sci-libs/dealii/dealii-9999.ebuild +++ b/sci-libs/dealii/dealii-9999.ebuild @@ -31,7 +31,7 @@ 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 + +sparse sundials symengine trilinos " # TODO: add slepc use flag once slepc is packaged for gentoo-science @@ -70,7 +70,12 @@ RDEPEND="dev-libs/boost:= sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) - trilinos? ( sci-libs/trilinos )" + trilinos? ( sci-libs/trilinos ) + || ( + dev-cpp/kokkos + sci-libs/trilinos + ) + " DEPEND="${RDEPEND} virtual/pkgconfig @@ -109,7 +114,6 @@ src_configure() { -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)" @@ -122,8 +126,6 @@ src_configure() { -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)" @@ -147,11 +149,6 @@ src_configure() { 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 } diff --git a/sci-libs/djbfft/djbfft-0.76-r3.ebuild b/sci-libs/djbfft/djbfft-0.76-r3.ebuild index cbfe9f82c0e1..8a929cef3b0c 100644 --- a/sci-libs/djbfft/djbfft-0.76-r3.ebuild +++ b/sci-libs/djbfft/djbfft-0.76-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/djbfft/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" PATCHES=( "${FILESDIR}"/${P}-gcc3.patch diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest index 56b903522e3d..81b62dedb86c 100644 --- a/sci-libs/dlib/Manifest +++ b/sci-libs/dlib/Manifest @@ -1 +1,2 @@ +DIST dlib-19.24.2.tar.gz 22252165 BLAKE2B cd6a911e16d9ff6cf94a4334e84983a9c48da42e3f696de20fb28a5bba9720507ec19ddc984bb753288f86359a1c19cdf15ed29f18c43769a1c17d3177d8dedf SHA512 a38a3079c169b16d81d7aca9fc294bcd63bd2dc1a21573f9141ca310542da3629b6523fa6f348be8b41bf5b478c0846a13a4c3fee77f1ac38dfbfc4a01effb57 DIST dlib-19.24.tar.gz 10863367 BLAKE2B eda85c6ec38fcf212754aae2cdb68539425028735b5148a2f6668ac19f2583129585a7101b74fe202fbfa3d3d2f09e533805a82f8291540919a7eb11483812e8 SHA512 f6ef2fec0977782cdcc15c6340bd91e3471294332de391405f14d86e9fd0cfcc8195fbf5b702f8d269a90b06db23a8134d112ed3fcfb780ff0433d988c41d199 diff --git a/sci-libs/dlib/dlib-19.24.2.ebuild b/sci-libs/dlib/dlib-19.24.2.ebuild new file mode 100644 index 000000000000..dd936a0dc155 --- /dev/null +++ b/sci-libs/dlib/dlib-19.24.2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_OPTIONAL=1 +inherit cmake cuda distutils-r1 + +DESCRIPTION="Numerical and networking C++ library" +HOMEPAGE="http://dlib.net/" +SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Boost-1.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" +REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +# doc needs a bunch of deps not in portage +RDEPEND=" + cblas? ( virtual/cblas ) + cuda? ( dev-libs/cudnn:= ) + gif? ( media-libs/giflib:= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + lapack? ( virtual/lapack ) + mkl? ( sci-libs/mkl ) + png? ( media-libs/libpng:0= ) + python? ( ${PYTHON_DEPS} ) + sqlite? ( dev-db/sqlite:3 ) + X? ( x11-libs/libX11 )" +DEPEND="${RDEPEND}" +BDEPEND=" + python? ( + ${DISTUTILS_DEPS} + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + ) + ) +" + +DOCS=( docs/README.txt ) + +src_prepare() { + use cuda && cuda_src_prepare + cmake_src_prepare + use python && distutils-r1_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DDLIB_ENABLE_ASSERTS=$(usex debug) + -DDLIB_ENABLE_STACK_TRACE=$(usex debug) + -DDLIB_GIF_SUPPORT=$(usex gif) + -DDLIB_JPEG_SUPPORT=$(usex jpeg) + -DDLIB_PNG_SUPPORT=$(usex png) + -DDLIB_LINK_WITH_SQLITE3=$(usex sqlite) + -DDLIB_NO_GUI_SUPPORT=$(usex X OFF ON) + -DDLIB_USE_BLAS=$(usex cblas) + -DDLIB_USE_CUDA=$(usex cuda) + -DDLIB_USE_LAPACK=$(usex lapack) + -DUSE_AVX_INSTRUCTIONS=$(usex cpu_flags_x86_avx) + -DUSE_SSE2_INSTRUCTIONS=$(usex cpu_flags_x86_sse2) + -DUSE_SSE4_INSTRUCTIONS=$(usex cpu_flags_x86_sse4_1) + ) + cmake_src_configure + use python && distutils-r1_src_configure +} + +src_compile() { + cmake_src_compile + use python && distutils-r1_src_compile +} + +src_test() { + ( + local BUILD_DIR="${BUILD_DIR}"/dlib/test + mkdir -p "${BUILD_DIR}" || die + cd "${BUILD_DIR}" >/dev/null || die + + local CMAKE_USE_DIR="${S}"/dlib/test + cmake_src_configure + cmake_build + + ./dtest --runall || die "Tests failed" + ) + + use python && distutils-r1_src_test +} + +python_test() { + epytest +} + +src_install() { + cmake_src_install + use python && distutils-r1_src_install + + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF} + fi +} diff --git a/sci-libs/evaluate/Manifest b/sci-libs/evaluate/Manifest new file mode 100644 index 000000000000..684c25d25aa0 --- /dev/null +++ b/sci-libs/evaluate/Manifest @@ -0,0 +1 @@ +DIST evaluate-0.4.0.gh.tar.gz 292250 BLAKE2B f88428b263820c1af43d02ae676625257251476092efe624490f29e63a045d698db01e4a7a802c2330027d01bc6ccf16986f28ecf8202ecbfd943c5d7c40f6ec SHA512 f2136196fc4e5717859e36e173cd49d049fc5ef50c89f466e13edd0142830574dec0b5485a4a1097eec9cb9df756a617216ff48c141db008cb0c2b85288d7fc9 diff --git a/sci-libs/evaluate/evaluate-0.4.0-r2.ebuild b/sci-libs/evaluate/evaluate-0.4.0-r2.ebuild new file mode 100644 index 000000000000..61fc96cebeac --- /dev/null +++ b/sci-libs/evaluate/evaluate-0.4.0-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_11 ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 + +DESCRIPTION="makes evaluating, comparing models and reporting their performance easier" +HOMEPAGE=" + https://pypi.org/project/evaluate/ + https://github.com/huggingface/evaluate +" +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" + +RDEPEND=" + $(python_gen_cond_dep ' + 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}] +" +BDEPEND="test? ( + $(python_gen_cond_dep ' + sci-libs/jiwer[${PYTHON_USEDEP}] + sci-libs/seqeval[${PYTHON_USEDEP}] + ') +)" + +PATCHES=( "${FILESDIR}"/${P}-tests.patch ) + +distutils_enable_tests pytest + +src_prepare() { + # These require packages not available on gentoo + rm -r metrics/{bertscore,bleurt,character,charcut_mt,chrf,code_eval} || die + rm -r metrics/{competition_math,coval,google_bleu,mauve,meteor} || die + rm -r metrics/{nist_mt,rl_reliability,rouge,sacrebleu,sari} || die + rm -r metrics/{ter,trec_eval,wiki_split,xtreme_s} || die + rm -r measurements/word_length || die + rm tests/test_evaluation_suite.py || die + distutils-r1_src_prepare +} diff --git a/sci-libs/evaluate/files/evaluate-0.4.0-tests.patch b/sci-libs/evaluate/files/evaluate-0.4.0-tests.patch new file mode 100644 index 000000000000..452a6d862ada --- /dev/null +++ b/sci-libs/evaluate/files/evaluate-0.4.0-tests.patch @@ -0,0 +1,212 @@ +--- a/tests/test_evaluator.py 2023-05-14 11:01:54.449768849 +0200 ++++ b/tests/test_evaluator.py 2023-05-14 11:06:15.182738125 +0200 +@@ -16,6 +16,7 @@ + + from time import sleep + from unittest import TestCase, mock ++from unittest import skip + + from datasets import ClassLabel, Dataset, Features, Sequence, Value + from PIL import Image +@@ -128,6 +128,7 @@ + return [{"text": "Lorem ipsum"} for _ in inputs] + + ++@skip("require network") + class TestEvaluator(TestCase): + def setUp(self): + self.data = Dataset.from_dict({"label": [1, 0], "text": ["great movie", "horrible movie"]}) +@@ -230,6 +230,7 @@ + ) + + ++@skip("require network") + class TestTextClassificationEvaluator(TestCase): + def setUp(self): + self.data = Dataset.from_dict({"label": [1, 0], "text": ["great movie", "horrible movie"]}) +@@ -394,6 +394,7 @@ + self.assertAlmostEqual(results["latency_in_seconds"], results["total_time_in_seconds"] / len(data), 5) + + ++@skip("require network") + class TestTextClassificationEvaluatorTwoColumns(TestCase): + def setUp(self): + self.data = Dataset.from_dict( +@@ -452,6 +452,7 @@ + self.assertEqual(results["accuracy"], 1.0) + + ++@skip("require network") + class TestImageClassificationEvaluator(TestCase): + def setUp(self): + self.data = Dataset.from_dict( +@@ -534,6 +535,7 @@ + self.assertEqual(results["accuracy"], 0) + + ++@skip("require network") + class TestQuestionAnsweringEvaluator(TestCase): + def setUp(self): + self.data = Dataset.from_dict( +@@ -716,6 +716,7 @@ + ) + self.assertEqual(results["overall_accuracy"], 0.5) + ++ @skip("require network") + def test_class_init(self): + evaluator = TokenClassificationEvaluator() + self.assertEqual(evaluator.task, "token-classification") +@@ -735,6 +736,7 @@ + ) + self.assertEqual(results["overall_accuracy"], 2 / 3) + ++ @skip("require network") + def test_overwrite_default_metric(self): + accuracy = load("seqeval") + results = self.evaluator.compute( +@@ -750,6 +752,7 @@ + ) + self.assertEqual(results["overall_accuracy"], 1.0) + ++ @skip("require network") + def test_data_loading(self): + # Test passing in dataset by name with data_split + data = self.evaluator.load_data("evaluate/conll2003-ci", split="validation[:1]") +@@ -863,6 +866,7 @@ + self.pipe = DummyTextGenerationPipeline(num_return_sequences=4) + self.evaluator = evaluator("text-generation") + ++ @skip("require network") + def test_class_init(self): + evaluator = TextGenerationEvaluator() + self.assertEqual(evaluator.task, "text-generation") +@@ -877,6 +877,7 @@ + results = self.evaluator.compute(data=self.data) + self.assertIsInstance(results["unique_words"], int) + ++ @skip("require nltk") + def test_overwrite_default_metric(self): + word_length = load("word_length") + results = self.evaluator.compute( +@@ -906,6 +910,7 @@ + self.assertEqual(processed_predictions, {"data": ["A", "B", "C", "D"]}) + + ++@skip("require network") + class TestText2TextGenerationEvaluator(TestCase): + def setUp(self): + self.data = Dataset.from_dict( +@@ -979,6 +984,7 @@ + self.assertEqual(results["bleu"], 0) + + ++@skip("require network") + class TestAutomaticSpeechRecognitionEvaluator(TestCase): + def setUp(self): + self.data = Dataset.from_dict( +--- a/tests/test_trainer_evaluator_parity.py 2023-05-14 17:50:29.224525549 +0200 ++++ b/tests/test_trainer_evaluator_parity.py 2023-05-14 17:37:40.947501195 +0200 +@@ -269,6 +269,7 @@ + self.assertEqual(transformers_results["eval_HasAns_f1"], evaluator_results["HasAns_f1"]) + self.assertEqual(transformers_results["eval_NoAns_f1"], evaluator_results["NoAns_f1"]) + ++ @unittest.skip('require eval_results.json') + def test_token_classification_parity(self): + model_name = "hf-internal-testing/tiny-bert-for-token-classification" + n_samples = 500 +--- a/tests/test_load.py 2023-05-20 15:45:58.855473557 +0200 ++++ b/tests/test_load.py 2023-05-20 15:50:41.620071500 +0200 +@@ -61,6 +61,7 @@ + hf_modules_cache=self.hf_modules_cache, + ) + ++ @pytest.mark.skip("require network") + def test_HubEvaluationModuleFactory_with_internal_import(self): + # "squad_v2" requires additional imports (internal) + factory = HubEvaluationModuleFactory( +@@ -72,6 +73,7 @@ + module_factory_result = factory.get_module() + assert importlib.import_module(module_factory_result.module_path) is not None + ++ @pytest.mark.skip("require network") + def test_HubEvaluationModuleFactory_with_external_import(self): + # "bleu" requires additional imports (external from github) + factory = HubEvaluationModuleFactory( +@@ -83,6 +85,7 @@ + module_factory_result = factory.get_module() + assert importlib.import_module(module_factory_result.module_path) is not None + ++ @pytest.mark.skip("require network") + def test_HubEvaluationModuleFactoryWithScript(self): + factory = HubEvaluationModuleFactory( + SAMPLE_METRIC_IDENTIFIER, +@@ -115,6 +118,7 @@ + module_factory_result = factory.get_module() + assert importlib.import_module(module_factory_result.module_path) is not None + ++ @pytest.mark.skip("require network") + def test_cache_with_remote_canonical_module(self): + metric = "accuracy" + evaluation_module_factory( +@@ -127,6 +131,7 @@ + metric, download_config=self.download_config, dynamic_modules_path=self.dynamic_modules_path + ) + ++ @pytest.mark.skip("require network") + def test_cache_with_remote_community_module(self): + metric = "lvwerra/test" + 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 +@@ -736,6 +736,7 @@ + + self.assertDictEqual(dummy_result_1, combined_evaluation.compute(predictions=preds, references=refs)) + ++ @pytest.mark.skip('require network') + def test_modules_from_string(self): + expected_result = {"accuracy": 0.5, "recall": 0.5, "precision": 1.0} + predictions = [0, 1] +--- a/tests/test_metric_common.py 2023-05-20 15:57:02.399146066 +0200 ++++ b/tests/test_metric_common.py 2023-05-20 15:59:25.167947472 +0200 +@@ -99,6 +99,7 @@ + evaluation_module_name = None + evaluation_module_type = None + ++ @pytest.mark.skip('require network') + def test_load(self, evaluation_module_name, evaluation_module_type): + doctest.ELLIPSIS_MARKER = "[...]" + evaluation_module = importlib.import_module( +--- a/tests/test_trainer_evaluator_parity.py 2023-05-20 16:00:55.986549706 +0200 ++++ b/tests/test_trainer_evaluator_parity.py 2023-05-20 16:02:51.808766855 +0200 +@@ -4,6 +4,7 @@ + import subprocess + import tempfile + import unittest ++import pytest + + import numpy as np + import torch +@@ -33,6 +33,7 @@ + def tearDown(self): + shutil.rmtree(self.dir_path, ignore_errors=True) + ++ @pytest.mark.skip('require network') + def test_text_classification_parity(self): + model_name = "philschmid/tiny-bert-sst2-distilled" + +@@ -121,6 +122,7 @@ + + self.assertEqual(transformers_results["eval_accuracy"], evaluator_results["accuracy"]) + ++ @pytest.mark.skip('require network') + def test_image_classification_parity(self): + # we can not compare to the Pytorch transformers example, that uses custom preprocessing on the images + model_name = "douwekiela/resnet-18-finetuned-dogfood" +@@ -179,6 +181,7 @@ + + self.assertEqual(transformers_results["eval_accuracy"], evaluator_results["accuracy"]) + ++ @pytest.mark.skip('require network') + def test_question_answering_parity(self): + model_name_v1 = "anas-awadalla/bert-tiny-finetuned-squad" + model_name_v2 = "mrm8488/bert-tiny-finetuned-squadv2" diff --git a/sci-libs/evaluate/metadata.xml b/sci-libs/evaluate/metadata.xml new file mode 100644 index 000000000000..f1e8571190f9 --- /dev/null +++ b/sci-libs/evaluate/metadata.xml @@ -0,0 +1,12 @@ +<?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="pypi">evaluate</remote-id> + <remote-id type="github">huggingface/evaluate</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/exodusii/exodusii-6.09-r1.ebuild b/sci-libs/exodusii/exodusii-6.09-r1.ebuild index 5feb74cae06e..c3f4f0f4edf6 100644 --- a/sci-libs/exodusii/exodusii-6.09-r1.ebuild +++ b/sci-libs/exodusii/exodusii-6.09-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}/${MY_PN} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/sci-libs/fetk/fetk-1.5.ebuild b/sci-libs/fetk/fetk-1.5.ebuild index 0f930c60495b..63f07a95b4fa 100644 --- a/sci-libs/fetk/fetk-1.5.ebuild +++ b/sci-libs/fetk/fetk-1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ HOMEPAGE="http://fetk.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" RDEPEND=" ~dev-libs/maloc-${PV} diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild index e680f8def6ba..6f4b7099f0e9 100644 --- a/sci-libs/flann/flann-1.9.1-r5.ebuild +++ b/sci-libs/flann/flann-1.9.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi octave openmp" BDEPEND=" diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest index 60af53390414..6cb16cd50382 100644 --- a/sci-libs/fplll/Manifest +++ b/sci-libs/fplll/Manifest @@ -1,2 +1 @@ -DIST fplll-5.4.2.tar.gz 2618377 BLAKE2B e730c8646b9afb68515a23e533ea8ef833439d69f2130157bd6e38b1efab9116817535c261721c98b23410185271ffc323c687630e3ba262adb97fa5f69be787 SHA512 45324d89d0efeb269c1d1400332a51432e5d09f7bf0a6d651650e0941bb718493cbb66d65056b98691691236eaf348b2cae686ee06761f64380df98b6206c004 DIST fplll-5.4.4.tar.gz 2630101 BLAKE2B b990c9346acd2c506b4697f27ff21d8453bb97473b2e988beb2ab9da34b3edd8a64d7558bca5f66a888fb4397c1e5340cf50f543ec580f0ec6980bc8c73a9390 SHA512 32a6515a3ab2677739a60a4ef0938e4284b5d3119a396104a7af22a6291ef669b42a4fb6e59f5c6daf97ff2402e7d035ea84fd1c76bfe7c0e17402bd03ae7166 diff --git a/sci-libs/fplll/files/fplll-5.4.2-with-qd-fix.patch b/sci-libs/fplll/files/fplll-5.4.2-with-qd-fix.patch deleted file mode 100644 index 73c9b4386fd1..000000000000 --- a/sci-libs/fplll/files/fplll-5.4.2-with-qd-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 94010a8c4c93c6ba9520b7c26bb6cb36344a4bf9 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Wed, 1 Jun 2022 22:11:48 -0400 -Subject: [PATCH 1/1] configure.ac: fix bashism in --with-qd test. - -There's a double-equals test here that doesn't work properly when -/bin/sh is not bash. We simply change it to single-equals. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0ccc4c4..ed0cd59 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -104,7 +104,7 @@ AS_IF([test -z "$with_qd"], [with_qd=yes]) - # and libraries if that didn't work for some reason. - # - # We only show a warning if we cannot find libqd, it is optional but recommended --AS_IF([test "x$with_qd" == "xyes"], [ -+AS_IF([test "x$with_qd" = "xyes"], [ - PKG_CHECK_MODULES([LIBQD], [qd], [have_libqd="yes"], [ - # fall back to manual search. - AC_SEARCH_LIBS(c_dd_add, --- -2.35.1 - diff --git a/sci-libs/fplll/fplll-5.4.2.ebuild b/sci-libs/fplll/fplll-5.4.2.ebuild deleted file mode 100644 index 302e525a4055..000000000000 --- a/sci-libs/fplll/fplll-5.4.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Implementations of the floating-point LLL reduction algorithm" -HOMEPAGE="https://github.com/fplll/fplll" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/7" -KEYWORDS="amd64 x86" -IUSE="static-libs qd" - -BDEPEND="virtual/pkgconfig" -DEPEND="dev-libs/gmp:0 - dev-libs/mpfr:0 - qd? ( sci-libs/qd )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-with-qd-fix.patch" ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_with qd) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sci-libs/fplll/fplll-5.4.4.ebuild b/sci-libs/fplll/fplll-5.4.4.ebuild index d8ad2144d60b..f947f1eaf1d1 100644 --- a/sci-libs/fplll/fplll-5.4.4.ebuild +++ b/sci-libs/fplll/fplll-5.4.4.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0/8" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="qd" BDEPEND="virtual/pkgconfig" diff --git a/sci-libs/galib/Manifest b/sci-libs/galib/Manifest index a81b53228554..9a0f9f379530 100644 --- a/sci-libs/galib/Manifest +++ b/sci-libs/galib/Manifest @@ -1 +1,2 @@ +DIST galib-2.4.7-patches.tar.xz 4180 BLAKE2B 3e0f9bc5c7f3289c1839ef5c2151e72079e2ca19a884ce705bc723a379b76185bb5ebc83b5c465f6df2468e5ca8eaf18d3dbbd807ef9af5899f377d83a94535e SHA512 245fc139aed8f09ba39a0a78b0ed21ac6f8c7d33bdffe24f18f53f688beae00353ac0abfa3746ee733ee30efb1fbf4084b553e7a5b647f1a41fd019ab1218c1a DIST galib247.tgz 374912 BLAKE2B d6f0d757cee9a1c26eb4525862dc2e9761449492edb323ba30ea70cde95b72da2a90fad4a931ab1d07d8bc0fca2b62672357ee790b1e67f3e9b480d5aff26106 SHA512 9c2aca29f24d3f8401ba65c246a0ca7d1fa67e4f756a5258cdb0da111842ea2903c2d70cfd9d60823c9703bcb3415ca670a731924e99878d5536c2f7eb0faba4 diff --git a/sci-libs/galib/files/galib-2.4.7-Wformat-security.patch b/sci-libs/galib/files/galib-2.4.7-Wformat-security.patch deleted file mode 100644 index faa7dcff446d..000000000000 --- a/sci-libs/galib/files/galib-2.4.7-Wformat-security.patch +++ /dev/null @@ -1,79 +0,0 @@ -Fix -Wformat-security issues, as we do not want to install potentially -dangerous example C++ files on user systems: -* ex18.C: In function ‘int main(int, char**)’: -* ex18.C:92:27: warning: format not a string literal and no format arguments [-Wformat-security] -* sprintf(filename, argv[i]); - ---- a/examples/ex18.C -+++ b/examples/ex18.C -@@ -89,7 +89,7 @@ - exit(1); - } - else{ -- sprintf(filename, argv[i]); -+ sprintf(filename, "%s", argv[i]); - continue; - } - } ---- a/examples/ex3.C -+++ b/examples/ex3.C -@@ -71,7 +71,7 @@ - exit(1); - } - else{ -- sprintf(filename, argv[i]); -+ sprintf(filename, "%s", argv[i]); - continue; - } - } ---- a/examples/ex5.C -+++ b/examples/ex5.C -@@ -308,7 +308,7 @@ - exit(1); - } - else{ -- sprintf(filename1, argv[i]); -+ sprintf(filename1, "%s", argv[i]); - continue; - } - } -@@ -318,7 +318,7 @@ - exit(1); - } - else{ -- sprintf(filename2, argv[i]); -+ sprintf(filename2, "%s", argv[i]); - continue; - } - } ---- a/examples/ex7.C -+++ b/examples/ex7.C -@@ -68,7 +68,7 @@ - exit(1); - } - else{ -- sprintf(datafile, argv[i]); -+ sprintf(datafile, "%s", argv[i]); - continue; - } - } -@@ -78,7 +78,7 @@ - exit(1); - } - else{ -- sprintf(parmfile, argv[i]); -+ sprintf(parmfile, "%s", argv[i]); - params.read(parmfile); - continue; - } ---- a/ga/gaerror.C -+++ b/ga/gaerror.C -@@ -21,7 +21,7 @@ - static STD_OSTREAM *__gaErrStream = & STD_CERR; - #endif - static GABoolean __gaErrFlag = gaTrue; --static char *__gaErrStr[] = { -+static const char *__gaErrStr[] = { - "error reading from file: ", - "error writing to file: ", - "unexpected EOF encountered during read.", diff --git a/sci-libs/galib/files/galib-2.4.7-fix-buildsystem.patch b/sci-libs/galib/files/galib-2.4.7-fix-buildsystem.patch deleted file mode 100644 index 3ed7ad84e6d4..000000000000 --- a/sci-libs/galib/files/galib-2.4.7-fix-buildsystem.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix the build system, removing hardcoded values for toolchain variables. - ---- a/examples/makefile -+++ b/examples/makefile -@@ -6,7 +6,6 @@ - # want to compile. See the README for a description of what each example does. - # ----------------------------------------------------------------------------- - --include ../makevars - - # Set these paths to the location of the GA library and headers. - #GA_INC_DIR= /usr/local/include -@@ -14,8 +13,6 @@ - GA_INC_DIR= .. - GA_LIB_DIR= ../ga - --INC_DIRS= -I$(GA_INC_DIR) --LIB_DIRS= -L$(GA_LIB_DIR) - - EXS=randtest\ - ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9\ -@@ -24,7 +21,7 @@ - - .SUFFIXES: .C - .C.o: -- $(CXX) $(CXXFLAGS) $(INC_DIRS) -c $< -+ $(CXX) $(CXXFLAGS) -I.. -c $< - - all: $(EXS) - -@@ -34,7 +31,7 @@ - - # Use this for gnu make - $(EXS): %: %.o -- $(CXX) $@.o -o $@ $(LIB_DIRS) -lga -lm $(CXX_LIBS) -+ $(CXX) $@.o -o $@ -L../ga/ -lga -lm $(CXX_LIBS) - - clean: - $(RM) $(EXS) ---- a/ga/makefile -+++ b/ga/makefile -@@ -14,7 +14,7 @@ - - $(LIB): $(OBJS) - $(PRELINK) -- $(AR) $(LIB) $? -+ $(AR) rv $(LIB) $? - $(RANLIB) $(LIB) - echo "$(CXX) $(CXXFLAGS)" > BUILD - @echo $(LIB) is now up-to-date ---- a/makevars -+++ b/makevars -@@ -31,12 +31,7 @@ - # verified 06mar07 on linux-x86 (debian with gcc 3.3.5) - # verified 06mar07 on linux-x86 (ubuntu with gcc 4.0.3) - # verified 06mar07 on macosx-ppc (macosx 10.4.8 with gcc 4.0.1) --CXX = g++ --CXXFLAGS = -g -Wall --LD = g++ -w --AR = ar rv - INSTALL = install -c --RANLIB = echo no ranlib - - # gcc2 - # verified 28dec04 on linux-x86 (redhat 6.2 with gcc 2.95.2) diff --git a/sci-libs/galib/files/galib-2.4.7-fix-c++14.patch b/sci-libs/galib/files/galib-2.4.7-fix-c++14.patch deleted file mode 100644 index babc84b63524..000000000000 --- a/sci-libs/galib/files/galib-2.4.7-fix-c++14.patch +++ /dev/null @@ -1,85 +0,0 @@ -Fix building with C++14, which errors out due to stricter two-phase lookup. -See also: https://bugs.gentoo.org/show_bug.cgi?id=594504 - -Patch by Peter Levine - ---- a/ga/GA1DArrayGenome.C -+++ b/ga/GA1DArrayGenome.C -@@ -222,8 +222,8 @@ - aset = new GAAlleleSet<T>[1]; - aset[0] = s; - -- initializer(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_INITIALIZER); -- mutator(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_MUTATOR); -+ GAGenome::initializer(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_INITIALIZER); -+ GAGenome::mutator(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_MUTATOR); - comparator(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_COMPARATOR); - crossover(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_CROSSOVER); - } -@@ -238,8 +238,8 @@ - for(int i=0; i<naset; i++) - aset[i] = sa.set(i); - -- initializer(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_INITIALIZER); -- mutator(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_MUTATOR); -+ GAGenome::initializer(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_INITIALIZER); -+ GAGenome::mutator(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_MUTATOR); - comparator(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_COMPARATOR); - crossover(GA1DArrayAlleleGenome<T>::DEFAULT_1DARRAY_ALLELE_CROSSOVER); - } ---- a/ga/GA2DArrayGenome.C -+++ b/ga/GA2DArrayGenome.C -@@ -269,10 +269,10 @@ - aset = new GAAlleleSet<T>[1]; - aset[0] = s; - -- initializer(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_INITIALIZER); -- mutator(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_MUTATOR); -- comparator(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_COMPARATOR); -- crossover(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_CROSSOVER); -+ GAGenome::initializer(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_INITIALIZER); -+ GAGenome::mutator(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_MUTATOR); -+ GAGenome::comparator(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_COMPARATOR); -+ GAGenome::crossover(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_CROSSOVER); - } - - template <class T> -@@ -286,10 +286,10 @@ - for(int i=0; i<naset; i++) - aset[i] = sa.set(i); - -- initializer(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_INITIALIZER); -- mutator(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_MUTATOR); -- comparator(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_COMPARATOR); -- crossover(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_CROSSOVER); -+ GAGenome::initializer(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_INITIALIZER); -+ GAGenome::mutator(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_MUTATOR); -+ GAGenome::comparator(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_COMPARATOR); -+ GAGenome::crossover(GA2DArrayAlleleGenome<T>::DEFAULT_2DARRAY_ALLELE_CROSSOVER); - } - - ---- a/ga/GA3DArrayGenome.C -+++ b/ga/GA3DArrayGenome.C -@@ -322,8 +322,8 @@ - aset = new GAAlleleSet<T>[1]; - aset[0] = s; - -- initializer(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_INITIALIZER); -- mutator(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_MUTATOR); -+ GAGenome::initializer(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_INITIALIZER); -+ GAGenome::mutator(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_MUTATOR); - comparator(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_COMPARATOR); - crossover(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_CROSSOVER); - } -@@ -339,8 +339,8 @@ - for(int i=0; i<naset; i++) - aset[i] = sa.set(i); - -- initializer(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_INITIALIZER); -- mutator(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_MUTATOR); -+ GAGenome::initializer(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_INITIALIZER); -+ GAGenome::mutator(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_MUTATOR); - comparator(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_COMPARATOR); - crossover(GA3DArrayAlleleGenome<T>::DEFAULT_3DARRAY_ALLELE_CROSSOVER); - } diff --git a/sci-libs/galib/galib-2.4.7-r1.ebuild b/sci-libs/galib/galib-2.4.7-r1.ebuild deleted file mode 100644 index 5209af1c4c9d..000000000000 --- a/sci-libs/galib/galib-2.4.7-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_PV="${PV//\./}" - -DESCRIPTION="Library for genetic algorithms in C++ programs" -HOMEPAGE="http://lancet.mit.edu/ga/" -SRC_URI="http://lancet.mit.edu/ga/dist/galib${MY_PV}.tgz" - -LICENSE="BSD examples? ( GPL-2 )" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc examples" - -S="${WORKDIR}/${PN}${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.4.7-fix-buildsystem.patch" - "${FILESDIR}/${PN}-2.4.7-fix-c++14.patch" - "${FILESDIR}/${PN}-2.4.7-Wformat-security.patch" -) - -src_prepare() { - default - sed -e "s:/include:${EPREFIX}/usr/include:" \ - -e "s:/lib:${EPREFIX}/usr/$(get_libdir):" \ - -i makevars || die -} - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - lib - emake -C examples clean -} - -src_install() { - dodir /usr/$(get_libdir) - - use doc && HTML_DOCS+=( doc/. ) - if use examples; then - dodoc -r examples - find "${ED%/}/usr/share/doc/${PF}/examples" -iname 'makefile*' -delete || die - docompress -x /usr/share/doc/${PF}/examples - fi - - default -} diff --git a/sci-libs/galib/galib-2.4.7-r2.ebuild b/sci-libs/galib/galib-2.4.7-r2.ebuild new file mode 100644 index 000000000000..a4bd3d281306 --- /dev/null +++ b/sci-libs/galib/galib-2.4.7-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV="${PV//\./}" + +DESCRIPTION="Library for genetic algorithms in C++ programs" +HOMEPAGE="http://lancet.mit.edu/ga/" +SRC_URI=" + http://lancet.mit.edu/ga/dist/galib${MY_PV}.tgz + https://dev.gentoo.org/~soap/distfiles/${P}-patches.tar.xz" +S="${WORKDIR}/${PN}${MY_PV}" + +LICENSE="BSD examples? ( GPL-2 )" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples" + +PATCHES=( "${WORKDIR}"/patches ) + +src_configure() { + tc-export AR CXX + export LIBDIR="${EPREFIX}"/usr/$(get_libdir) + export INCDIR="${EPREFIX}"/usr/include +} + +src_compile() { + emake lib + emake -C examples clean +} + +src_install() { + use doc && HTML_DOCS=( doc/. ) + if use examples; then + dodoc -r examples + find "${ED}"/usr/share/doc/${PF}/examples -iname 'makefile*' -delete || die + docompress -x /usr/share/doc/${PF}/examples + fi + + default +} diff --git a/sci-libs/gamer/gamer-1.5-r2.ebuild b/sci-libs/gamer/gamer-1.5-r2.ebuild index e8fc10d94826..1a48e31ad7e5 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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" RDEPEND=">=dev-libs/maloc-1.4" diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index f39eae1fba87..bced264317d2 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -1,8 +1,8 @@ -DIST gdal-3.5.3.tar.xz 9504740 BLAKE2B 7054df4c7ea6d8d3e6e9cf2544fc5c7a9149dea94ed882723ec82c61268100c2f5330f28a8d9d44e1296511eb2a204c64dfe41f135fadb44db380aa331d9c731 SHA512 b7bac9dd568e9db49d1fa5be8cd48df37f37196b0cacce44f738a981f0c43a77b5750312cd0c3385fdd881a6b525a5ceac56bcd08284d76071bd508d01781f49 -DIST gdal-3.6.1.tar.xz 8685072 BLAKE2B 84f707085e77317f2e6577afe594eb01aae777d2863454bfc873ba170f1254094946f02301079d9cce66f8e64848b2b97f03651b114b283c7910d46da1507430 SHA512 07138bdd66a0259cffed3a1587904760b734fffa546f5cdf7ca9ee472c77676e5694f6c92d57f03f9cdb94cc3992a0404688f248b79e263eb0c1e3ab6025f6bb -DIST gdal-3.6.2.tar.xz 8635724 BLAKE2B c90606b642c632dd5ec224d63aa80c158c9ee04c6ca0341815f7449b319bf9442d65c2f9b981aedd242713ef6909a30f620b448ba26baf6cd8a31e2a9ae0dd8a SHA512 d404335d37ef4916b6098fa8dc7a5e1579ecdd958b37ce73bb08855fa226d3a7b488eee52db17364ef1c0697d59805d495a734f21dad2ad2f0b27e7b1f253e50 -DIST gdal-3.6.3.tar.xz 8645148 BLAKE2B c9d6817e74d0ec377979a060db231ec989e676f9aa0c1c04a8bcd6913c271eaccbb43a59b8bd52f0e297844759a3925039b83c73c4e0773943eeec8af656bb8a SHA512 296901ea667b7d419638fafd9a3ef3cb8bfb1753223048660c463b18e510cb840ae99fdcdb860495782003376c9fb8c24ca3be3699dc31497bd324a09e2abec9 -DIST gdalautotest-3.5.3.tar.gz 12374523 BLAKE2B 3f8e2ba8b49d7bb870a49bde4ec95f807ff79cf23d36504cf7beeccff104364d8fc8e287184a0239cd2c4bf5e26c900cfb29bda3beb615504e588519385a322c SHA512 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e -DIST gdalautotest-3.6.1.tar.gz 12577286 BLAKE2B 5215db1c39ee1b6d923da9503a2220d8862cf262d3f92605902e6a8e7272fbae156c306a8172f7ef75ad110fc6a82a06873c8420d5d1f2a3a8d4600430932a79 SHA512 a91ba311840b98d16df1918752bb5a629bdbe68b98e3ca9f00e2a8ee49f9f68021081700eb39cce7cf5b09fc3fafed987ea067c8135ab2469b91c34338ba7ef2 -DIST gdalautotest-3.6.2.tar.gz 12586870 BLAKE2B 28b6ae04d68964705dfe370bf189343c76fa63e358ce1c7362604743c92130c8e93ec826170a7adfd95aad8a05a5ae7a006b35cf487a81eb0c6695353ab7ef20 SHA512 63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859 -DIST gdalautotest-3.6.3.tar.gz 12613287 BLAKE2B a4548ccf7bd4a8de9fd093514afbd3d6de453ca6a1bb0c4b6e50f6f37ac5ec321f7b80943f32fcf4164442d2d63b09458c1d0ebad76ee76a53b681e2b07ee388 SHA512 2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4 +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 diff --git a/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch b/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch new file mode 100644 index 000000000000..2ddc39db8b36 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/904534 +--- a/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt ++++ b/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt +@@ -8,6 +8,7 @@ + ogrflatgeobufeditablelayer.cpp + PLUGIN_CAPABLE + NO_DEPS) ++set_property(TARGET ogr_FlatGeobuf PROPERTY CXX_STANDARD 17) + gdal_standard_includes(ogr_FlatGeobuf) + target_include_directories(ogr_FlatGeobuf PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>) + diff --git a/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch new file mode 100644 index 000000000000..5f6dafeab525 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch @@ -0,0 +1,51 @@ +--- a/frmts/zlib/contrib/infback9/minified_zutil.c ++++ b/frmts/zlib/contrib/infback9/minified_zutil.c +@@ -8,9 +8,9 @@ + #include "minified_zutil.h" + + #ifndef STDC +-extern voidp malloc OF((uInt size)); +-extern voidp calloc OF((uInt items, uInt size)); +-extern void free OF((voidpf ptr)); ++extern voidp malloc (uInt size); ++extern voidp calloc (uInt items, uInt size); ++extern void free (voidpf ptr); + #endif + + voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) +--- a/frmts/zlib/contrib/infback9/minified_zutil.h ++++ b/frmts/zlib/contrib/infback9/minified_zutil.h +@@ -191,9 +191,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + /* provide prototypes for these when building zlib without LFS */ + #if !defined(_WIN32) && \ + (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) +- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); +- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +- ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t)); ++ ZEXTERN uLong ZEXPORT adler32_combine64 (uLong, uLong, z_off_t); ++ ZEXTERN uLong ZEXPORT crc32_combine64 (uLong, uLong, z_off_t); ++ ZEXTERN uLong ZEXPORT crc32_combine_gen64 (z_off_t); + #endif + + /* common defaults */ +@@ -232,16 +232,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + # define zmemzero(dest, len) memset(dest, 0, len) + # endif + #else +- void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); +- int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); +- void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); ++ void ZLIB_INTERNAL zmemcpy (Bytef* dest, const Bytef* source, uInt len); ++ int ZLIB_INTERNAL zmemcmp (const Bytef* s1, const Bytef* s2, uInt len); ++ void ZLIB_INTERNAL zmemzero (Bytef* dest, uInt len); + #endif + + /* Diagnostic functions */ + #ifdef ZLIB_DEBUG + # include <stdio.h> + extern int ZLIB_INTERNAL z_verbose; +- extern void ZLIB_INTERNAL z_error OF((char *m)); ++ extern void ZLIB_INTERNAL z_error (char *m); + # define Assert(cond,msg) {if(!(cond)) z_error(msg);} + # define Trace(x) {if (z_verbose>=0) fprintf x ;} + # define Tracev(x) {if (z_verbose>0) fprintf x ;} diff --git a/sci-libs/gdal/gdal-3.6.2.ebuild b/sci-libs/gdal/gdal-3.6.4.ebuild index c40535d0635c..b714e11787bd 100644 --- a/sci-libs/gdal/gdal-3.6.2.ebuild +++ b/sci-libs/gdal/gdal-3.6.4.ebuild @@ -15,8 +15,6 @@ 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" -# Tests fail to build in 3.5.0, let's not worry too much yet given -# we're only just porting to CMake. Revisit later. RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -83,6 +81,14 @@ DEPEND="dev-libs/expat 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 diff --git a/sci-libs/gdal/gdal-3.5.3-r1.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild index 84d64732511a..ad7b0c96ad80 100644 --- a/sci-libs/gdal/gdal-3.5.3-r1.ebuild +++ b/sci-libs/gdal/gdal-3.7.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake java-pkg-opt-2 python-single-r1 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" @@ -12,35 +12,42 @@ 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/31" # subslot is libgdal.so.<SONAME> -KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" +SLOT="0/33" # 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" -# Tests fail to build in 3.5.0, let's not worry too much yet given -# we're only just porting to CMake. Revisit later. -RESTRICT="!test? ( test ) test" +RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - spatialite? ( sqlite )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + spatialite? ( sqlite ) + test? ( ${PYTHON_REQUIRED_USE} ) +" -BDEPEND="virtual/pkgconfig +BDEPEND=" + virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core - dev-lang/swig:0 - >=virtual/jdk-1.8:* + dev-lang/swig ) python? ( - dev-lang/swig:0 + dev-lang/swig $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ') - )" -DEPEND="dev-libs/expat + ) + test? ( + ${PYTHON_DEPS} + dev-cpp/gtest + ) +" +DEPEND=" + dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= - media-libs/tiff:= + media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] @@ -52,6 +59,9 @@ DEPEND="dev-libs/expat gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) + java? ( + >=virtual/jdk-1.8:*[-headless-awt] + ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( @@ -77,12 +87,27 @@ DEPEND="dev-libs/expat sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) - zstd? ( app-arch/zstd:= )" -RDEPEND="${DEPEND} - java? ( >=virtual/jre-1.8:* )" + 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 + "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch +) pkg_setup() { - use python && python-single-r1_pkg_setup + if use python || use test ; then + python-single-r1_pkg_setup + fi + use java && java-pkg-opt-2_pkg_setup } @@ -99,6 +124,7 @@ src_configure() { -DENABLE_IPO=OFF -DGDAL_USE_EXTERNAL_LIBS=ON -DGDAL_USE_INTERNAL_LIBS=OFF + -DBUILD_TESTING=$(usex test) # bug #844874 and bug #845150 -DCMAKE_INSTALL_INCLUDEDIR="include/gdal" @@ -168,6 +194,7 @@ src_configure() { -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 @@ -207,6 +234,10 @@ src_configure() { #-Dtest_xop=$(usex cpu_flags_x86_xop) ) + if use test ; then + mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) + fi + cmake_src_configure } @@ -223,16 +254,33 @@ src_test() { # Two test suites: # 1. autotests (much larger, uses pytest) # 2. Small set of fuzzing tests (no download needed) - cmake_src_test + + # Missing file for test-unit? + cmake_src_test -E "(test-unit)" } src_install() { cmake_src_install use python && python_optimize + + if use java; then + # Move the native library into the proper place for Gentoo. The + # library in ${D} has already had its RPATH fixed, so we use it + # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. + java-pkg_doso "${D}/usr/share/java/libgdalalljni.so" + rm "${D}/usr/share/java/libgdalalljni.so" || die + fi + # TODO: install docs? } pkg_postinst() { elog "Check available image and data formats after building with" elog "gdalinfo and ogrinfo (using the --formats switch)." + + if use java; then + elog + elog "To use the Java bindings, you need to pass the following to java:" + elog " -Djava.library.path=$(java-config -i gdal)" + fi } diff --git a/sci-libs/gdal/gdal-3.6.1-r1.ebuild b/sci-libs/gdal/gdal-3.7.1.ebuild index 9d53fd3a7beb..b652d383e470 100644 --- a/sci-libs/gdal/gdal-3.6.1-r1.ebuild +++ b/sci-libs/gdal/gdal-3.7.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake java-pkg-opt-2 python-single-r1 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" @@ -12,32 +12,37 @@ 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> +SLOT="0/33" # 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" -# Tests fail to build in 3.5.0, let's not worry too much yet given -# we're only just porting to CMake. Revisit later. RESTRICT="!test? ( test )" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) spatialite? ( sqlite ) + test? ( ${PYTHON_REQUIRED_USE} ) " -BDEPEND="virtual/pkgconfig +BDEPEND=" + virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core - dev-lang/swig:0 - >=virtual/jdk-1.8:* + dev-lang/swig ) python? ( - dev-lang/swig:0 + dev-lang/swig $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ') - )" -DEPEND="dev-libs/expat + ) + test? ( + ${PYTHON_DEPS} + dev-cpp/gtest + ) +" +DEPEND=" + dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 @@ -54,6 +59,9 @@ DEPEND="dev-libs/expat gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) + java? ( + >=virtual/jdk-1.8:*[-headless-awt] + ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( @@ -79,12 +87,27 @@ DEPEND="dev-libs/expat sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) - zstd? ( app-arch/zstd:= )" -RDEPEND="${DEPEND} - java? ( >=virtual/jre-1.8:* )" + 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 + "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch +) pkg_setup() { - use python && python-single-r1_pkg_setup + if use python || use test ; then + python-single-r1_pkg_setup + fi + use java && java-pkg-opt-2_pkg_setup } @@ -101,6 +124,7 @@ src_configure() { -DENABLE_IPO=OFF -DGDAL_USE_EXTERNAL_LIBS=ON -DGDAL_USE_INTERNAL_LIBS=OFF + -DBUILD_TESTING=$(usex test) # bug #844874 and bug #845150 -DCMAKE_INSTALL_INCLUDEDIR="include/gdal" @@ -210,6 +234,10 @@ src_configure() { #-Dtest_xop=$(usex cpu_flags_x86_xop) ) + if use test ; then + mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) + fi + cmake_src_configure } @@ -234,10 +262,25 @@ src_test() { src_install() { cmake_src_install use python && python_optimize + + if use java; then + # Move the native library into the proper place for Gentoo. The + # library in ${D} has already had its RPATH fixed, so we use it + # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. + java-pkg_doso "${D}/usr/share/java/libgdalalljni.so" + rm "${D}/usr/share/java/libgdalalljni.so" || die + fi + # TODO: install docs? } pkg_postinst() { elog "Check available image and data formats after building with" elog "gdalinfo and ogrinfo (using the --formats switch)." + + if use java; then + elog + elog "To use the Java bindings, you need to pass the following to java:" + elog " -Djava.library.path=$(java-config -i gdal)" + fi } diff --git a/sci-libs/gdal/gdal-3.6.3.ebuild b/sci-libs/gdal/gdal-3.7.2.ebuild index 3d1a8d72c769..b652d383e470 100644 --- a/sci-libs/gdal/gdal-3.6.3.ebuild +++ b/sci-libs/gdal/gdal-3.7.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake java-pkg-opt-2 python-single-r1 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" @@ -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/32" # subslot is libgdal.so.<SONAME> +SLOT="0/33" # 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 )" @@ -20,22 +20,29 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) spatialite? ( sqlite ) + test? ( ${PYTHON_REQUIRED_USE} ) " -BDEPEND="virtual/pkgconfig +BDEPEND=" + virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core - dev-lang/swig:0 - >=virtual/jdk-1.8:* + dev-lang/swig ) python? ( - dev-lang/swig:0 + dev-lang/swig $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ') - )" -DEPEND="dev-libs/expat + ) + test? ( + ${PYTHON_DEPS} + dev-cpp/gtest + ) +" +DEPEND=" + dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 @@ -52,6 +59,9 @@ DEPEND="dev-libs/expat gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) + java? ( + >=virtual/jdk-1.8:*[-headless-awt] + ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( @@ -77,12 +87,27 @@ DEPEND="dev-libs/expat sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) - zstd? ( app-arch/zstd:= )" -RDEPEND="${DEPEND} - java? ( >=virtual/jre-1.8:* )" + 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 + "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch +) pkg_setup() { - use python && python-single-r1_pkg_setup + if use python || use test ; then + python-single-r1_pkg_setup + fi + use java && java-pkg-opt-2_pkg_setup } @@ -99,6 +124,7 @@ src_configure() { -DENABLE_IPO=OFF -DGDAL_USE_EXTERNAL_LIBS=ON -DGDAL_USE_INTERNAL_LIBS=OFF + -DBUILD_TESTING=$(usex test) # bug #844874 and bug #845150 -DCMAKE_INSTALL_INCLUDEDIR="include/gdal" @@ -208,6 +234,10 @@ src_configure() { #-Dtest_xop=$(usex cpu_flags_x86_xop) ) + if use test ; then + mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) + fi + cmake_src_configure } @@ -232,10 +262,25 @@ src_test() { src_install() { cmake_src_install use python && python_optimize + + if use java; then + # Move the native library into the proper place for Gentoo. The + # library in ${D} has already had its RPATH fixed, so we use it + # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. + java-pkg_doso "${D}/usr/share/java/libgdalalljni.so" + rm "${D}/usr/share/java/libgdalalljni.so" || die + fi + # TODO: install docs? } pkg_postinst() { elog "Check available image and data formats after building with" elog "gdalinfo and ogrinfo (using the --formats switch)." + + if use java; then + elog + elog "To use the Java bindings, you need to pass the following to java:" + elog " -Djava.library.path=$(java-config -i gdal)" + fi } diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index 42022eecc40f..9581af48922a 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,3 +1,4 @@ DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f98df95d5aaf9f6fd957ebcdbdefb43ae4fb17a5a671b6dfdb812bdacfdbfdfdea6e5bd44f135e3701a3cc914d SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189 DIST geos-3.11.1.tar.bz2 6753232 BLAKE2B 376050ca3224e5220f69d82ff62d79ff7ea3d35d5fe90b7ab4e0cabcb4200b47d7569110538c201df9cb28da784f09f8207a9a8233ee002ab2ec87f5cf336ba1 SHA512 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3 DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff985555e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec +DIST geos-3.12.0.tar.bz2 6736650 BLAKE2B abdf1c524fa35dccfe253f9774a57768a7597b3fb5ede99dbb5c473a3de5a2c8bcef7cd892ebf3768179a85b365394163fd38efb661f014d23828618178505d0 SHA512 cc67d9516d24ada2ceaf7c81ff9df40033bb15123160bf7e70fdff97b72c798f4b9ba8223c1eaebac0f33dcb530bc8cf42af000af3491f3227420290d89332d5 diff --git a/sci-libs/geos/geos-3.11.0.ebuild b/sci-libs/geos/geos-3.11.0.ebuild index 4115303f0477..1ff24602fef5 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~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 )" diff --git a/sci-libs/geos/geos-3.11.1.ebuild b/sci-libs/geos/geos-3.11.1.ebuild index b560a1fb3e08..7f268e5f6bbb 100644 --- a/sci-libs/geos/geos-3.11.1.ebuild +++ b/sci-libs/geos/geos-3.11.1.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~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 )" diff --git a/sci-libs/geos/geos-3.11.2.ebuild b/sci-libs/geos/geos-3.11.2.ebuild index 9aa1b4eecd40..88b55f52a870 100644 --- a/sci-libs/geos/geos-3.11.2.ebuild +++ b/sci-libs/geos/geos-3.11.2.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~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 )" diff --git a/sci-libs/geos/geos-3.12.0.ebuild b/sci-libs/geos/geos-3.12.0.ebuild new file mode 100644 index 000000000000..a95d93f605b6 --- /dev/null +++ b/sci-libs/geos/geos-3.12.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Geometry engine library for Geographic Information Systems" +HOMEPAGE="https://libgeos.org/" +SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~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 )" + +src_configure() { + 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-fix-gzseek64-not-found.patch b/sci-libs/getdata/files/getdata-0.11.0-fix-gzseek64-not-found.patch new file mode 100644 index 000000000000..09a250e955f9 --- /dev/null +++ b/sci-libs/getdata/files/getdata-0.11.0-fix-gzseek64-not-found.patch @@ -0,0 +1,12 @@ +Refer: https://stackoverflow.com/a/42695228 +Bug: https://bugs.gentoo.org/898278 +--- a/src/gzip.c ++++ b/src/gzip.c +@@ -21,6 +21,7 @@ + #include "internal.h" + + #ifdef HAVE_ZLIB_H ++#define Z_LARGE64 + #include <zlib.h> + #endif + diff --git a/sci-libs/getdata/getdata-0.11.0-r1.ebuild b/sci-libs/getdata/getdata-0.11.0-r1.ebuild new file mode 100644 index 000000000000..698d2697d850 --- /dev/null +++ b/sci-libs/getdata/getdata-0.11.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="95" +FORTRAN_NEEDED=fortran +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" + +SLOT="0" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 cxx debug flac fortran lzma perl static-libs" + +DEPEND=" + bzip2? ( app-arch/bzip2 ) + lzma? ( app-arch/xz-utils ) + perl? ( dev-lang/perl ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.11.0-fix-gzseek64-not-found.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # GCC 10 workaround + # bug #723076 + append-fflags $(test-flags-FC -fallow-argument-mismatch) + + econf \ + --disable-idl \ + --disable-matlab \ + --disable-php \ + --with-libz \ + --without-libslim \ + --without-libzzip \ + $(use_with bzip2 libbz2) \ + $(use_enable cxx cplusplus) \ + $(use_enable debug) \ + $(use_with flac libFLAC) \ + $(use_enable fortran) \ + $(use_enable fortran fortran95) \ + $(use_with lzma liblzma) \ + $(use_enable perl) \ + $(usex perl --with-perl-dir=vendor) \ + --disable-python \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest index 4a45be486a9b..85fa14f2e7ef 100644 --- a/sci-libs/ginkgo/Manifest +++ b/sci-libs/ginkgo/Manifest @@ -1 +1,2 @@ DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807 +DIST ginkgo-1.6.0.tar.gz 12788830 BLAKE2B c452e20eddb3673b5863106d8a8d42aab253cb5a17cf0445194903ebadcffe53ef0df6b5f26e2602e137faaa4a23dddd0b192f3453b4bd440907385fc09d004a SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50 diff --git a/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch b/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch new file mode 100644 index 000000000000..c910ad92c5a9 --- /dev/null +++ b/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch @@ -0,0 +1,24 @@ +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 41ed77d900..9a0c7d5128 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -40,8 +40,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") +@@ -55,8 +54,7 @@ if(GINKGO_BUILD_MPI) + list(APPEND EXAMPLES_LIST distributed-solver) + endif() + +-find_package(Kokkos QUIET) +-if(Kokkos_FOUND) ++if(FALSE) + if(GINKGO_WITH_CCACHE) + message(WARNING "The CMAKE_CXX_COMPILER_LAUNCHER is set due to " + "GINKGO_WITH_CCACHE=ON which is known to casue issues with CUDA enabled " diff --git a/sci-libs/ginkgo/files/ginkgo-1.6.0-fix_type_mismatch.patch b/sci-libs/ginkgo/files/ginkgo-1.6.0-fix_type_mismatch.patch new file mode 100644 index 000000000000..d248fe87f2d7 --- /dev/null +++ b/sci-libs/ginkgo/files/ginkgo-1.6.0-fix_type_mismatch.patch @@ -0,0 +1,12 @@ +diff --git a/core/base/timer.cpp b/core/base/timer.cpp +index bc1c716..0185567 100644 +--- a/core/base/timer.cpp ++++ b/core/base/timer.cpp +@@ -124,7 +124,7 @@ void CpuTimer::wait(time_point& time) {} + std::chrono::nanoseconds CpuTimer::difference_async(const time_point& start, + const time_point& stop) + { +- return std::chrono::duration_cast<std::chrono::nanoseconds, int64>( ++ return std::chrono::duration_cast<std::chrono::nanoseconds>( + stop.data_.chrono - start.data_.chrono); + } diff --git a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild new file mode 100644 index 000000000000..4cceeb06c5b6 --- /dev/null +++ b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 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}-fix_type_mismatch.patch + "${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/files/givaro-4.1.1-gcc-13.patch b/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch new file mode 100644 index 000000000000..15178289ca84 --- /dev/null +++ b/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch @@ -0,0 +1,23 @@ +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 +Subject: [PATCH] Add missing #include <cstdint> for (u)int64_t + +Fixes failure to compile on GCC 13. +--- + src/library/poly1/givdegree.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/library/poly1/givdegree.h b/src/library/poly1/givdegree.h +index 3753a425..eb85a0dd 100644 +--- a/src/library/poly1/givdegree.h ++++ b/src/library/poly1/givdegree.h +@@ -19,6 +19,8 @@ + #ifndef __GIVARO_poly1degree_H + #define __GIVARO_poly1degree_H + ++#include <cstdint> ++ + #include <iostream> + + namespace Givaro { diff --git a/sci-libs/givaro/givaro-4.1.1-r3.ebuild b/sci-libs/givaro/givaro-4.1.1-r3.ebuild index 9a656f56f2a1..e072eb6ffbe7 100644 --- a/sci-libs/givaro/givaro-4.1.1-r3.ebuild +++ b/sci-libs/givaro/givaro-4.1.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar LICENSE="CeCILL-B" SLOT="0/9" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +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 )" @@ -30,6 +30,7 @@ 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" ) diff --git a/sci-libs/gklib/Manifest b/sci-libs/gklib/Manifest new file mode 100644 index 000000000000..4d3ba01da662 --- /dev/null +++ b/sci-libs/gklib/Manifest @@ -0,0 +1 @@ +DIST gklib-5.1.1_p20230327.tar.gz 186266 BLAKE2B f8c8bad20d98717141f748364614bfe95644dbaadf9370f3ad4751eb5a8f1cc7a429b42481af86bbe4df18541366e594d3b8d078305d2154f76928f587af91fc SHA512 128cd9a48047b18b8013288162556f0b0f1d81845f5445f7cc62590ab28c06ee0a6c602cc999ce268ab27237eca3e8295df6432d377e45071946b98558872997 diff --git a/sci-libs/gklib/files/gklib-5.1.1_p20230327-multilib.patch b/sci-libs/gklib/files/gklib-5.1.1_p20230327-multilib.patch new file mode 100644 index 000000000000..92fd8024f9a8 --- /dev/null +++ b/sci-libs/gklib/files/gklib-5.1.1_p20230327-multilib.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9cd1b4b..592b70a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,6 @@ include_directories("test") + add_subdirectory("test") + + install(TARGETS GKlib +- ARCHIVE DESTINATION lib/${LINSTALL_PATH} +- LIBRARY DESTINATION lib/${LINSTALL_PATH}) ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}/${LINSTALL_PATH} ++ LIBRARY DESTINATION lib${LIB_SUFFIX}/${LINSTALL_PATH}) + install(FILES ${GKlib_includes} DESTINATION include/${HINSTALL_PATH}) diff --git a/sci-libs/gklib/files/gklib-5.1.1_p20230327-respect-user-flags.patch b/sci-libs/gklib/files/gklib-5.1.1_p20230327-respect-user-flags.patch new file mode 100644 index 000000000000..bbad20ee1113 --- /dev/null +++ b/sci-libs/gklib/files/gklib-5.1.1_p20230327-respect-user-flags.patch @@ -0,0 +1,51 @@ +diff --git a/GKlibSystem.cmake b/GKlibSystem.cmake +index 31a1cf1..15ccfe7 100644 +--- a/GKlibSystem.cmake ++++ b/GKlibSystem.cmake +@@ -31,21 +31,6 @@ endif(CYGWIN) + if(CMAKE_COMPILER_IS_GNUCC) + # GCC opts. + set(GKlib_COPTIONS "${GKlib_COPTIONS} -std=c99 -fno-strict-aliasing") +-if(VALGRIND) +- set(GKlib_COPTIONS "${GK_COPTIONS} -march=x86-64 -mtune=generic") +-else() +-# -march=native is not a valid flag on PPC: +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "power|ppc|powerpc|ppc64|powerpc64" OR (APPLE AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64")) +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -mtune=native") +-else() +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -march=native") +-endif() +-endif(VALGRIND) +- if(NOT MINGW) +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -fPIC") +- endif(NOT MINGW) +-# GCC warnings. +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GKlib_COPTIONS "${GKlib_COPTIONS} -xc99") +@@ -71,24 +56,6 @@ if(NO_X86) + set(GKlib_COPTIONS "${GKlib_COPTIONS} -DNO_X86=${NO_X86}") + endif(NO_X86) + +-# Add various definitions. +-if(GDB) +- set(GKlib_COPTS "${GKlib_COPTS} -g") +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror") +-else() +- set(GKlib_COPTS "-O3") +-endif(GDB) +- +- +-if(DEBUG) +- set(GKlib_COPTS "-g") +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -DDEBUG") +-endif(DEBUG) +- +-if(GPROF) +- set(GKlib_COPTS "-pg") +-endif(GPROF) +- + if(NOT ASSERT) + set(GKlib_COPTIONS "${GKlib_COPTIONS} -DNDEBUG") + endif(NOT ASSERT) diff --git a/sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild b/sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild new file mode 100644 index 000000000000..f310b03c4511 --- /dev/null +++ b/sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +COMMIT="8bd6bad750b2b0d90800c632cf18e8ee93ad72d7" + +DESCRIPTION="Helper routines and frameworks used by KarypisLab software" +HOMEPAGE="https://github.com/KarypisLab/GKlib" +SRC_URI="https://github.com/KarypisLab/GKlib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +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" + +PATCHES=( + "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-respect-user-flags.patch" +) + +src_configure() { + local mycmakeargs=() + if ! use amd64 && ! use x86; then # bug 905642 + mycmakeargs+=( + -DNO_X86=ON + ) + fi + cmake_src_configure +} diff --git a/sci-libs/rosetta-db/metadata.xml b/sci-libs/gklib/metadata.xml index e490bcb8aa87..1c83399ced50 100644 --- a/sci-libs/rosetta-db/metadata.xml +++ b/sci-libs/gklib/metadata.xml @@ -2,7 +2,10 @@ <!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> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> </maintainer> + <upstream> + <remote-id type="github">KarypisLab/GKlib</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/gloo/Manifest b/sci-libs/gloo/Manifest index 97dd806d820c..07e768131dfa 100644 --- a/sci-libs/gloo/Manifest +++ b/sci-libs/gloo/Manifest @@ -1 +1 @@ -DIST gloo-2022.05.18.tar.gz 251778 BLAKE2B 90bd97cff437d030b87c333ebb6679f199491b97826f09278b7a6740d781ca750af4e8eda18f29a4311462473146aae1fd0686443a0eb2c73e8ba34e6837b0af SHA512 356b4bd4480fda0f9db039babd223c17ed24c35945877bdb6c5b28eb45ee8ce08def73d308bc906c478c4c9d485bb0f74080d90c7a4fafe84818df0a97a7f6e2 +DIST gloo-2023.01.17.tar.gz 252199 BLAKE2B 66b5fc6786a4c07aa639a30036a21d86f43c1577a950934f558051f241d198dd3e0d7bd9da39835c5e3d617a754164cb77ae30b9bc284b0119436bf0a26f5000 SHA512 d39102ed00c813576066b755730e367337f2558a4223fe8dd127bd48882db6a97c67522782f7e7b00c36198ccd2096e61e84382358783d2edb1ca4ee55123344 diff --git a/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch b/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch index 09f7588a1858..1344d42a0c3f 100644 --- a/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch +++ b/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch @@ -12,7 +12,7 @@ set(GLOO_VERSION_PATCH 0) --- a/gloo/CMakeLists.txt 2022-06-09 08:41:09.883773600 +0200 +++ b/gloo/CMakeLists.txt 2022-06-09 08:42:39.045637103 +0200 -@@ -176,7 +176,7 @@ +@@ -181,7 +181,7 @@ # want to statically link with Gloo and not install any artifacts. if(GLOO_INSTALL) install(TARGETS gloo EXPORT GlooTargets @@ -23,7 +23,7 @@ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) --- a/gloo/test/CMakeLists.txt 2022-06-10 22:17:03.682856314 +0200 +++ b/gloo/test/CMakeLists.txt 2022-06-10 22:17:49.671242697 +0200 -@@ -68,3 +68,4 @@ +@@ -73,3 +73,4 @@ gloo_hip_add_executable(gloo_test_hip ${GLOO_TEST_HIP_SRCS}) target_link_libraries(gloo_test_hip gloo_hip gtest OpenSSL::SSL OpenSSL::Crypto) endif() @@ -62,16 +62,6 @@ endif() endif() ---- a/gloo/transport/tcp/device.cc 2022-08-02 11:25:32.404166606 +0200 -+++ b/gloo/transport/tcp/device.cc 2022-08-02 11:25:48.706963018 +0200 -@@ -12,6 +12,7 @@ - #include <netdb.h> - #include <netinet/in.h> - #include <string.h> -+#include <array> - - #include "gloo/common/linux.h" - #include "gloo/common/logging.h" --- a/gloo/transport/tcp/tls/pair.cc 2022-10-04 21:14:04.099150060 +0200 +++ b/gloo/transport/tcp/tls/pair.cc 2022-10-04 21:14:22.330886610 +0200 @@ -17,6 +17,7 @@ diff --git a/sci-libs/gloo/files/gloo-2023.01.17-cuda.patch b/sci-libs/gloo/files/gloo-2023.01.17-cuda.patch new file mode 100644 index 000000000000..1a894d3e4251 --- /dev/null +++ b/sci-libs/gloo/files/gloo-2023.01.17-cuda.patch @@ -0,0 +1,13 @@ +diff --git a/gloo/CMakeLists.txt b/gloo/CMakeLists.txt +index 9ee82df..3b3affb 100644 +--- a/gloo/CMakeLists.txt ++++ b/gloo/CMakeLists.txt +@@ -184,7 +184,7 @@ if(GLOO_INSTALL) + DESTINATION ${CMAKE_INSTALL_LIBDIR}) + if(USE_CUDA) + install(TARGETS gloo_cuda EXPORT GlooTargets +- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + if(USE_ROCM) + install(TARGETS gloo_hip EXPORT GlooTargets diff --git a/sci-libs/gloo/gloo-2022.05.18-r1.ebuild b/sci-libs/gloo/gloo-2023.01.17-r1.ebuild index f22733551794..a2c76198f848 100644 --- a/sci-libs/gloo/gloo-2022.05.18-r1.ebuild +++ b/sci-libs/gloo/gloo-2023.01.17-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake cuda -CommitId=5b143513263133af2b95547e97c07cebeb72bf72 +CommitId=10909297fedab0a680799211a299203e53515032 DESCRIPTION="library of floating-point neural network inference operators" HOMEPAGE="https://github.com/facebookincubator/gloo/" @@ -14,9 +14,10 @@ SRC_URI="https://github.com/facebookincubator/${PN}/archive/${CommitId}.tar.gz LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="libuv mpi redis ssl test" +IUSE="cuda libuv mpi redis ssl test" RDEPEND=" + cuda? ( <dev-util/nvidia-cuda-toolkit-12:= ) libuv? ( dev-libs/libuv ) mpi? ( virtual/mpi ) redis? ( @@ -34,16 +35,30 @@ RESTRICT="test" # For some test the network is needed S="${WORKDIR}"/${PN}-${CommitId} PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-2022.05.18-gentoo.patch + "${FILESDIR}"/${P}-cuda.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 + 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 453b2878b484..e83d24904d0f 100644 --- a/sci-libs/gloo/metadata.xml +++ b/sci-libs/gloo/metadata.xml @@ -9,6 +9,7 @@ <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 6438ce1deb83..e46c8c64722c 100644 --- a/sci-libs/gmsh/Manifest +++ b/sci-libs/gmsh/Manifest @@ -1,2 +1,3 @@ -DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e SHA512 863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653 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 diff --git a/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch b/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch new file mode 100644 index 000000000000..c7413e6e4bf4 --- /dev/null +++ b/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 63fb873..2563850 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -860,11 +860,12 @@ endif() + + if(HAVE_MESH OR HAVE_SOLVER) + if(ENABLE_METIS) +- find_library(METIS_LIB metis PATH_SUFFIXES lib) ++ find_library(METIS_LIB metis PATH_SUFFIXES lib64 REQUIRED) ++ find_library(GKLIB_LIB GKlib PATH_SUFFIXES lib64 REQUIRED) + find_path(METIS_INC "metis.h" PATH_SUFFIXES include) + if(ENABLE_SYSTEM_CONTRIB AND METIS_LIB AND METIS_INC) + message(STATUS "Using system version of METIS") +- list(APPEND EXTERNAL_LIBRARIES ${METIS_LIB}) ++ list(APPEND EXTERNAL_LIBRARIES ${METIS_LIB} ${GKLIB_LIB}) + list(APPEND EXTERNAL_INCLUDES ${METIS_INC}) + set_config_option(HAVE_METIS "Metis") + elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/metis) diff --git a/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch b/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch new file mode 100644 index 000000000000..2b1b491ef81f --- /dev/null +++ b/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch @@ -0,0 +1,29 @@ +# Based on upstream patches: +# https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c90 +# https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c80 +# +# Upstream issue: https://gitlab.onelab.info/gmsh/gmsh/-/issues/2416 +# Gentoo issue: https://bugs.gentoo.org/905445 + +diff -Naur a/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h b/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h +--- a/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h ++++ b/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h +@@ -8,6 +8,7 @@ + #pragma once + + #include <float.h> ++#include <cstdint> + #include "qmtMeshUtils.h" + + class SurfaceProjector; +diff -Naur a/src/mesh/meshGFacePack.cpp b/src/mesh/meshGFacePack.cpp +--- a/src/mesh/meshGFacePack.cpp ++++ b/src/mesh/meshGFacePack.cpp +@@ -8,6 +8,7 @@ + #include <queue> + #include <map> + #include <vector> ++#include <cstdint> + #include "gmsh.h" + #include "SPoint2.h" + #include "SVector3.h" diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild index 11602e174471..3e5432701c03 100644 --- a/sci-libs/gmsh/gmsh-4.10.3.ebuild +++ b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild @@ -10,6 +10,7 @@ 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-2+ free-noncomm @@ -50,6 +51,7 @@ RDEPEND=" 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:* ) @@ -58,7 +60,8 @@ RDEPEND=" petsc? ( sci-mathematics/petsc[mpi=] ) slepc? ( sci-mathematics/slepc[mpi=] ) voro? ( sci-libs/voro++ ) - zlib? ( sys-libs/zlib )" + zlib? ( sys-libs/zlib ) + " DEPEND="${RDEPEND} ${PYTHON_DEPS} @@ -66,8 +69,6 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig:0 ) " -S="${WORKDIR}"/${P}-source - PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch ) pkg_setup() { diff --git a/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild new file mode 100644 index 000000000000..ee7ff513289d --- /dev/null +++ b/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +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}"/${P}_gcc13_fix_cstdint_include.patch + "${FILESDIR}"/${P}-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-r2.ebuild b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild index c41d139ad3b4..9f6486414bc6 100644 --- a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild +++ b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild @@ -10,6 +10,7 @@ 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" @@ -26,11 +27,13 @@ RDEPEND=" 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] )" + mpi? ( virtual/mpi[cxx] ) + " DEPEND="${RDEPEND} ${PYTHON_DEPS} @@ -38,8 +41,6 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig:0 ) " -S="${WORKDIR}"/${P}-source - PATCHES=( "${FILESDIR}"/${P}-opencascade.patch ) pkg_setup() { diff --git a/sci-libs/gsl/gsl-2.7.1-r2.ebuild b/sci-libs/gsl/gsl-2.7.1-r2.ebuild index e65ec799e0d2..62c11d0d8578 100644 --- a/sci-libs/gsl/gsl-2.7.1-r2.ebuild +++ b/sci-libs/gsl/gsl-2.7.1-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz LICENSE="GPL-3+" # Usually 0/${PV} but check SLOT="0/27" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +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:= )" diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild index 9db12aa99d2e..f020d7942f5c 100644 --- a/sci-libs/gts/gts-20121130.ebuild +++ b/sci-libs/gts/gts-20121130.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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/hdf/hdf-4.2.15-r1.ebuild b/sci-libs/hdf/hdf-4.2.15-r1.ebuild index 047eb57a8562..c809222acf56 100644 --- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild +++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15 LICENSE="NCSA-HDF" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux" IUSE="examples fortran szip static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( szip )" diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest index 172f6d6a8029..f146f8d34066 100644 --- a/sci-libs/hdf5/Manifest +++ b/sci-libs/hdf5/Manifest @@ -1,2 +1,4 @@ DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4 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 diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch b/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch new file mode 100644 index 000000000000..f341fa99ddac --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch @@ -0,0 +1,30 @@ +https://github.com/HDFGroup/hdf5/commit/9dd36f016a4316b94f5df15856d228de01d304c6 + +From 9dd36f016a4316b94f5df15856d228de01d304c6 Mon Sep 17 00:00:00 2001 +From: Ryan Schmidt <ryandesign@macports.org> +Date: Thu, 17 Nov 2022 16:28:44 -0600 +Subject: [PATCH] Simplify & fix check for szlib encoder (#2263) + +Return the result rather than setting the exit code. "return" is a +language keyword whereas "exit" is a function for which the <stdlib.h> +header has to be included which it wasn't in this test, therefore the +test would previously fail to identify that the encoder was enabled if +"-Werror=implicit-function-declaration" was used, which it is by default +with clang from Xcode 12 and later. + +Fixes #2262 +--- a/configure.ac ++++ b/configure.ac +@@ -1737,10 +1737,7 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then + #include "szlib.h" + ],[[ + /* SZ_encoder_enabled returns 1 if encoder is present */ +- if(SZ_encoder_enabled() == 1) +- exit(0); +- else +- exit(1); ++ return SZ_encoder_enabled() != 1; + ]])] + , [hdf5_cv_szlib_can_encode=yes], [hdf5_cv_szlib_can_encode=no],)] + ) + diff --git a/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild index 3a7ce1c9a8d0..c723c3ad3dde 100644 --- a/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild +++ b/sci-libs/hdf5/hdf5-1.12.2-r6.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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib" REQUIRED_USE=" !unsupported? ( @@ -38,6 +38,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch "${FILESDIR}"/${PN}-1.12.2-no-messing-ldpath.patch "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch + "${FILESDIR}"/${PN}-1.12.2-configure-clang16.patch ) pkg_setup() { diff --git a/sci-libs/hdf5/hdf5-1.14.1.ebuild b/sci-libs/hdf5/hdf5-1.14.1.ebuild new file mode 100644 index 000000000000..07005227c9e1 --- /dev/null +++ b/sci-libs/hdf5/hdf5-1.14.1.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2023 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}"/${PN}-1.8.9-static_libgfortran.patch + "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.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 + + # Respect Gentoo examples directory + sed \ + -e "s:hdf5_examples:doc/${PF}/examples:g" \ + -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die + 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 + + econf \ + --disable-static \ + --enable-deprecated-symbols \ + --enable-build-mode=$(usex debug debug production) \ + --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" \ + $(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) +} + +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.2.ebuild b/sci-libs/hdf5/hdf5-1.14.2.ebuild new file mode 100644 index 000000000000..3edb5153287a --- /dev/null +++ b/sci-libs/hdf5/hdf5-1.14.2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2023 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}"/${PN}-1.8.9-static_libgfortran.patch + "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.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 + + # Respect Gentoo examples directory + sed \ + -e "s:hdf5_examples:doc/${PF}/examples:g" \ + -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die + 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 + + econf \ + --disable-static \ + --enable-deprecated-symbols \ + --enable-build-mode=$(usex debug debug production) \ + --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" \ + $(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) +} + +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 99698f6b1488..6dcf1b1dd925 100644 --- a/sci-libs/hipBLAS/Manifest +++ b/sci-libs/hipBLAS/Manifest @@ -1 +1,2 @@ DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707 +DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8 diff --git a/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild b/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild new file mode 100644 index 000000000000..b61f8865b925 --- /dev/null +++ b/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 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}" +BDEPEND="" + +S="${WORKDIR}/hipBLAS-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + -DBUILD_CLIENTS_TESTS=OFF # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here + -DBUILD_CLIENTS_BENCHMARKS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch new file mode 100644 index 000000000000..2f63a0f8e6f7 --- /dev/null +++ b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch @@ -0,0 +1,90 @@ +reverts the following commit. + +Upstream: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/67 + +commit 41491c9a70f808ed74690a538ca7bd25ff1ae1ca +Author: Steve Leung <Steve.Leung@amd.com> +Date: Wed Sep 1 11:25:26 2021 -0600 + + cmake: use HIP CONFIG on Windows + +diff --git a/clients/rider/CMakeLists.txt b/clients/rider/CMakeLists.txt +index de1fc7d..8b88103 100644 +--- b/clients/rider/CMakeLists.txt ++++ a/clients/rider/CMakeLists.txt +@@ -43,11 +43,7 @@ + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + target_link_libraries( hipfft-rider PRIVATE hip::host ) + else() + +diff --git a/clients/samples/CMakeLists.txt b/clients/samples/CMakeLists.txt +index 5a882c6..37162ab 100644 +--- b/clients/samples/CMakeLists.txt ++++ a/clients/samples/CMakeLists.txt +@@ -48,11 +48,7 @@ + target_link_libraries( ${sample} PRIVATE hip::hipfft ) + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) + target_link_libraries( ${sample} PRIVATE hip::host ) + else() +diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt +index 2b965e2..0442a79 100644 +--- b/clients/tests/CMakeLists.txt ++++ a/clients/tests/CMakeLists.txt +@@ -81,11 +81,7 @@ + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + target_link_libraries( hipfft-test PRIVATE hip::host ) + else() + target_compile_definitions( hipfft-test PRIVATE __HIP_PLATFORM_NVIDIA__) +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index 022e3e4..0c8b3f8 100644 +--- b/cmake/dependencies.cmake ++++ a/cmake/dependencies.cmake +@@ -27,22 +27,14 @@ + # HIP + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" ) + endif() + else() + if( BUILD_WITH_LIB STREQUAL "CUDA" ) + set(HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include") + else() +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + endif() + endif() + diff --git a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild b/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild index 216d15841546..79eb8052324f 100644 --- a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild +++ b/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ SLOT="0/$(ver_cut 1-2)" RESTRICT="test" -RDEPEND="dev-util/hip:${SLOT} +RDEPEND="dev-util/hip sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="" @@ -26,25 +26,19 @@ BDEPEND="" S="${WORKDIR}/hipFFT-rocm-${PV}" PATCHES=( + "${FILESDIR}/${PN}-5.1.3_hip-config.patch" "${FILESDIR}/${PN}-5.1.3-gentoo-install-locations.patch" "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch" "${FILESDIR}/${PN}-4.3.0-add-complex-header.patch" ) -src_prepare() { - sed -e "/CMAKE_INSTALL_LIBDIR/d" -i CMakeLists.txt || die - cmake_src_prepare -} - src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DCMAKE_INSTALL_INCLUDEDIR="include/hipfft" - -DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake" - -DHIP_ROOT_DIR="${EPREFIX}/usr" + -DROCM_SYMLINK_LIBS=OFF -DBUILD_CLIENTS_TESTS=OFF -DBUILD_CLIENTS_RIDER=OFF ) - cmake_src_configure + CXX=hipcc cmake_src_configure } diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest new file mode 100644 index 000000000000..bdb2c56b0452 --- /dev/null +++ b/sci-libs/hipRAND/Manifest @@ -0,0 +1 @@ +DIST hipFFT-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2 diff --git a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0.ebuild new file mode 100644 index 000000000000..d0bd5ace71e4 --- /dev/null +++ b/sci-libs/hipRAND/hipRAND-5.6.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 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 -> 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/rocRAND:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="" + +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/metadata.xml b/sci-libs/hipRAND/metadata.xml new file mode 100644 index 000000000000..27c8916b67d4 --- /dev/null +++ b/sci-libs/hipRAND/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="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> + <upstream> + <remote-id type="github">ROCmSoftwarePlatform/hipRAND</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest index 5634c4532cc9..38e157095820 100644 --- a/sci-libs/htslib/Manifest +++ b/sci-libs/htslib/Manifest @@ -1 +1 @@ -DIST htslib-1.16.tar.bz2 4466776 BLAKE2B 4957dd7a25b3d0b939d4e924db018916a5f8a13a81e55ebd1ce1acc548986e581d017ead9a08245a4af1ebdcd15536f082425ebe05f16eb4faad27d332e48482 SHA512 9fa0b1f9bba50f889d4542825c9543fb3b34c13b4cc0e18940a66fafd130749574bfa2c2663d8b39f0b4ed2b298bf130367cda1b17b2929093d64b386730cbc5 +DIST htslib-1.17.tar.bz2 4619884 BLAKE2B c45591b3f1da4f6ddfdf5e1a20864583d57de2a460d42049715335fce7dafe1f5cd14403e6033fee4f9d0bfc75f8777b5835d2d01bf2cadff0155d9fc92b97d9 SHA512 624ab449d57713dab2d34399926c065f8cff8a45e6fbe68e0bb518c601421f587b613caeb095f8639b1d67cdb4a65d658c85f942173bcaa48da026fe15def5d3 diff --git a/sci-libs/htslib/htslib-1.16.ebuild b/sci-libs/htslib/htslib-1.17.ebuild index c4bd910685de..6f690363326b 100644 --- a/sci-libs/htslib/htslib-1.16.ebuild +++ b/sci-libs/htslib/htslib-1.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/huggingface_hub/Manifest b/sci-libs/huggingface_hub/Manifest new file mode 100644 index 000000000000..f19f1cb56a32 --- /dev/null +++ b/sci-libs/huggingface_hub/Manifest @@ -0,0 +1,4 @@ +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 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 new file mode 100644 index 000000000000..7c519b339f79 --- /dev/null +++ b/sci-libs/huggingface_hub/huggingface_hub-0.13.4-r1.ebuild @@ -0,0 +1,31 @@ +# 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 new file mode 100644 index 000000000000..7c519b339f79 --- /dev/null +++ b/sci-libs/huggingface_hub/huggingface_hub-0.14.1.ebuild @@ -0,0 +1,31 @@ +# 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.15.1.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.15.1.ebuild new file mode 100644 index 000000000000..7c519b339f79 --- /dev/null +++ b/sci-libs/huggingface_hub/huggingface_hub-0.15.1.ebuild @@ -0,0 +1,31 @@ +# 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.16.4.ebuild new file mode 100644 index 000000000000..7c519b339f79 --- /dev/null +++ b/sci-libs/huggingface_hub/huggingface_hub-0.16.4.ebuild @@ -0,0 +1,31 @@ +# 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/metadata.xml b/sci-libs/huggingface_hub/metadata.xml new file mode 100644 index 000000000000..ed22415e0eec --- /dev/null +++ b/sci-libs/huggingface_hub/metadata.xml @@ -0,0 +1,12 @@ +<?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">huggingface/huggingface_hub</remote-id> + <remote-id type="pypi">huggingface_hub</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/hypre/hypre-2.24.0.ebuild b/sci-libs/hypre/hypre-2.24.0.ebuild index 8c9d5ab220f1..c05c8fa99193 100644 --- a/sci-libs/hypre/hypre-2.24.0.ebuild +++ b/sci-libs/hypre/hypre-2.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="debug examples fortran int64 openmp mpi" BDEPEND="virtual/pkgconfig" diff --git a/sci-libs/ignition-common/files/ffmpeg6.patch b/sci-libs/ignition-common/files/ffmpeg6.patch new file mode 100644 index 000000000000..b4d61f181291 --- /dev/null +++ b/sci-libs/ignition-common/files/ffmpeg6.patch @@ -0,0 +1,40 @@ +Index: gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc +=================================================================== +--- gz-common-ignition-common3_3.14.2.orig/av/src/AudioDecoder.cc ++++ gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc +@@ -348,6 +348,7 @@ bool AudioDecoder::SetFile(const std::st + return false; + } + ++#if LIBAVCODEC_VERSION_MAJOR < 60 + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100) + if (this->data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) + this->data->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED; +@@ -355,6 +356,7 @@ bool AudioDecoder::SetFile(const std::st + if (this->data->codec->capabilities & CODEC_CAP_TRUNCATED) + this->data->codecCtx->flags |= CODEC_FLAG_TRUNCATED; + #endif ++#endif + + // Open codec + if (avcodec_open2(this->data->codecCtx, this->data->codec, nullptr) < 0) +Index: gz-common-ignition-common3_3.14.2/av/src/Video.cc +=================================================================== +--- gz-common-ignition-common3_3.14.2.orig/av/src/Video.cc ++++ gz-common-ignition-common3_3.14.2/av/src/Video.cc +@@ -179,6 +179,7 @@ bool Video::Load(const std::string &_fil + this->dataPtr->videoStream]->codec; + #endif + ++#if LIBAVCODEC_VERSION_MAJOR < 60 + // Inform the codec that we can handle truncated bitstreams -- i.e., + // bitstreams where frame boundaries can fall in the middle of packets + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100) +@@ -188,6 +189,7 @@ bool Video::Load(const std::string &_fil + if (codec->capabilities & CODEC_CAP_TRUNCATED) + this->dataPtr->codecCtx->flags |= CODEC_FLAG_TRUNCATED; + #endif ++#endif + + // Open codec + if (avcodec_open2(this->dataPtr->codecCtx, codec, nullptr) < 0) 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 b1328bf00fb2..122afd62eb9c 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,10 @@ BDEPEND=" dev-util/ignition-cmake:2" S="${WORKDIR}/gz-common-ignition-common${IGN_MAJOR}_${PV}" -PATCHES=( "${FILESDIR}/ffmpeg5.patch" ) +PATCHES=( + "${FILESDIR}/ffmpeg5.patch" + "${FILESDIR}/ffmpeg6.patch" +) src_configure() { local mycmakeargs=( diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest index 061a8ccee89a..20d1cc64788d 100644 --- a/sci-libs/ignition-math/Manifest +++ b/sci-libs/ignition-math/Manifest @@ -1 +1 @@ -DIST ignition-math6_6.10.0.tar.gz 598228 BLAKE2B 1f67891f755715e14742e0f06cfec4b7ee7da1df192165961b41a4d0744ddbb8066fa8739cd85ccac3134511d0f80ec2c2289a30dbf1960e39229312a9085725 SHA512 3f2bbfd6b2237bda50feb55d52daaf8ecee0ece68a99bb3c264fcd9c67cb01537b168b1a1d4608e4af2ed582393751b215e4fd1fed4c93db5cd39199200b87b1 +DIST ignition-math6_6.14.0.tar.gz 628564 BLAKE2B 6206f1f35472bf51a8a3bdb8fae26d9879044ea856abd8bcce2cfb5bf16d2638816b3fff7e451c165fec8b2ba82db083d78306d5441c4db3def14b08ddad7556 SHA512 ad95160cc1cd137779b9da589c47994d04f829af10865071e9ead4d55c4399d04d5398287d3b294e3f67230205656e1fe243129673e1f8e73f62f3933c314802 diff --git a/sci-libs/ignition-math/files/includes.patch b/sci-libs/ignition-math/files/includes.patch deleted file mode 100644 index 5d7750bcec9a..000000000000 --- a/sci-libs/ignition-math/files/includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: ignition-math6_6.4.0/src/RollingMean.cc -=================================================================== ---- ignition-math6_6.4.0.orig/src/RollingMean.cc -+++ ignition-math6_6.4.0/src/RollingMean.cc -@@ -17,6 +17,7 @@ - - #include <numeric> - #include <deque> -+#include <limits> - #include "ignition/math/RollingMean.hh" - - using namespace ignition::math; diff --git a/sci-libs/ignition-math/ignition-math-6.10.0.ebuild b/sci-libs/ignition-math/ignition-math-6.14.0.ebuild index 68e7ffa2c329..d26ecb92b0fc 100644 --- a/sci-libs/ignition-math/ignition-math-6.10.0.ebuild +++ b/sci-libs/ignition-math/ignition-math-6.14.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,4 +23,3 @@ BDEPEND=" dev-util/ignition-cmake:2" S="${WORKDIR}/${PN}6_${PV}" -PATCHES=( "${FILESDIR}/includes.patch" ) diff --git a/sci-libs/iml/iml-1.0.5.ebuild b/sci-libs/iml/iml-1.0.5.ebuild index 29bfa917676e..e87b1e50a002 100644 --- a/sci-libs/iml/iml-1.0.5.ebuild +++ b/sci-libs/iml/iml-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" DEPEND="virtual/cblas" diff --git a/sci-libs/inchi/inchi-1.04-r1.ebuild b/sci-libs/inchi/inchi-1.04-r1.ebuild index 5a19ed1854a7..47eba9dec162 100644 --- a/sci-libs/inchi/inchi-1.04-r1.ebuild +++ b/sci-libs/inchi/inchi-1.04-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}"/INCHI-1-API LICENSE="IUPAC-InChi" SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" BDEPEND="app-arch/unzip" diff --git a/sci-libs/inchi/inchi-1.06-r1.ebuild b/sci-libs/inchi/inchi-1.06-r1.ebuild index 3e06c9fc8bfc..8b8040286b7a 100644 --- a/sci-libs/inchi/inchi-1.06-r1.ebuild +++ b/sci-libs/inchi/inchi-1.06-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/INCHI-1-SRC" LICENSE="IUPAC-InChi" SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" BDEPEND="app-arch/unzip" diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index 41262b171751..ce0c8c2c2354 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1 +1 @@ -DIST indilib-1.9.8.tar.gz 2633085 BLAKE2B 045d38fc565546528fddfa83cfd78650d30e41769923d7ec8f462a617fdd298228913a075a9f0b511867aa9174143da010bbb4c015d8b5a1d51f2b80090e50d5 SHA512 b9551547de277fe311e4779e65915351850a25fb049ddcfad634ef385014b521416f2366cf50cda80cdfa4a754c18face21cfd59f7f45c4018ca733ddf981ab2 +DIST indilib-2.0.3.tar.gz 2713456 BLAKE2B b74f3319c744227b533616ec369cb6f379253928c1d73ef8336d122152fcb866403efe8c7aa6f65c99ba10149b0b2b43c4a86a87f82353ce045602b261b75618 SHA512 323e694f90d71cf26da8b05d60d136f2422dc12e31ec88012250faf795e67bb95da2fd729cacc5bfa7cb74cc8fe1e12a0512cb57e694c87f362a4828228db0b7 diff --git a/sci-libs/indilib/indilib-1.9.8.ebuild b/sci-libs/indilib/indilib-2.0.3.ebuild index 5aa183ebc532..9f35ab2702f0 100644 --- a/sci-libs/indilib/indilib-1.9.8.ebuild +++ b/sci-libs/indilib/indilib-2.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="amd64 ppc ppc64 ~riscv x86" +KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" @@ -43,6 +43,9 @@ DEPEND="${RDEPEND} src_configure() { local mycmakeargs=( -DINDI_BUILD_QT5_CLIENT=OFF + -DINDI_BUILD_SHARED=ON + -DINDI_BUILD_STATIC=OFF + -DINDI_BUILD_XISF=OFF # not packaged -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d $(cmake_use_find_package ogg OggTheora) $(cmake_use_find_package rtlsdr RTLSDR) @@ -55,18 +58,6 @@ src_configure() { } src_test() { - local myctestargs=() - - if use ppc || use ppc64 || use sparc ; then - # Broken on big endian for quite some time. - # Reported upstream: file needs to be replaced w/ a normal library - # for b64. - # bug #763126 - myctestargs+=( - -E "(test_base64)" - ) - fi - # Unit tests BUILD_DIR="${BUILD_DIR}"/test cmake_src_test diff --git a/sci-libs/itpp/itpp-4.3.1-r2.ebuild b/sci-libs/itpp/itpp-4.3.1-r2.ebuild index 57bfa66a3b1f..6bb89700ac6d 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" RDEPEND="sci-libs/fftw:3.0= diff --git a/sci-libs/jiwer/Manifest b/sci-libs/jiwer/Manifest new file mode 100644 index 000000000000..00c0c8913dfa --- /dev/null +++ b/sci-libs/jiwer/Manifest @@ -0,0 +1 @@ +DIST jiwer-3.0.1.gh.tar.gz 24015 BLAKE2B 634b1c7613a29ee492a108c09d3adeeec6ce975e3663505db5f02258f37f53933f0c6e12c9f0ab48274798bdc130e8ceb5d201b3090af3b9fcbba3ccf66a261e SHA512 9a455ec8687947531dc18f89aa898d7906e1e94f803fa05f3e4689b074e05a13b3b653cbc621c723c8d9776c0c787d7a4978eca3efb90c4abded7e7f6b13ca9e diff --git a/sci-libs/jiwer/files/jiwer-3.0.1-tests.patch b/sci-libs/jiwer/files/jiwer-3.0.1-tests.patch new file mode 100644 index 000000000000..cfd9530985a3 --- /dev/null +++ b/sci-libs/jiwer/files/jiwer-3.0.1-tests.patch @@ -0,0 +1,31 @@ +--- a/tests/test_speed.py 2023-05-14 18:22:53.206560417 +0200 ++++ b/tests/test_speed.py 2023-05-14 18:24:35.611996479 +0200 +@@ -1,4 +1,6 @@ + from jiwer import wer ++import pytest ++ + + + def perform_computation(num_sentences): +@@ -8,17 +10,21 @@ + wer(truth, hypo) + + ++@pytest.mark.skip(reason="require pytest-benchmark") + def test_speed_n1(benchmark): + benchmark(perform_computation, 1) + + ++@pytest.mark.skip(reason="require pytest-benchmark") + def test_speed_n10(benchmark): + benchmark(perform_computation, 10) + + ++@pytest.mark.skip(reason="require pytest-benchmark") + def test_speed_n100(benchmark): + benchmark(perform_computation, 100) + + ++@pytest.mark.skip(reason="require pytest-benchmark") + def test_speed_n1000(benchmark): + benchmark(perform_computation, 1000) diff --git a/sci-libs/jiwer/jiwer-3.0.1-r1.ebuild b/sci-libs/jiwer/jiwer-3.0.1-r1.ebuild new file mode 100644 index 000000000000..c3b6585071d4 --- /dev/null +++ b/sci-libs/jiwer/jiwer-3.0.1-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 + +DESCRIPTION="Evaluate an automatic speech recognition system" +HOMEPAGE=" + https://github.com/jitsi/jiwer + https://pypi.org/project/jiwer/ +" +SRC_URI="https://github.com/jitsi/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +RDEPEND=" + dev-python/rapidfuzz[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}"/${P}-tests.patch ) diff --git a/sci-libs/jiwer/metadata.xml b/sci-libs/jiwer/metadata.xml new file mode 100644 index 000000000000..183cb49efbc4 --- /dev/null +++ b/sci-libs/jiwer/metadata.xml @@ -0,0 +1,12 @@ +<?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="pypi">jiwer</remote-id> + <remote-id type="github">jitsi/jiwer</remote-id> + </upstream> +</pkgmetadata> 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 index 30ffe06d218a..16e901fdb80a 100644 --- a/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild +++ b/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild @@ -13,6 +13,6 @@ SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 ~x86" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" 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 index e7f5fcabbd96..120e85768ffc 100644 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://keras.io/" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 ~x86" RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] diff --git a/sci-libs/keras/Manifest b/sci-libs/keras/Manifest index 495367cc87b0..d5c590e7cbd2 100644 --- a/sci-libs/keras/Manifest +++ b/sci-libs/keras/Manifest @@ -2,3 +2,4 @@ DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLA 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.12.0-0001-bazel-Use-system-protobuf.patch b/sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch new file mode 100644 index 000000000000..6870d534cf75 --- /dev/null +++ b/sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch @@ -0,0 +1,330 @@ +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.12.0.ebuild b/sci-libs/keras/keras-2.12.0.ebuild new file mode 100644 index 000000000000..429513ced949 --- /dev/null +++ b/sci-libs/keras/keras-2.12.0.ebuild @@ -0,0 +1,85 @@ +# 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/kineto/files/kineto-0.4.0-gcc13.patch b/sci-libs/kineto/files/kineto-0.4.0-gcc13.patch new file mode 100644 index 000000000000..296104aef7fc --- /dev/null +++ b/sci-libs/kineto/files/kineto-0.4.0-gcc13.patch @@ -0,0 +1,10 @@ +--- a/src/SampleListener.h 2023-04-12 12:07:58.869097270 +0200 ++++ b/src/SampleListener.h 2023-04-12 12:09:42.930392363 +0200 +@@ -7,6 +7,7 @@ + #include <iostream> + #include <string> + #include <vector> ++#include <cstdint> + + namespace KINETO_NAMESPACE { + diff --git a/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch b/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch index 0c4cb7261273..3e1a5cbc9b8d 100644 --- a/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch +++ b/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch @@ -1,5 +1,5 @@ ---- a/libkineto/CMakeLists.txt 2022-05-24 11:16:18.537610972 +0200 -+++ b/libkineto/CMakeLists.txt 2022-05-24 11:19:15.011073535 +0200 +--- 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 @@ -57,8 +57,8 @@ install(TARGETS kineto EXPORT kinetoLibraryConfig ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ---- a/libkineto/libkineto_defs.bzl 2022-05-24 22:06:17.324000422 +0200 -+++ b/libkineto/libkineto_defs.bzl 2022-05-24 22:07:08.326419268 +0200 +--- 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", diff --git a/sci-libs/kineto/kineto-0.4.0.ebuild b/sci-libs/kineto/kineto-0.4.0.ebuild index 60ac97c00887..2282c4406855 100644 --- a/sci-libs/kineto/kineto-0.4.0.ebuild +++ b/sci-libs/kineto/kineto-0.4.0.ebuild @@ -26,8 +26,12 @@ BDEPEND=" " RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2021.11.17-gentoo.patch + "${FILESDIR}"/${P}-gcc13.patch +) + src_prepare() { - eapply "${FILESDIR}"/${PN}-2021.11.17-gentoo.patch cd libkineto cmake_src_prepare } diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest index 5b61d529d95c..0e6da4f95109 100644 --- a/sci-libs/klu/Manifest +++ b/sci-libs/klu/Manifest @@ -1 +1,2 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706 diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild index 31bfebab0772..d4400810d297 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-2022 Gentoo Authors +# Copyright 1999-2023 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/klu/klu-2.0.3.ebuild b/sci-libs/klu/klu-2.0.3.ebuild new file mode 100644 index 000000000000..3aca27a557ad --- /dev/null +++ b/sci-libs/klu/klu-2.0.3.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Sparse LU factorization for circuit simulation" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0/2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=">=sci-libs/suitesparseconfig-7.0.0 + >=sci-libs/amd-3.0.3 + >=sci-libs/btf-2.0.3 + >=sci-libs/colamd-3.0.3 + >=sci-libs/cholmod-4.0.3" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( virtual/latex-base )" + +S="${WORKDIR}/${Sparse_P}/${PN^^}" + +multilib_src_configure() { + local mycmakeargs=( + -DNSTATIC=ON + -DDEMO=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + # Run demo files + ./klu_simple || die "failed testing" + ./kludemo < "${S}"/Matrix/1c.mtx || die "failed testing" + ./kludemo < "${S}"/Matrix/arrowc.mtx || die "failed testing" + ./kludemo < "${S}"/Matrix/arrow.mtx || die "failed testing" + ./kludemo < "${S}"/Matrix/impcol_a.mtx || die "failed testing" + ./kludemo < "${S}"/Matrix/w156.mtx || die "failed testing" + ./kludemo < "${S}"/Matrix/ctina.mtx || die "failed testing" + ./kluldemo < "${S}"/Matrix/1c.mtx || die "failed testing" + ./kluldemo < "${S}"/Matrix/arrowc.mtx || die "failed testing" + ./kluldemo < "${S}"/Matrix/arrow.mtx || die "failed testing" + ./kluldemo < "${S}"/Matrix/impcol_a.mtx || die "failed testing" + ./kluldemo < "${S}"/Matrix/w156.mtx || die "failed testing" + ./kluldemo < "${S}"/Matrix/ctina.mtx || die "failed testing" +} + +multilib_src_install() { + if use doc; then + pushd "${S}/Doc" + emake clean + rm -rf *.pdf + emake + popd + DOCS="${S}/Doc/*.pdf" + fi + cmake_src_install +} diff --git a/sci-libs/klu/metadata.xml b/sci-libs/klu/metadata.xml index 33b1892a51f1..16b070542e68 100644 --- a/sci-libs/klu/metadata.xml +++ b/sci-libs/klu/metadata.xml @@ -10,4 +10,7 @@ circuit simulation. It is also part of the University of Florida sparse matrix suite. </longdescription> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/lapack/lapack-3.10.1.ebuild b/sci-libs/lapack/lapack-3.10.1.ebuild index d1d07a3c3dd8..16b9d22e73df 100644 --- a/sci-libs/lapack/lapack-3.10.1.ebuild +++ b/sci-libs/lapack/lapack-3.10.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake fortran-2 DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations" HOMEPAGE="https://www.netlib.org/lapack/" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P 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 ~ppc-macos ~x64-macos" # TODO: static-libs 64bit-index IUSE="lapacke deprecated doc eselect-ldso test" RESTRICT="!test? ( test )" diff --git a/sci-libs/lapack/lapack-3.11.ebuild b/sci-libs/lapack/lapack-3.11.ebuild index 737bed9e5fdb..7e2764d7f209 100644 --- a/sci-libs/lapack/lapack-3.11.ebuild +++ b/sci-libs/lapack/lapack-3.11.ebuild @@ -4,8 +4,8 @@ EAPI=8 # Some additional tests are run if Python is found -PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake python-any-r1 +PYTHON_COMPAT=( python3_{10..11} ) +inherit cmake fortran-2 python-any-r1 DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations" HOMEPAGE="https://www.netlib.org/lapack/" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P 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 )" @@ -34,6 +34,7 @@ BDEPEND=" " pkg_setup() { + fortran-2_pkg_setup use test && python-any-r1_pkg_setup } diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest index f8c366affa12..e7ab12f27e1c 100644 --- a/sci-libs/ldl/Manifest +++ b/sci-libs/ldl/Manifest @@ -1 +1,2 @@ +DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e DIST ldl-2.2.6.tar.bz2 342923 BLAKE2B 7acf1a82824de013fe9a7742fb2d5c44c86de96e95d1d7408106d4af420dc3655ab7533eb80592b52523245c7545bc246bf129712547ff6eba856a807c78b6ad SHA512 266c9e62c474a6a9b2d7f74aa580e313fbe4b322197236ba6fbbab6d1756348cf146c1d807ea6d8d0e5941cedc48298e8437aaf386dd6c433dcaf41a9d0b7371 diff --git a/sci-libs/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild index 5999808e46ff..6cb4ceafd590 100644 --- a/sci-libs/ldl/ldl-2.2.6.ebuild +++ b/sci-libs/ldl/ldl-2.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc static-libs" BDEPEND="virtual/pkgconfig diff --git a/sci-libs/ldl/ldl-3.0.3.ebuild b/sci-libs/ldl/ldl-3.0.3.ebuild new file mode 100644 index 000000000000..28b394008845 --- /dev/null +++ b/sci-libs/ldl/ldl-3.0.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +Sparse_PV="7.0.0" +Sparse_P="SuiteSparse-${Sparse_PV}" +DESCRIPTION="Simple but educational LDL^T matrix factorization algorithm" +HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" +SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0/3" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV} + >=sci-libs/amd-3.0.3" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( virtual/latex-base )" + +S="${WORKDIR}/${Sparse_P}/${PN^^}" + +multilib_src_configure() { + local mycmakeargs=( + -DNSTATIC=ON + -DDEMO=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + # Some programs assume that they can access the Matrix folder in ${S} + ln -s "${S}/Matrix" || die "cannot link to the Matrix folder" + # Run demo files + local demofiles=( + ldlsimple + ldllsimple + ldlmain + ldllmain + ldlamd + ldllamd + ) + for i in ${demofiles[@]}; do + ./"${i}" > "${i}.out" || die "failed to run test ${i}" + diff "${S}/Demo/${i}.out" "${i}.out" || die "failed testing ${i}" + done +} + +multilib_src_install() { + if use doc; then + pushd "${S}/Doc" + rm -rf *.pdf + emake + popd + DOCS="${S}/Doc/*.pdf" + fi + cmake_src_install +} diff --git a/sci-libs/ldl/metadata.xml b/sci-libs/ldl/metadata.xml index e6396c0864b0..c450822b982c 100644 --- a/sci-libs/ldl/metadata.xml +++ b/sci-libs/ldl/metadata.xml @@ -16,4 +16,7 @@ consists of a total of only 49 lines of code. The package is written in C, and includes a MATLAB interface. </longdescription> + <upstream> + <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/lemon/lemon-1.3.1-r1.ebuild b/sci-libs/lemon/lemon-1.3.1-r2.ebuild index 902d5e27521e..e0891825d062 100644 --- a/sci-libs/lemon/lemon-1.3.1-r1.ebuild +++ b/sci-libs/lemon/lemon-1.3.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,7 +28,7 @@ DEPEND="${RDEPEND}" BDEPEND="doc? ( app-doc/doxygen app-text/ghostscript-gpl - dev-libs/mathjax + <dev-libs/mathjax-3 )" PATCHES=( diff --git a/sci-libs/libaec/libaec-1.0.6.ebuild b/sci-libs/libaec/libaec-1.0.6.ebuild index d413db1b4c29..0304f18d144d 100644 --- a/sci-libs/libaec/libaec-1.0.6.ebuild +++ b/sci-libs/libaec/libaec-1.0.6.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" SLOT="0/2" -KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="+szip" RDEPEND="szip? ( !sci-libs/szip )" diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest index d60254a6ef32..f1e19d383a74 100644 --- a/sci-libs/libbraiding/Manifest +++ b/sci-libs/libbraiding/Manifest @@ -1,2 +1 @@ -DIST libbraiding-1.1.tar.gz 377161 BLAKE2B 48a80823f15920fce17c7d67cdc0a7e851855a4d6dfa5e9e461c8ce408c9c73d8aeeeacd27ac1c5f33c4436e8174c6ae9be275a71187d3a9887d37cf3bc8b8db SHA512 3032a290d0c7c0c13519136e111500a9e22f36ae7f9cc36df5a22670f18ebbce03a01e72c81e556ef4f6eea1ccf10e90ba6a9343be4a229e420e2f7da6289115 DIST libbraiding-1.2.tar.gz 380852 BLAKE2B 8d88861879e7566fa88f3a269c20efa4f37a692da6fd32736b695628a414cec0e03a01cb7a0cfcf20bd233fd21c15b070d9df3e0ee4951c9511949962b012f61 SHA512 f3dcfa77d5313ecfa91c0b9a61988eb2048dd27ed77f46a5c34fc57adb9eee53b250946a7158918b3198559bd016c723dba98465036d01c482b5c6000ab59d8a diff --git a/sci-libs/libbraiding/libbraiding-1.1.ebuild b/sci-libs/libbraiding/libbraiding-1.1.ebuild deleted file mode 100644 index 5df2a0d47167..000000000000 --- a/sci-libs/libbraiding/libbraiding-1.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Expose the functionality of cbraid as a shared library" -HOMEPAGE="https://github.com/miguelmarco/libbraiding" - -SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.gz" - -# A few source headers still say GPLv2, but I believe that to be an -# oversight: https://github.com/jeanluct/cbraid/issues/4 -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64" -IUSE="static-libs" - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/libbraiding/libbraiding-1.2.ebuild b/sci-libs/libbraiding/libbraiding-1.2.ebuild index 36538840bff4..ac7b0cab046f 100644 --- a/sci-libs/libbraiding/libbraiding-1.2.ebuild +++ b/sci-libs/libbraiding/libbraiding-1.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.g # oversight: https://github.com/jeanluct/cbraid/issues/4 LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" src_install() { diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest index b84236e6edb8..16596109fa60 100644 --- a/sci-libs/libcifpp/Manifest +++ b/sci-libs/libcifpp/Manifest @@ -1,8 +1,4 @@ -DIST components-2.0.4.cif.gz 81445161 BLAKE2B 80d538109a716af0273d109151a434e68cc1be16dc3a21653a4b78dd9719c93f59259146a6e980fbab4484a6b41d32064a276566411e23bf56b0a42b6dacf408 SHA512 a154305f1d3ba2df24ca3859b0a7d1a81cae79c927a708a531bee1689b0b65752fd68032d12335afa4b6b2f5969e003365abd49bed729d740c0f3055328f08ad -DIST components-3.0.0.cif.gz 82114845 BLAKE2B 9934110efb9848e8b71e75173bf9c8cfeec1daeef45648296dbcc41641308b9c4e6ff2ef16d86b44ebdb0a200fe6f2a8f13dadac1cce4d8ea2a2961927bf4c94 SHA512 625478378d236ec46130d83545c1b0fbdfb5e9cada3834ac14d4b052e9e460e73523e4438b3356a78d64f569e12cd4c13439b5de56462a10d5c11d0de09d52b8 -DIST libcifpp-2.0.4.tar.gz 960402 BLAKE2B 4650478b187ece13d38c0a5f13c94e6098e3271088a7dd19d72645d52d085304a463387f9d1b1edacbcd03a051b32fbf2384e3287d5ff4835091f2eae2fe2805 SHA512 f4a6b126b376b245d399508e9bc360bcf0451e6bd3cad3127567dd95afb1965c8eb764bb9b0bf26be26695fc5636e509709bdbc9f8c9a00939d049c1634dcae0 -DIST libcifpp-3.0.0.tar.gz 950896 BLAKE2B 8aad3ebea5cc82c2615b6dc6a8a50654375dd9f58ff6c27306bf1415d9658f29f196c5ea9bf0e4f913400b3eba48f19bc11dd97c84b59cf2df94f87afb06d5b7 SHA512 507abed829e4d5194eb22fe73d261295a9814577d7bc53743731e7a1ccb032f763f4bfa0e1b23665d52fabbfa38baca20e6373c14db029705427b6fa773df976 -DIST libcifpp-5.0.5-components.cif.gz 88604747 BLAKE2B 05b914efaff697fa756a2ccd79836aa0a27a5fcf966eece7a3b5476fb37c876449047de00fea852a224b266188d00d1e5e5fa0148f24a1ae0fea01c0ad3415aa SHA512 a39144034836fbac5ff793c6a87d0e1519e63f16175357a3863d56edf2bf015af4dd6859b9afc8c8d9621c7dab752df5a8557149db2cb37983ab095a831fc2fd -DIST libcifpp-5.0.5.tar.gz 1869555 BLAKE2B 515e27aeebb5e12130649a52ac92d69bbec910ec67fef992100a785f21ee6acaf34e951b2cc430acbfc52336a88337f0b54d6ecd030d784fc3ebe2065321f813 SHA512 730d212a681009b932f61e99dcde77d89ff5ec618781abf897f5e91c103d334ca560329975d32715a2d84f02026b073f46cba3f10a1b382ff82422d49b8dd50e -DIST libcifpp-5.0.8-components.cif.gz 89984770 BLAKE2B d42147d4da56589ac30de9fc3cdacd43e036f548eebf80a19d878c4bf0be535578eec6b78625e1ba60db53090ce5e4b9a3e59b06705f208b660fb2e37e79d1c2 SHA512 5f9705714816656aa910b571d77966926d66b2724136119857138975f8be5bb2e889e0c9b28ef1340a72857afb5831dba529b96e8dfc796f739e24b0dcab0424 -DIST libcifpp-5.0.8.tar.gz 1873629 BLAKE2B 07257a898b1253995880fea9b416b3a7681122b544f8397d353fda4069c33f4a6c2d5cf2210983acf68dc56cb27a20d780461c7c2485a445855e7b45cccd326d SHA512 4ea67fa4a93218fe96289de95591faa9411508e41e308f4ff470033fb0deb4029a86eafb7ba9295807fe3b350e8cc9f2267f7735ee8b1dbb431ee0275db2b8cc +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 diff --git a/sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild b/sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild deleted file mode 100644 index 70d19261a89d..000000000000 --- a/sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Code to work with mmCIF and PDB files" -HOMEPAGE="https://github.com/PDB-REDO/libcifpp" -SRC_URI=" - https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz -" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/boost:=" -RDEPEND="${DEPEND}" - -src_configure() { - cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCIFPP_BUILD_TESTS="$(usex test)" - ) - cmake_src_configure -} diff --git a/sci-libs/libcifpp/libcifpp-3.0.0.ebuild b/sci-libs/libcifpp/libcifpp-3.0.0.ebuild deleted file mode 100644 index 32bb52f339bb..000000000000 --- a/sci-libs/libcifpp/libcifpp-3.0.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -DESCRIPTION="Code to work with mmCIF and PDB files" -HOMEPAGE="https://github.com/PDB-REDO/libcifpp" -SRC_URI=" - https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz -" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/boost:=" -RDEPEND="${DEPEND}" - -src_configure() { - cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCIFPP_BUILD_TESTS="$(usex test)" - ) - cmake_src_configure -} diff --git a/sci-libs/libcifpp/libcifpp-5.0.8.ebuild b/sci-libs/libcifpp/libcifpp-5.1.1.ebuild index 856007e7bd81..8d30793f975e 100644 --- a/sci-libs/libcifpp/libcifpp-5.0.8.ebuild +++ b/sci-libs/libcifpp/libcifpp-5.1.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/PDB-REDO/libcifpp" # ftp://ftp.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.gz + https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz " LICENSE="BSD-2" @@ -19,7 +19,10 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -DEPEND="dev-libs/boost:=" +DEPEND=" + dev-cpp/eigen:3 + dev-libs/boost:= +" RDEPEND="${DEPEND}" src_configure() { diff --git a/sci-libs/libcifpp/libcifpp-5.0.5.ebuild b/sci-libs/libcifpp/libcifpp-5.1.2.ebuild index 6bd4f31ea362..47d08fc49c68 100644 --- a/sci-libs/libcifpp/libcifpp-5.0.5.ebuild +++ b/sci-libs/libcifpp/libcifpp-5.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,9 +6,11 @@ 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 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.gz + https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz " LICENSE="BSD-2" @@ -17,7 +19,10 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -DEPEND="dev-libs/boost:=" +DEPEND=" + dev-cpp/eigen:3 + dev-libs/boost:= +" RDEPEND="${DEPEND}" src_configure() { diff --git a/sci-libs/libdap/libdap-3.20.9.ebuild b/sci-libs/libdap/libdap-3.20.9.ebuild index 65d7d122dae2..94352c46f41f 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://www.opendap.org/pub/source/${P}.tar.gz" LICENSE="|| ( LGPL-2.1 URI )" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/sci-libs/libecpint/libecpint-1.0.6.ebuild b/sci-libs/libecpint/libecpint-1.0.6.ebuild deleted file mode 100644 index 47004ee7019c..000000000000 --- a/sci-libs/libecpint/libecpint-1.0.6.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials" -HOMEPAGE="https://github.com/robashaw/libecpint" -SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/pugixml" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest )" - -src_configure() { - local mycmakeargs=( - -DLIBECPINT_BUILD_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild index 4c91ee750c6b..81527b98f2ce 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/5" -KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="doc jpeg +tiff zlib" DEPEND=">=sci-libs/proj-6.0.0:= diff --git a/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild b/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild index 9ef03933234f..ab2faf8e14d9 100644 --- a/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild +++ b/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Library of routines for IF97 water & steam properties" -HOMEPAGE="https://github.com/mgorny/libh2o/" -SRC_URI="https://github.com/mgorny/libh2o/releases/download/${P}/${P}.tar.bz2" +HOMEPAGE="https://github.com/projg2/libh2o/" +SRC_URI="https://github.com/projg2/libh2o/releases/download/${P}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" diff --git a/sci-libs/libh2o/metadata.xml b/sci-libs/libh2o/metadata.xml index 22d7b18c840a..abd4fda5e9a6 100644 --- a/sci-libs/libh2o/metadata.xml +++ b/sci-libs/libh2o/metadata.xml @@ -10,7 +10,7 @@ <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> - <bugs-to>https://github.com/mgorny/libh2o/issues/</bugs-to> - <remote-id type="github">mgorny/libh2o</remote-id> + <bugs-to>https://github.com/projg2/libh2o/issues/</bugs-to> + <remote-id type="github">projg2/libh2o</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild b/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild index 7691373a4d3a..6c2e7a0a6672 100644 --- a/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild +++ b/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="C++ bindings for libh2o" -HOMEPAGE="https://github.com/mgorny/libh2oxx/" -SRC_URI="https://github.com/mgorny/libh2oxx/releases/download/${P}/${P}.tar.bz2" +HOMEPAGE="https://github.com/projg2/libh2oxx/" +SRC_URI="https://github.com/projg2/libh2oxx/releases/download/${P}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" diff --git a/sci-libs/libh2oxx/metadata.xml b/sci-libs/libh2oxx/metadata.xml index 3eccf240bc49..4ee008f4b14f 100644 --- a/sci-libs/libh2oxx/metadata.xml +++ b/sci-libs/libh2oxx/metadata.xml @@ -10,7 +10,7 @@ <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> - <bugs-to>https://github.com/mgorny/libh2oxx/issues/</bugs-to> - <remote-id type="github">mgorny/libh2oxx</remote-id> + <bugs-to>https://github.com/projg2/libh2oxx/issues/</bugs-to> + <remote-id type="github">projg2/libh2oxx</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/libigl/libigl-2.4.0.ebuild b/sci-libs/libigl/libigl-2.4.0.ebuild index 7b92517b049e..aeec8b4e51ff 100644 --- a/sci-libs/libigl/libigl-2.4.0.ebuild +++ b/sci-libs/libigl/libigl-2.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libigl/libigl/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+ MPL-2.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="static-libs" DEPEND="dev-cpp/eigen:3" diff --git a/sci-libs/libint/libint-1.1.6.ebuild b/sci-libs/libint/libint-1.1.6.ebuild index 28a3672a85ef..46357d7c10ee 100644 --- a/sci-libs/libint/libint-1.1.6.ebuild +++ b/sci-libs/libint/libint-1.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-release-${MY_PV}" LICENSE="GPL-2" SLOT="1" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" PATCHES=( "${FILESDIR}"/${P}-as-needed.patch ) diff --git a/sci-libs/libint/libint-2.6.0-r5.ebuild b/sci-libs/libint/libint-2.6.0-r5.ebuild index 4acff533f4c6..dcbf1716c8ed 100644 --- a/sci-libs/libint/libint-2.6.0-r5.ebuild +++ b/sci-libs/libint/libint-2.6.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="2" LICENSE="GPL-2" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs doc" DEPEND=" diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild index 703af61efa65..4c8ecb9f5f81 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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" LICENSE="LGPL-2" SLOT="0/0.16" -KEYWORDS="amd64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~hppa ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples" BDEPEND="doc? ( app-doc/doxygen )" diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index fa43c41f3e1f..e8eb145752ec 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1,6 +1,4 @@ -DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614 -DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9 -DIST libqalculate-4.1.1.tar.gz 2172017 BLAKE2B e9dcc22ad2d102572610ddc103afc5a279cf4f63681750c6165dac40225c7e29ebb4ccdc4f54cb97031ca8684ef17e08e99478c6b200870c7858e832a7588f18 SHA512 7a0f2fac6c96247b40565bdd015f8b52dc250fa74a8d8ed4a52a6f2134fb2b628e469c0253723f22b433a8f575590a28be8c0d4aa6cfb473b58f1b2c63707956 -DIST libqalculate-4.2.0.tar.gz 2215812 BLAKE2B 393bab0d9cf5d4a3158d93bf676805d829a2103ec1dc733e3d98fd7a54ab0c42d3797dadb1cde72b1df2e13cfb691430982f5fbd886ac9f0a906b3884f912202 SHA512 105f567a3b24a1c396df0eb85f299d18228f489e4d989f0fa09cf97321494030e9a85d9cd9fe4b5dd8cc233b4329025788275ba168546929e912598dee8ef6b8 -DIST libqalculate-4.3.0.tar.gz 2230559 BLAKE2B 724dde0bc16e5eaed63420c6dd68ac7c94477c44c007c92bb3b4560d8a2d2062ade4be6d2c8005ff64bf8ffe4c42d95d6990f7900df7a1c1a36cd4cd717bd04d SHA512 234c111435d9461ab65d274030f9a5f6ee401cd81df62b9c2273e921edb8db3bde4254060285dbfaa7b9701a257a5801c8ab8f26b0c2aeeafd2a36042bdeeb84 DIST libqalculate-4.5.0.tar.gz 2603599 BLAKE2B 142790cf89e97c601b08d553b1f9cd6c1bf184a43c2614a07fa91560a875ea3e3124cf29d7652640b1f2fb4fada1519d48e4cb0ebcfb844c26369d3031aee230 SHA512 a123eaa725c6c6badce0eceecd6ef7e37ca281e7de18085d6a28aa6043bb3f1069f9ebba82b29989c9958455aa093ee183fd8013a86b39bd34e56454bdb35770 +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 diff --git a/sci-libs/libqalculate/libqalculate-3.21.0.ebuild b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild deleted file mode 100644 index ce8152e82e7b..000000000000 --- a/sci-libs/libqalculate/libqalculate-3.21.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Bump with sci-calculators/qalculate-gtk! - -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" -SLOT="0/22" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="curl icu gnuplot readline" - -DEPEND=" - dev-libs/gmp:0= - dev-libs/libxml2:2 - dev-libs/mpfr:0= - virtual/libiconv - curl? ( net-misc/curl ) - icu? ( dev-libs/icu:= ) - readline? ( sys-libs/readline:0= )" -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 \ - --disable-static \ - $(use_with curl libcurl) \ - $(use_with gnuplot gnuplot-call) \ - $(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-3.22.0.ebuild b/sci-libs/libqalculate/libqalculate-3.22.0.ebuild deleted file mode 100644 index 545711dca10d..000000000000 --- a/sci-libs/libqalculate/libqalculate-3.22.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Bump with sci-calculators/qalculate-gtk! - -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 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="curl icu gnuplot readline test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/gmp:0= - dev-libs/libxml2:2 - dev-libs/mpfr:0= - virtual/libiconv - curl? ( net-misc/curl ) - icu? ( dev-libs/icu:= ) - readline? ( sys-libs/readline:0= )" -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_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-4.3.0.ebuild b/sci-libs/libqalculate/libqalculate-4.6.1.ebuild index 609c263e1d5c..f367366c2910 100644 --- a/sci-libs/libqalculate/libqalculate-4.3.0.ebuild +++ b/sci-libs/libqalculate/libqalculate-4.6.1.ebuild @@ -15,7 +15,7 @@ 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 readline test" +IUSE="curl icu gnuplot +hardened readline test" RESTRICT="!test? ( test )" DEPEND="dev-libs/gmp:= @@ -61,6 +61,7 @@ src_configure() { $(use_enable test unittests) \ $(use_with curl libcurl) \ $(use_with gnuplot gnuplot-call) \ + $(use_enable !hardened insecure) \ $(use_with icu) \ $(use_with readline) } diff --git a/sci-libs/libqalculate/libqalculate-4.2.0.ebuild b/sci-libs/libqalculate/libqalculate-4.7.0.ebuild index afe9ca2da752..6bdf2d129d50 100644 --- a/sci-libs/libqalculate/libqalculate-4.2.0.ebuild +++ b/sci-libs/libqalculate/libqalculate-4.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ 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 readline test" +IUSE="curl icu gnuplot +hardened readline test" RESTRICT="!test? ( test )" DEPEND="dev-libs/gmp:= @@ -61,6 +61,7 @@ src_configure() { $(use_enable test unittests) \ $(use_with curl libcurl) \ $(use_with gnuplot gnuplot-call) \ + $(use_enable !hardened insecure) \ $(use_with icu) \ $(use_with readline) } diff --git a/sci-libs/libqalculate/libqalculate-4.1.1.ebuild b/sci-libs/libqalculate/libqalculate-4.8.0.ebuild index 793186d66e2e..886c0f5aef07 100644 --- a/sci-libs/libqalculate/libqalculate-4.1.1.ebuild +++ b/sci-libs/libqalculate/libqalculate-4.8.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# Bump with sci-calculators/qalculate-gtk! +# Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt inherit toolchain-funcs @@ -14,8 +14,8 @@ 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="curl icu gnuplot readline test" +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:= @@ -61,6 +61,7 @@ src_configure() { $(use_enable test unittests) \ $(use_with curl libcurl) \ $(use_with gnuplot gnuplot-call) \ + $(use_enable !hardened insecure) \ $(use_with icu) \ $(use_with readline) } diff --git a/sci-libs/libqalculate/metadata.xml b/sci-libs/libqalculate/metadata.xml index 39ddc8a41c49..1fc5756c8fef 100644 --- a/sci-libs/libqalculate/metadata.xml +++ b/sci-libs/libqalculate/metadata.xml @@ -11,7 +11,7 @@ </flag> </use> <upstream> - <remote-id type="sourceforge">qalculate-0.9.7</remote-id> + <remote-id type="sourceforge">qalculate</remote-id> <remote-id type="github">Qalculate/libqalculate</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index d14ff4ef580d..fdfb64071d01 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1 +1,2 @@ -DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de +DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117 +DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b diff --git a/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch new file mode 100644 index 000000000000..9881d0aa6227 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch @@ -0,0 +1,64 @@ +diff --git a/config/sc_include.m4 b/config/sc_include.m4 +index f6f7873..3befe0e 100644 +--- a/config/sc_include.m4 ++++ b/config/sc_include.m4 +@@ -281,8 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES], + [ + SC_REQUIRE_LIB([m], [fabs]) + SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1]) +-SC_CHECK_LIB([lua53 lua5.3 lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable], +- [LUA], [$1]) ++SC_CHECK_LIB([$LUA_IMPL], [lua_createtable], [LUA], [$1]) + SC_CHECK_BLAS_LAPACK([$1]) + SC_BUILTIN_ALL_PREFIX([$1]) + SC_CHECK_PTHREAD([$1]) +diff --git a/configure.ac b/configure.ac +index ce462e0..b291685 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,7 +78,7 @@ echo "o---------------------------------------" + AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/select.h sys/stat.h]) + AC_CHECK_HEADERS([linux/videodev2.h]) + AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h]) +-AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h]) ++AC_CHECK_HEADERS([$LUA_IMPL/lua.h]) + + echo "o---------------------------------------" + echo "| Checking functions" +diff --git a/src/sc_lua.h b/src/sc_lua.h +index 770b52f..a6db175 100644 +--- a/src/sc_lua.h ++++ b/src/sc_lua.h +@@ -30,29 +30,9 @@ + + SC_EXTERN_C_BEGIN; + +-#ifdef SC_HAVE_LUA5_3_LUA_H +-#include <lua5.3/lua.h> +-#include <lua5.3/lualib.h> +-#include <lua5.3/lauxlib.h> +-#else +-#ifdef SC_HAVE_LUA5_2_LUA_H +-#include <lua5.2/lua.h> +-#include <lua5.2/lualib.h> +-#include <lua5.2/lauxlib.h> +-#else +-#ifdef SC_HAVE_LUA5_1_LUA_H +-#include <lua5.1/lua.h> +-#include <lua5.1/lualib.h> +-#include <lua5.1/lauxlib.h> +-#else +-#ifdef SC_HAVE_LUA_H +-#include <lua.h> +-#include <lualib.h> +-#include <lauxlib.h> +-#endif +-#endif +-#endif +-#endif ++#include <@LUA_IMPL@/lua.h> ++#include <@LUA_IMPL@/lualib.h> ++#include <@LUA_IMPL@/lauxlib.h> + + SC_EXTERN_C_END; + diff --git a/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch b/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch new file mode 100644 index 000000000000..54a45294c380 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 914237c..0bf982a 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -45,7 +45,7 @@ src_libsc_la_SOURCES = \ + src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS) + ## This is the official API versioning scheme of libtool. Please see: + ## Read https://www.gnu.org/software/libtool/manual/libtool.html#Versioning +-src_libsc_la_LDFLAGS = -version-info 1:0:0 ++src_libsc_la_LDFLAGS = -release $(VERSION) + LDADD += src/libsc.la + + nodist_include_HEADERS += $(libsc_generated_headers) diff --git a/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch deleted file mode 100644 index b5bdc734ab55..000000000000 --- a/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://github.com/cburstedde/libsc/pull/54 -https://github.com/cburstedde/libsc/pull/55 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ce08e2..a588beb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ - DESCRIPTION "The SC library supports parallel scientific applications." - VERSION ${PROJECT_VERSION}) - -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - include(CTest) - - include(cmake/options.cmake) -@@ -28,8 +30,7 @@ if(MPI_FOUND) - endif() - - # --- libb64 --add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c -- libb64/b64dec.c libb64/b64enc.c) -+add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c) - target_include_directories(libb64 PRIVATE libb64) - - # --- sc -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a588beb..aff0eca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -64,8 +64,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_SOURCE_DIR}/src/sc_builti - - install(TARGETS sc - EXPORT ${PROJECT_NAME}Targets -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) -+ ARCHIVE DESTINATION ${library_reldir} -+ LIBRARY DESTINATION ${library_reldir}) - - add_subdirectory(src) - diff --git a/sci-libs/libsc/files/libsc-2.8.3-set_version.patch b/sci-libs/libsc/files/libsc-2.8.3-set_version.patch deleted file mode 100644 index dcd63994cc67..000000000000 --- a/sci-libs/libsc/files/libsc-2.8.3-set_version.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/cmake/git.cmake b/cmake/git.cmake -index dd6009e..7c5c8f3 100644 ---- a/cmake/git.cmake -+++ b/cmake/git.cmake -@@ -1,36 +1,3 @@ - # --- extract version from Git - --set(PROJECT_VERSION 0.0.0) --find_program(GIT_VERSION_GEN NAMES git-version-gen -- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) --if(GIT_VERSION_GEN) -- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- RESULT_VARIABLE _err -- OUTPUT_VARIABLE git_version -- OUTPUT_STRIP_TRAILING_WHITESPACE) --endif() --if(_err EQUAL 0) -- if(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") -- set(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(_patch "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(_patch "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(PROJECT_VERSION ${_major}.${_minor}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(PROJECT_VERSION ${_major}) -- endif() --endif() -+set(PROJECT_VERSION 2.8.3) - - diff --git a/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch b/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch new file mode 100644 index 000000000000..fb0ce0de7dbb --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch @@ -0,0 +1,57 @@ +diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake +index 5ca9f6d..86b9035 100644 +--- a/cmake/zlib.cmake ++++ b/cmake/zlib.cmake +@@ -1,51 +1,8 @@ + # build Zlib to ensure compatibility. + # We use Zlib 2.x for speed and robustness. + include(GNUInstallDirs) +-include(ExternalProject) + +-set(ZLIB_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include) +- +-if(BUILD_SHARED_LIBS) +- if(WIN32) +- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}zlib1${CMAKE_SHARED_LIBRARY_SUFFIX}) +- else() +- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX}) +- endif() +-else() +- if(MSVC) +- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zlibstatic${CMAKE_STATIC_LIBRARY_SUFFIX}) +- else() +- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}z${CMAKE_STATIC_LIBRARY_SUFFIX}) +- endif() +-endif() +- +-set(zlib_cmake_args +--DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} +--DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} +--DCMAKE_BUILD_TYPE=Release +--DZLIB_COMPAT:BOOL=on +--DZLIB_ENABLE_TESTS:BOOL=off +--DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON +--DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} +-) +- +-ExternalProject_Add(ZLIB +-GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng.git +-GIT_TAG 2.0.6 +-GIT_SHALLOW true +-CMAKE_ARGS ${zlib_cmake_args} +-BUILD_BYPRODUCTS ${ZLIB_LIBRARIES} +-TLS_VERIFY true +-CONFIGURE_HANDLED_BY_BUILD ON +-INACTIVITY_TIMEOUT 60 +-) +- +-# --- imported target +- +-file(MAKE_DIRECTORY ${ZLIB_INCLUDE_DIRS}) +-# avoid race condition ++find_library(ZLIB_LIBRARIES NAMES z-ng) + + add_library(ZLIB::ZLIB INTERFACE IMPORTED GLOBAL) +-add_dependencies(ZLIB::ZLIB ZLIB) # to avoid include directory race condition + target_link_libraries(ZLIB::ZLIB INTERFACE ${ZLIB_LIBRARIES}) +-target_include_directories(ZLIB::ZLIB INTERFACE ${ZLIB_INCLUDE_DIRS}) diff --git a/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch new file mode 100644 index 000000000000..6adfbf31c997 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 87af1b1..82cb357 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,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(cmake/options.cmake) +@@ -57,7 +59,10 @@ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + 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) + add_subdirectory(example) diff --git a/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch b/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch new file mode 100644 index 000000000000..d36f9151901c --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch @@ -0,0 +1,33 @@ +diff --git a/cmake/install.cmake b/cmake/install.cmake +index f093fa9..c281f66 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/CMakeLists.txt b/CMakeLists.txt +index 800937f..9de0cfe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,7 @@ endif(BUILD_TESTING) + + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSC.cmake +-DESTINATION cmake) ++DESTINATION ${library_reldir}/cmake/SC) + + include(cmake/pkgconf.cmake) + include(cmake/install.cmake) diff --git a/sci-libs/libsc/files/libsc-2.8.5-set_version.patch b/sci-libs/libsc/files/libsc-2.8.5-set_version.patch new file mode 100644 index 000000000000..061081a0da9e --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.5-set_version.patch @@ -0,0 +1,49 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index f88e984..f04f52b 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,39 +1,5 @@ +-# --- extract version from Git +- +-set(PROJECT_MAJOR 0) +-set(PROJECT_MINOR 0) +-set(PROJECT_PATCH 0) +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball-version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_PATCH "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_PATCH "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}) +- endif() +-endif() ++set(git_version 2.8.5) ++set(PROJECT_MAJOR 2) ++set(PROJECT_MINOR 8) ++set(PROJECT_PATCH 5) ++set(PROJECT_VERSION 2.8.5) diff --git a/sci-libs/libsc/files/libsc-2.8.5-use_zlib-ng_symbols.patch b/sci-libs/libsc/files/libsc-2.8.5-use_zlib-ng_symbols.patch new file mode 100644 index 000000000000..74827050243b --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.5-use_zlib-ng_symbols.patch @@ -0,0 +1,135 @@ +diff --git a/src/sc_containers.c b/src/sc_containers.c +index 47c86d7..b9a1979 100644 +--- a/src/sc_containers.c ++++ b/src/sc_containers.c +@@ -23,7 +23,7 @@ + + #include <sc_containers.h> + #ifdef SC_HAVE_ZLIB +-#include <zlib.h> ++#include <zlib-ng.h> + #endif + + /* array routines */ +@@ -636,13 +636,13 @@ sc_array_checksum (sc_array_t * array) + unsigned int crc; + size_t bytes; + +- crc = adler32 (0, Z_NULL, 0); ++ crc = zng_adler32 (0, Z_NULL, 0); + if (array->elem_count == 0) { + return crc; + } + + bytes = array->elem_count * array->elem_size; +- crc = adler32 (crc, (const Bytef *) array->array, bytes); ++ crc = zng_adler32 (crc, (const Bytef *) array->array, bytes); + + return crc; + #else +diff --git a/src/sc_io.c b/src/sc_io.c +index a7ed413..bc2df7d 100644 +--- a/src/sc_io.c ++++ b/src/sc_io.c +@@ -25,7 +25,7 @@ + #include <sc_puff.h> + #include <libb64.h> + #ifdef SC_HAVE_ZLIB +-#include <zlib.h> ++#include <zlib-ng.h> + #endif + + #ifndef SC_ENABLE_MPIIO +@@ -706,7 +706,7 @@ sc_io_encode_zlib (sc_array_t *data, sc_array_t *out, + #ifndef SC_HAVE_ZLIB + input_compress_bound = sc_io_noncompress_bound (input_size); + #else +- input_compress_bound = compressBound ((uLong) input_size); ++ input_compress_bound = zng_compressBound ((uLong) input_size); + #endif /* SC_HAVE_ZLIB */ + sc_array_init_count (&compressed, 1, + SC_IO_ENCODE_INFO_LEN + input_compress_bound); +@@ -715,9 +715,9 @@ sc_io_encode_zlib (sc_array_t *data, sc_array_t *out, + sc_io_noncompress (compressed.array + SC_IO_ENCODE_INFO_LEN, + input_compress_bound, data->array, input_size); + #else +- zrv = compress2 ((Bytef *) compressed.array + SC_IO_ENCODE_INFO_LEN, +- &input_compress_bound, (Bytef *) data->array, +- (uLong) input_size, zlib_compression_level); ++ zrv = zng_compress2 ((Bytef *) compressed.array + SC_IO_ENCODE_INFO_LEN, ++ &input_compress_bound, (Bytef *) data->array, ++ (uLong) input_size, zlib_compression_level); + SC_CHECK_ABORT (zrv == Z_OK, "Error on zlib compression"); + #endif /* SC_HAVE_ZLIB */ + +@@ -993,9 +993,9 @@ sc_io_decode (sc_array_t *data, sc_array_t *out, + } + #else + uncompsize = (uLong) encoded_size; +- zrv = uncompress ((Bytef *) out->array, &uncompsize, +- (Bytef *) (compressed.array + SC_IO_ENCODE_INFO_LEN), +- ocnt - SC_IO_ENCODE_INFO_LEN); ++ zrv = zng_uncompress ((Bytef *) out->array, &uncompsize, ++ (Bytef *) (compressed.array + SC_IO_ENCODE_INFO_LEN), ++ ocnt - SC_IO_ENCODE_INFO_LEN); + if (zrv != Z_OK) { + SC_LERROR ("zlib uncompress error\n"); + goto decode_error; +@@ -1120,9 +1120,9 @@ sc_vtk_write_compressed (FILE * vtkfile, char *numeric_data, + base64_init_encodestate (&encode_state); + for (theblock = 0; theblock < numregularblocks; ++theblock) { + comp_length = code_length; +- retval = compress2 ((Bytef *) comp_data, &comp_length, +- (const Bytef *) (numeric_data + theblock * blocksize), +- (uLong) blocksize, Z_BEST_COMPRESSION); ++ retval = zng_compress2 ((Bytef *) comp_data, &comp_length, ++ (const Bytef *) (numeric_data + theblock * blocksize), ++ (uLong) blocksize, Z_BEST_COMPRESSION); + SC_CHECK_ZLIB (retval); + compression_header[3 + theblock] = comp_length; + base_length = base64_encode_block (comp_data, comp_length, +@@ -1135,9 +1135,9 @@ sc_vtk_write_compressed (FILE * vtkfile, char *numeric_data, + /* write odd-sized last block if necessary */ + if (lastsize > 0) { + comp_length = code_length; +- retval = compress2 ((Bytef *) comp_data, &comp_length, +- (const Bytef *) (numeric_data + theblock * blocksize), +- (uLong) lastsize, Z_BEST_COMPRESSION); ++ retval = zng_compress2 ((Bytef *) comp_data, &comp_length, ++ (const Bytef *) (numeric_data + theblock * blocksize), ++ (uLong) lastsize, Z_BEST_COMPRESSION); + SC_CHECK_ZLIB (retval); + compression_header[3 + theblock] = comp_length; + base_length = base64_encode_block (comp_data, comp_length, +diff --git a/test/test_builtin.c b/test/test_builtin.c +index 371aff6..9a99c2d 100644 +--- a/test/test_builtin.c ++++ b/test/test_builtin.c +@@ -27,7 +27,7 @@ + + /* truthfully, the libraries below are not builtin anymore */ + #ifdef SC_HAVE_ZLIB +-#include <zlib.h> ++#include <zlib-ng.h> + #endif + + static int +@@ -87,13 +87,13 @@ test_zlib (void) + char b3[BUFSIZ]; + uLong adler0, adler1, adler2, adler3a, adler3b; + +- adler0 = adler32 (0L, Z_NULL, 0); +- adler1 = adler32 (adler0, (const Bytef *) b1, l1); +- adler2 = adler32 (adler0, (const Bytef *) b2, l2); +- adler3a = adler32_combine (adler1, adler2, l2); ++ adler0 = zng_adler32 (0L, Z_NULL, 0); ++ adler1 = zng_adler32 (adler0, (const Bytef *) b1, l1); ++ adler2 = zng_adler32 (adler0, (const Bytef *) b2, l2); ++ adler3a = zng_adler32_combine (adler1, adler2, l2); + + snprintf (b3, BUFSIZ, "%s%s", b1, b2); +- adler3b = adler32 (adler0, (const Bytef *) b3, l1 + l2); ++ adler3b = zng_adler32 (adler0, (const Bytef *) b3, l1 + l2); + + return adler3a != adler3b; + } diff --git a/sci-libs/libsc/files/libsc-9999-set_version.patch b/sci-libs/libsc/files/libsc-9999-set_version.patch deleted file mode 100644 index 0820b001d8cd..000000000000 --- a/sci-libs/libsc/files/libsc-9999-set_version.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/cmake/git.cmake b/cmake/git.cmake -index dd6009e..7c5c8f3 100644 ---- a/cmake/git.cmake -+++ b/cmake/git.cmake -@@ -1,36 +1,3 @@ - # --- extract version from Git - --set(PROJECT_VERSION 0.0.0) --find_program(GIT_VERSION_GEN NAMES git-version-gen -- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) --if(GIT_VERSION_GEN) -- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- RESULT_VARIABLE _err -- OUTPUT_VARIABLE git_version -- OUTPUT_STRIP_TRAILING_WHITESPACE) --endif() --if(_err EQUAL 0) -- if(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") -- set(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(_patch "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(_patch "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(_minor "${CMAKE_MATCH_2}") -- set(PROJECT_VERSION ${_major}.${_minor}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)") -- set(_major "${CMAKE_MATCH_1}") -- set(PROJECT_VERSION ${_major}) -- endif() --endif() -+set(PROJECT_VERSION 9999.0.0) - - diff --git a/sci-libs/libsc/libsc-2.3.6.ebuild b/sci-libs/libsc/libsc-2.3.6.ebuild new file mode 100644 index 000000000000..fcea0df228e5 --- /dev/null +++ b/sci-libs/libsc/libsc-2.3.6.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools lua-single 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 romio threads" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + romio? ( mpi )" + +RDEPEND=" + ${LUA_DEPS} + sys-apps/util-linux + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio?] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch + "${FILESDIR}"/${PN}-2.3.6-override_soname.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + lua-single_pkg_setup +} + +src_prepare() { + default + + sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die + + # Inject a version number into the build system + echo "${PV}" > "${S}"/.tarball-version || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-static + $(use_enable debug) + $(use_enable mpi) + $(use_enable openmp openmp) + $(use_enable romio mpiio) + $(use_enable threads pthread) + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}" +} + +src_install() { + default + + if use examples; then + docinto examples + dodoc -r example/* + docompress -x /usr/share/doc/${PF}/examples + else + # Remove compiled example binaries in case of -examples: + rm -r "${ED}"/usr/bin || die "rm failed" + fi + + # Remove ac files, bug #619806 + rm -r "${ED}"/usr/share/aclocal || die "rm failed" + + # Fix wrong installation paths: + dodir /usr/share/libsc + mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed" + rmdir "${ED}"/etc/ || die "rmdir failed" + mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" + rmdir "${ED}"/usr/share/ini || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/libsc/libsc-2.8.3.ebuild b/sci-libs/libsc/libsc-2.8.5-r3.ebuild index 9ed5ecf5c58f..037755f94524 100644 --- a/sci-libs/libsc/libsc-2.8.3.ebuild +++ b/sci-libs/libsc/libsc-2.8.5-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake toolchain-funcs @@ -23,7 +23,7 @@ IUSE="debug examples mpi openmp threads" RDEPEND=" sys-apps/util-linux - sys-libs/zlib + sys-libs/zlib-ng virtual/blas virtual/lapack mpi? ( virtual/mpi[romio] )" @@ -33,6 +33,9 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-set_version.patch "${FILESDIR}"/${P}-fix_build_system.patch + "${FILESDIR}"/${P}-do_not_compile_zlib-ng.patch + "${FILESDIR}"/${P}-use_zlib-ng_symbols.patch + "${FILESDIR}"/${P}-fix_cmake_path.patch ) pkg_pretend() { @@ -44,6 +47,10 @@ pkg_setup() { } 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)" @@ -60,6 +67,6 @@ src_install() { "${ED}"/usr/include/getopt_int.h \ "${ED}"/usr/include/sc_builtin || die "rm failed" - mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${P}/ || die "mv 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/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild deleted file mode 100644 index 8d6bdbb8314c..000000000000 --- a/sci-libs/libsc/libsc-9999.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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}"/${PN}-2.8.3-fix_build_system.patch - "${FILESDIR}"/${P}-set_version.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - 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/${P}/ || die "mv failed" - rm -r "${ED}"/usr/share/docs || die "rm failed" -} diff --git a/sci-libs/libsc/metadata.xml b/sci-libs/libsc/metadata.xml index ff1113592d21..9267d0132a0b 100644 --- a/sci-libs/libsc/metadata.xml +++ b/sci-libs/libsc/metadata.xml @@ -13,6 +13,9 @@ The SC Library provides support for parallel scientific applications. This support library is primarily used by <pkg>sci-libs/p4est</pkg>. </longdescription> + <use> + <flag name="romio">Build with support for the ROMIO MPI-IO component</flag> + </use> <upstream> <remote-id type="github">cburstedde/libsc</remote-id> </upstream> diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch new file mode 100644 index 000000000000..6513491270cf --- /dev/null +++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/878395 +--- a/bindings/cxx/enums.py ++++ b/bindings/cxx/enums.py +@@ -73,6 +73,8 @@ + code = open(os.path.join(outdirname, 'cxx/enums.cpp'), 'w') + swig = open(os.path.join(outdirname, 'swig/enums.i'), 'w') + ++print('%include "attribute.i" \n', file=swig) ++ + for file in (header, code): + print("/* Generated file - edit enums.py instead! */", file=file) diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild index 8a010fd267af..96bc45edf8d2 100644 --- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild @@ -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" diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild new file mode 100644 index 000000000000..8da4999fe538 --- /dev/null +++ b/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild @@ -0,0 +1,156 @@ +# 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" + # https://bugs.gentoo.org/878395 + "${FILESDIR}/${PN}-0.5.2-swig-4.1.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/libspatialindex/libspatialindex-1.9.3-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild deleted file mode 100644 index ab14fc05522f..000000000000 --- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -MY_P="spatialindex-src-${PV}" - -DESCRIPTION="C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API" -HOMEPAGE="https://libspatialindex.org/ - https://github.com/libspatialindex/libspatialindex" -SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2" - -LICENSE="MIT" -SLOT="0/6" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="test? ( >=dev-cpp/gtest-1.10.0 )" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-respect-compiler-flags.patch - "${FILESDIR}"/${P}-use-system-gtest.patch -) - -src_configure() { - local mycmakeargs=( - -DSIDX_BUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild index d4063f6d21df..7911fe92a05f 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/libsvm/libsvm-3.25-r1.ebuild b/sci-libs/libsvm/libsvm-3.25-r1.ebuild index 1e0c408b238a..43c67613dec8 100644 --- a/sci-libs/libsvm/libsvm-3.25-r1.ebuild +++ b/sci-libs/libsvm/libsvm-3.25-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz" LICENSE="BSD" SLOT="0/2" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="java openmp python tools" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-libs/libsvm/libsvm-3.30.ebuild b/sci-libs/libsvm/libsvm-3.30.ebuild index 0b94b44306ae..e94e47acd243 100644 --- a/sci-libs/libsvm/libsvm-3.30.ebuild +++ b/sci-libs/libsvm/libsvm-3.30.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV/0}" LICENSE="BSD" SLOT="0/2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="java openmp python tools" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-libs/libxc/libxc-5.1.7.ebuild b/sci-libs/libxc/libxc-5.1.7.ebuild index 9506ce207c0b..883a843a3e26 100644 --- a/sci-libs/libxc/libxc-5.1.7.ebuild +++ b/sci-libs/libxc/libxc-5.1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux" IUSE="fortran test" RESTRICT="!test? ( test )" diff --git a/sci-libs/linbox/linbox-1.6.3-r2.ebuild b/sci-libs/linbox/linbox-1.6.3-r2.ebuild new file mode 100644 index 000000000000..7f9aa82d3f0e --- /dev/null +++ b/sci-libs/linbox/linbox-1.6.3-r2.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +# Use mathjax to render inline latex rather than requiring a working latex +# installation to generate bitmaps. +RDEPEND="${DEPEND} + doc? ( >=dev-libs/mathjax-3 ) +" + +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_prepare() { + default + + if use doc; then + # Avoid the need for a working LaTeX installation. MathJax does + # slow down the browser a bit but it also renders much more + # nicely than the latex-generated bitmaps would. + echo " + USE_MATHJAX = YES + MATHJAX_VERSION = MathJax_3 + MATHJAX_RELPATH = \"${EPREFIX}/usr/share/mathjax\" + MATHJAX_EXTENSIONS = ams + " >> doc/Doxyfile.mod || die + fi +} + +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/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch new file mode 100644 index 000000000000..90112106584d --- /dev/null +++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch @@ -0,0 +1,27 @@ +--- linux-gpib-kernel/compat/include/linux/device.h (revision 2052) ++++ linux-gpib-kernel/compat/include/linux/device.h (revision 2053) +@@ -47,6 +47,13 @@ + * for kernel versions prior to 2.6.26, so the 'drvdata' parameter of + * CLASS_DEVICE_CREATE() is pretty useless. + */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) ++#define CLASS_CREATE(owner, name) \ ++ class_create(owner, name) ++#else ++#define CLASS_CREATE(owner, name) \ ++ class_create(name) ++#endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) + #include <pcmcia/cs_types.h> +--- linux-gpib-kernel/drivers/gpib/sys/osinit.c (revision 2052) ++++ linux-gpib-kernel/drivers/gpib/sys/osinit.c (revision 2053) +@@ -207,7 +207,7 @@ + printk( "gpib: can't get major %d\n", GPIB_CODE ); + return -EIO; + } +- gpib_class = class_create(THIS_MODULE, "gpib_common"); ++ gpib_class = CLASS_CREATE(THIS_MODULE, "gpib_common"); + if(IS_ERR(gpib_class)) + { + printk("gpib: failed to create gpib class\n"); 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 new file mode 100644 index 000000000000..0736e0159f4d --- /dev/null +++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +S="${WORKDIR}/linux-gpib-kernel-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug" + +COMMONDEPEND="" +RDEPEND="${COMMONDEPEND} + acct-group/gpib +" +DEPEND="${COMMONDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # don't fix debian bugs if they break gentoo + "${FILESDIR}/${PN}-4.3.4-depmod.patch" + # https://sourceforge.net/p/linux-gpib/code/2053/ + "${FILESDIR}/${PN}-4.3.4-kernel-6.4.patch" +) + +MODULES_KERNEL_MIN=2.6.8 + +src_unpack() { + default + unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz" +} + +src_configure() { + MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" ) + use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' ) +} + +src_compile() { + # The individual modules don't have separate targets so we can't use + # modlist here. + emake "${MODULES_MAKEARGS[@]}" +} + +src_install() { + emake \ + "${MODULES_MAKEARGS[@]}" \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" \ + docdir="${ED}/usr/share/doc/${PF}/html" \ + install + + modules_post_process + + dodoc ChangeLog AUTHORS README* NEWS + einstalldocs +} diff --git a/sci-libs/lmfit/lmfit-9.0-r1.ebuild b/sci-libs/lmfit/lmfit-9.0-r1.ebuild index f3a316505f1e..1c7f7fcdd3bf 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-2022 Gentoo Authors +# Copyright 1999-2023 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 ~x86" PATCHES=( "${FILESDIR}"/${P}-cmake.patch diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild index ae6db04b9138..adf6e85765c9 100644 --- a/sci-libs/m4ri/m4ri-20200125.ebuild +++ b/sci-libs/m4ri/m4ri-20200125.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,12 @@ EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="Method of four russian for inversion (M4RI)" -HOMEPAGE="https://bitbucket.org/malb/m4ri" +HOMEPAGE="https://github.com/malb/m4ri" SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug openmp cpu_flags_x86_sse2 png static-libs" BDEPEND="virtual/pkgconfig" diff --git a/sci-libs/m4ri/metadata.xml b/sci-libs/m4ri/metadata.xml index 189a75d32cd2..b31730792145 100644 --- a/sci-libs/m4ri/metadata.xml +++ b/sci-libs/m4ri/metadata.xml @@ -28,6 +28,6 @@ </longdescription> <upstream> - <remote-id type="bitbucket">malb/m4ri</remote-id> + <remote-id type="github">malb/m4ri</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/m4rie/m4rie-20200115-r1.ebuild b/sci-libs/m4rie/m4rie-20200115-r1.ebuild index f89f9de0c3d0..60d518b539d8 100644 --- a/sci-libs/m4rie/m4rie-20200115-r1.ebuild +++ b/sci-libs/m4rie/m4rie-20200115-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit autotools DESCRIPTION="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16" -HOMEPAGE="https://bitbucket.org/malb/m4rie/" +HOMEPAGE="https://github.com/malb/m4rie" SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz" LICENSE="GPL-2+" diff --git a/sci-libs/m4rie/metadata.xml b/sci-libs/m4rie/metadata.xml index 0c2d7316d127..37eece3977cd 100644 --- a/sci-libs/m4rie/metadata.xml +++ b/sci-libs/m4rie/metadata.xml @@ -25,6 +25,6 @@ </longdescription> <upstream> - <remote-id type="bitbucket">malb/m4rie</remote-id> + <remote-id type="github">malb/m4rie</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5.ebuild index faecf71d6cfb..3c0019e332ed 100644 --- a/sci-libs/mc/mc-1.5.ebuild +++ b/sci-libs/mc/mc-1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug doc" RDEPEND=" diff --git a/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.14.patch b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.14.patch new file mode 100644 index 000000000000..8a95866b7b0a --- /dev/null +++ b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.14.patch @@ -0,0 +1,117 @@ +From 5c9c1ce9911290283d39e16b1ed4c1d4ea5a5678 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Tue, 24 Aug 2021 08:32:13 +0200 +Subject: [PATCH] build against hdf5-1.12 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + config/cmake_files/medMacros.cmake | 4 ++-- + src/ci/MEDfileCompatibility.c | 2 +- + src/hdfi/_MEDfileCreate.c | 2 +- + src/hdfi/_MEDfileOpen.c | 2 +- + src/hdfi/_MEDmemFileOpen.c | 2 +- + src/hdfi/_MEDparFileCreate.c | 2 +- + src/hdfi/_MEDparFileOpen.c | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake +index 957c59b..d73c7af 100644 +--- a/config/cmake_files/medMacros.cmake ++++ b/config/cmake_files/medMacros.cmake +@@ -447,13 +447,13 @@ MACRO(MED_FIND_HDF5) + ## + ## Requires 1.10.x version + ## +- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) ++ IF(HDF5_VERSION VERSION_LESS 1.10.2) + MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") + ENDIF() + ## + ## + +- ADD_DEFINITIONS(-DH5_USE_16_API) ++ ADD_DEFINITIONS(-DH5_USE_18_API -DH5_USE_16_API) + IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1) + ENDIF() +diff --git a/src/ci/MEDfileCompatibility.c b/src/ci/MEDfileCompatibility.c +index 1d6cabf..43b5b50 100644 +--- a/src/ci/MEDfileCompatibility.c ++++ b/src/ci/MEDfileCompatibility.c +@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename, + #if MED_NUM_MAJEUR != 4 + #error "Don't forget to update the test version here when you change the major version of the library !" + #endif +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 14 + #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" + #error "Cf. _MEDfileCreate ..." + #endif +diff --git a/src/hdfi/_MEDfileCreate.c b/src/hdfi/_MEDfileCreate.c +index 4bc9551..b670c92 100644 +--- a/src/hdfi/_MEDfileCreate.c ++++ b/src/hdfi/_MEDfileCreate.c +@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access + * En HDF5-1.10.0p1 cela n'a aucun effet ! + * Un test autoconf permet de fixer un intervalle de version HDF à MED. + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 14 + #error "Don't forget to change the compatibility version of the library !" + #endif + +diff --git a/src/hdfi/_MEDfileOpen.c b/src/hdfi/_MEDfileOpen.c +index 8ace00e..ebd875b 100644 +--- a/src/hdfi/_MEDfileOpen.c ++++ b/src/hdfi/_MEDfileOpen.c +@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod + + • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 14 + #error "Don't forget to change the compatibility version of the library !" + #endif + /* L'avantage de bloquer le modèle interne HDF5 +diff --git a/src/hdfi/_MEDmemFileOpen.c b/src/hdfi/_MEDmemFileOpen.c +index ae92ba7..4a929ff 100644 +--- a/src/hdfi/_MEDmemFileOpen.c ++++ b/src/hdfi/_MEDmemFileOpen.c +@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile + goto ERROR; + } + +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 14 + #error "Don't forget to change the compatibility version of the library !" + #endif + if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { +diff --git a/src/hdfi/_MEDparFileCreate.c b/src/hdfi/_MEDparFileCreate.c +index f0b77be..b7d1b78 100644 +--- a/src/hdfi/_MEDparFileCreate.c ++++ b/src/hdfi/_MEDparFileCreate.c +@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc + * En HDF5-1.10.0p1 cela n'a aucun effet ! + * Un test autoconf permet de fixer un intervalle de version HDF à MED. + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 14 + #error "Don't forget to change the compatibility version of the library !" + #endif + +diff --git a/src/hdfi/_MEDparFileOpen.c b/src/hdfi/_MEDparFileOpen.c +index 0a9700d..4933692 100644 +--- a/src/hdfi/_MEDparFileOpen.c ++++ b/src/hdfi/_MEDparFileOpen.c +@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access + MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG); + goto ERROR; + } +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 14 + #error "Don't forget to change the compatibility version of the library !" + #endif + if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { +-- +2.32.0 + diff --git a/sci-libs/med/med-4.1.1.ebuild b/sci-libs/med/med-4.1.1-r1.ebuild index b2c10421a196..9b2d35e26ef3 100644 --- a/sci-libs/med/med-4.1.1.ebuild +++ b/sci-libs/med/med-4.1.1-r1.ebuild @@ -24,7 +24,7 @@ RESTRICT="!test? ( test ) python? ( test )" RDEPEND=" !sci-libs/libmed dev-lang/tk:0= - >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?] + <sci-libs/hdf5-1.14.0:=[fortran?,mpi(+)?] mpi? ( virtual/mpi[fortran?] ) python? ( ${PYTHON_DEPS} ) " diff --git a/sci-libs/med/med-4.1.1-r3.ebuild b/sci-libs/med/med-4.1.1-r3.ebuild new file mode 100644 index 000000000000..c5d4f76fecce --- /dev/null +++ b/sci-libs/med/med-4.1.1-r3.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake flag-o-matic fortran-2 python-single-r1 + +DESCRIPTION="A library to store and exchange meshed data or computation results" +HOMEPAGE="https://www.salome-platform.org/user-section/about/med" +SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" +LICENSE="LGPL-3" +S="${WORKDIR}/${P}_SRC" + +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc fortran mpi python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test ) python? ( test )" + +RDEPEND=" + !sci-libs/libmed + dev-lang/tk:0= + >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?] + mpi? ( virtual/mpi[fortran?] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" + +PATCHES=( + "${FILESDIR}/${PN}-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" + "${FILESDIR}/${PN}-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch" + "${FILESDIR}/${PN}-4.1.0-0003-build-against-hdf5-1.14.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + if use python; then + # fixes for correct libdir name + local pysite=$(python_get_sitedir) + pysite="${pysite##/usr/}" + sed \ + -e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \ + -i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed" + fi + sed -e 's/med-fichier/med/' -i CMakeLists.txt || die "fix paths failed" + sed -e 's|doc/med-${MED_STR_VERSION}|doc/'${PF}'/html|' \ + -i CMakeLists.txt || die "fix doc path failed" + + # bug #862900, already reported upstream. CHECK on updates! + filter-lto + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, + # so let's avoid rebuilding it because it will be different + -DMEDFILE_BUILD_DOC=OFF + -DMEDFILE_BUILD_FORTRAN=$(usex fortran) + -DMEDFILE_BUILD_PYTHON=$(usex python) + -DMEDFILE_BUILD_SHARED_LIBS=ON + -DMEDFILE_BUILD_STATIC_LIBS=OFF + -DMEDFILE_BUILD_TESTS=$(usex test) + -DMEDFILE_INSTALL_DOC=$(usex doc) + -DMEDFILE_USE_MPI=$(usex mpi) + -DMEDFILE_USE_UNICODE=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # we don't need old 2.3.6 include files + rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir" + + # the optimization done in CMakeLists.txt has been disabled so + # we need to do it manually + use python && python_optimize + + # Prevent test executables being installed + if use test; then + rm -r "${ED}"/usr/bin/testc || die "failed to delete C test executables" + if use fortran; then + rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables" + fi + if use python; then + rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables" + fi + fi +} + +src_test() { + # override parallel mode only for tests + local myctestargs=( "-j 1" ) + cmake_src_test +} diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest index 5686a42c6fc7..39754651ea8d 100644 --- a/sci-libs/metis/Manifest +++ b/sci-libs/metis/Manifest @@ -1 +1,2 @@ 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.2.1-add-gklib-as-required.patch b/sci-libs/metis/files/metis-5.2.1-add-gklib-as-required.patch new file mode 100644 index 000000000000..5fedf17b8051 --- /dev/null +++ b/sci-libs/metis/files/metis-5.2.1-add-gklib-as-required.patch @@ -0,0 +1,15 @@ +diff --git a/libmetis/CMakeLists.txt b/libmetis/CMakeLists.txt +index fc6cec6..758835f 100644 +--- a/libmetis/CMakeLists.txt ++++ b/libmetis/CMakeLists.txt +@@ -7,6 +7,10 @@ file(GLOB metis_sources *.c) + # Build libmetis. + add_library(metis ${METIS_LIBRARY_TYPE} ${metis_sources}) + ++if(SHARED) ++ target_link_libraries(metis GKlib) ++endif() ++ + if(METIS_INSTALL) + install(TARGETS metis + LIBRARY DESTINATION lib diff --git a/sci-libs/metis/files/metis-5.2.1-multilib.patch b/sci-libs/metis/files/metis-5.2.1-multilib.patch new file mode 100644 index 000000000000..fc26f7556f12 --- /dev/null +++ b/sci-libs/metis/files/metis-5.2.1-multilib.patch @@ -0,0 +1,19 @@ +diff --git a/libmetis/CMakeLists.txt b/libmetis/CMakeLists.txt +index fc6cec6..e10a1a1 100644 +--- a/libmetis/CMakeLists.txt ++++ b/libmetis/CMakeLists.txt +@@ -6,10 +6,11 @@ file(GLOB metis_sources *.c) + + # Build libmetis. + add_library(metis ${METIS_LIBRARY_TYPE} ${metis_sources}) ++set_target_properties(metis PROPERTIES SOVERSION 0) + + 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.2.1-respect-user-flags.patch b/sci-libs/metis/files/metis-5.2.1-respect-user-flags.patch new file mode 100644 index 000000000000..acdf17df5090 --- /dev/null +++ b/sci-libs/metis/files/metis-5.2.1-respect-user-flags.patch @@ -0,0 +1,47 @@ +diff --git a/conf/gkbuild.cmake b/conf/gkbuild.cmake +index 0e70a8e..d005f84 100644 +--- a/conf/gkbuild.cmake ++++ b/conf/gkbuild.cmake +@@ -29,16 +29,7 @@ endif(CYGWIN) + if(CMAKE_COMPILER_IS_GNUCC) + # GCC opts. + set(GK_COPTIONS "${GK_COPTIONS} -std=c99 -fno-strict-aliasing") +-if(VALGRIND) +- set(GK_COPTIONS "${GK_COPTIONS} -march=x86-64 -mtune=generic") +-else() +- set(GK_COPTIONS "${GK_COPTIONS} -march=native") +-endif(VALGRIND) +- if(NOT MINGW) +- set(GK_COPTIONS "${GK_COPTIONS} -fPIC") +- endif(NOT MINGW) +-# GCC warnings. +- set(GK_COPTIONS "${GK_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") ++ + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GK_COPTIONS "${GK_COPTIONS} -xc99") +@@ -65,24 +56,10 @@ if(OPENMP) + endif(OPENMP) + + +-# Add various definitions. +-if(GDB) +- set(GK_COPTS "${GK_COPTS} -g") +- set(GK_COPTIONS "${GK_COPTIONS} -Werror") +-else() +- set(GK_COPTS "-O3") +-endif(GDB) +- +- + if(DEBUG) +- set(GK_COPTS "-Og") + set(GK_COPTIONS "${GK_COPTIONS} -DDEBUG") + endif(DEBUG) + +-if(GPROF) +- set(GK_COPTS "-pg") +-endif(GPROF) +- + if(NOT ASSERT) + set(GK_COPTIONS "${GK_COPTIONS} -DNDEBUG") + endif(NOT ASSERT) diff --git a/sci-libs/metis/metadata.xml b/sci-libs/metis/metadata.xml index 6415e7e43b5c..3daf0ce6b84d 100644 --- a/sci-libs/metis/metadata.xml +++ b/sci-libs/metis/metadata.xml @@ -16,4 +16,7 @@ <flag name="double-precision">Use double- rather than single-precision floating-point representation</flag> <flag name="int64">Use 64- rather than 32-bit integer representation (needed for > 2^31 vertices)</flag> </use> + <upstream> + <remote-id type="github">KarypisLab/METIS</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild index e57b953827b0..71b30fa92596 100644 --- a/sci-libs/metis/metis-5.1.0-r5.ebuild +++ b/sci-libs/metis/metis-5.1.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +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" diff --git a/sci-libs/metis/metis-5.2.1-r2.ebuild b/sci-libs/metis/metis-5.2.1-r2.ebuild new file mode 100644 index 000000000000..9c8ab6aafe58 --- /dev/null +++ b/sci-libs/metis/metis-5.2.1-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A package for unstructured serial graph partitioning" +HOMEPAGE="https://github.com/KarypisLab/METIS" +SRC_URI="https://github.com/KarypisLab/METIS/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +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" +IUSE="double-precision examples int64 openmp" + +PATCHES=( + "${FILESDIR}"/${P}-multilib.patch + "${FILESDIR}"/${P}-respect-user-flags.patch + # https://github.com/KarypisLab/METIS/pull/52 Bug 905822 + "${FILESDIR}"/${P}-add-gklib-as-required.patch +) + +DEPEND="sci-libs/gklib" +RDEPEND="${DEPEND}" + +src_prepare() { + local idxwidth realwidth + + if use int64; then + idxwidth="#define IDXTYPEWIDTH 64" + else + idxwidth="#define IDXTYPEWIDTH 32" + fi + + if use double-precision; then + realwidth="#define REALTYPEWIDTH 64" + else + realwidth="#define REALTYPEWIDTH 32" + fi + + cmake_src_prepare + + # From Makefile + mkdir -p build/xinclude || die + echo ${idxwidth} > build/xinclude/metis.h || die + echo ${realwidth} >> build/xinclude/metis.h || die + cat include/metis.h >> build/xinclude/metis.h || die + cp include/CMakeLists.txt build/xinclude || die +} + +src_configure() { + local mycmakeargs=( + -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 + 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} + Libs: -L\${libdir} -lmetis -lGKlib + EOF + insinto /usr/$(get_libdir)/pkgconfig + doins "${T}"/metis.pc +} diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild index b689664fa587..80f3bc6e283a 100644 --- a/sci-libs/mpfi/mpfi-1.5.4.ebuild +++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" DEPEND=" dev-libs/gmp:0= diff --git a/sci-libs/mpir/mpir-3.0.0-r1.ebuild b/sci-libs/mpir/mpir-3.0.0-r1.ebuild index e5b47d07a8db..1c8e843d6950 100644 --- a/sci-libs/mpir/mpir-3.0.0-r1.ebuild +++ b/sci-libs/mpir/mpir-3.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+cxx cpudetection" BDEPEND=" diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild b/sci-libs/neartree/neartree-5.1.1.ebuild index 01499d4b10a1..89ccf3f61888 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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" RDEPEND="dev-libs/cvector" DEPEND="${RDEPEND}" 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 1d7f1644788e..897094334974 100644 --- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild +++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.unidata.ucar.edu/downloads/netcdf/ftp/${P}.tar.gz" LICENSE="UCAR-Unidata" SLOT="3" -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples" RDEPEND=">=sci-libs/netcdf-4.2:0=" 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 47e1c0f9bb27..243ba75a2e3a 100644 --- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild +++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta 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" diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest index 0f2a9bb79806..deb89c507b91 100644 --- a/sci-libs/netcdf-fortran/Manifest +++ b/sci-libs/netcdf-fortran/Manifest @@ -1,2 +1,3 @@ DIST netcdf-fortran-4.5.4.tar.gz 2011867 BLAKE2B bc98522be63c705193a22ce877c41abdc064a05afab2186891d8a0bbe9da8f0ba3f7eae6610e8b4e006b26ad8e3ea5fd8d57349054949a38f3a2fd9dfefb85c5 SHA512 a704f6483f2c8b8bf2353615a3e4b784294bd790588cfc13193c617e776e330edb17fa16da69e1a0b6c767308992321e01399ba2067c32f6ae6b3cb9ff72c3ee DIST netcdf-fortran-4.5.4.upstream.tar.gz 1085665 BLAKE2B 616fba5a8dfa69c4a48df72222cbc2adf24dadcbda01d95e97b64a23a76038dd75988b481eb3d73e6ae5d20c011c5dc23cf2e0f3a3ae020a12742fe93644de2c SHA512 a03a9a57476983096cdc610405869696c6c0345039da9f386e345932bf439f49aa012501d31f4ab0100688211a3abfc7487a8413cf9a0b3907dc1f8ee50d8000 +DIST netcdf-fortran-4.6.1.tar.gz 1112270 BLAKE2B 88c7550a1426fb82068dec3183d14ac0aa85eb4657cffaca7f141bfa2caa0e48ef1f395a504f06fca29ffb511b20182d6d0d71ab951b93f985a580352da3fe52 SHA512 4fb8ed0581df9157733f1331de60dc4e06274320a942db97dbc9020653ed4677bf26e84e5968ee6e5f8fc179e2db02898f339820e5b257ce8a94a5bcdc670587 diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild new file mode 100644 index 000000000000..37fe541485f6 --- /dev/null +++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="77 90" + +inherit cmake fortran-2 + +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-fortran/${PV}/${P}.tar.gz" + +LICENSE="UCAR-Unidata" +SLOT="0/7" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples test zstd" +RESTRICT="!test? ( test )" + +RDEPEND="sci-libs/netcdf" +DEPEND=" + ${RDEPEND} + dev-lang/cfortran +" +BDEPEND="doc? ( app-doc/doxygen[dot] )" + +src_configure() { + local mycmakeargs=( + -DDISABLE_ZSTANDARD_PLUGIN=$(usex !zstd) + -DBUILD_EXAMPLES=$(usex examples) + -DENABLE_DOXYGEN=$(usex doc) + -DENABLE_PARALLEL_TESTS=$(usex test) + -DENABLE_TESTS=$(usex test) + + # "Take lots of time and disk." per CMakeLists.txt + #-DLARGE_FILE_TESTS="${T}" + + -DTEST_WITH_VALGRIND=OFF + ) + + cmake_src_configure +} diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest index c6c25e69d50e..bae5000b682d 100644 --- a/sci-libs/netcdf/Manifest +++ b/sci-libs/netcdf/Manifest @@ -1,2 +1 @@ -DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42 DIST netcdf-c-4.9.2.tar.gz 7142536 BLAKE2B b24135070d2f1f0b53fe738f8839039547eceba16d36905bb8cd7be983ce0c1127b7b01ae37dbde50087aa82fd56f00fab9bfa75c7d94fd4478031bb8a6da247 SHA512 7a96bcf673d5a9e1537d660aaf085a1dfaefc7dfb0fc96358462d92e7bbfe541184583681797e6a54d11b8588504b7d8a9b0b9bd850eecd02ed73aa2eb5ffa0d diff --git a/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch b/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch deleted file mode 100644 index afeff7e3fbd0..000000000000 --- a/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -Later version for 4.8.1 grabbed from Debian: -https://sources.debian.org/patches/netcdf/1:4.8.1-1/byteswap.patch/ - -Earlier version used: -https://github.com/DennisHeimbigner/netcdf-c/commit/6f86660da86f279cad1f2804cf3242767de27630.patch -https://github.com/Unidata/netcdf-c/issues/1687 -https://bugs.gentoo.org/772863 - -Description: Add forward declarations for byteswap8 & byteswap4. -Author: Dennis Heimbigner -Bug: https://github.com/Unidata/netcdf-c/issues/1687 - ---- a/libdispatch/dfilter.c -+++ b/libdispatch/dfilter.c -@@ -20,6 +20,9 @@ - #include "hdf5internal.h" - #endif - -+static void byteswap8(unsigned char*); -+static void byteswap4(unsigned char*); -+ - /* - Unified filter related code - */ diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml index acecc3ab2966..710afdc8ff08 100644 --- a/sci-libs/netcdf/metadata.xml +++ b/sci-libs/netcdf/metadata.xml @@ -16,7 +16,6 @@ <use> <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="tools">Build the utilities nccopy, ncgen and ncdump</flag> </use> <upstream> <remote-id type="github">Unidata/netcdf-c</remote-id> diff --git a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild deleted file mode 100644 index 15e3852ccee4..000000000000 --- a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="Scientific library and interface for array oriented data access" -HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" -SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.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="+dap doc examples hdf +hdf5 mpi szip test tools" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/libxml2 - dap? ( net-misc/curl:0= ) - hdf? ( - sci-libs/hdf:0= - sci-libs/hdf5:0= - virtual/jpeg - ) - hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -REQUIRED_USE=" - test? ( tools ) - szip? ( hdf5 ) - mpi? ( hdf5 )" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.1-big-endian-build.patch" - "${FILESDIR}/${PN}-4.7.4-big-endian-test.patch" -) - -src_prepare() { - # skip test that requires network - sed -i -e '/run_get_hdf4_files/d' hdf4_test/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - use mpi && export CC=mpicc - - # Temporary workaround for test breakage - # https://github.com/Unidata/netcdf-c/issues/1983 - # bug #827042 - append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DENABLE_DAP_REMOTE_TESTS=OFF - # Enable for >4.8.1 (not yet in a release) - #-DENABLE_LIBXML2=ON - -DBUILD_UTILITIES=$(usex tools) - -DENABLE_DAP=$(usex dap) - -DENABLE_DOXYGEN=$(usex doc) - -DENABLE_EXAMPLES=$(usex examples) - -DENABLE_HDF4=$(usex hdf) - -DENABLE_NETCDF_4=$(usex hdf5) - -DENABLE_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - # fails parallel tests: bug #621486 - cmake_src_test -j1 -} diff --git a/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild deleted file mode 100644 index d4e17743df68..000000000000 --- a/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="Scientific library and interface for array oriented data access" -HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" -SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.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="+dap doc examples hdf +hdf5 mpi szip test tools" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/libxml2 - dap? ( net-misc/curl:0= ) - hdf? ( - media-libs/libjpeg-turbo:= - sci-libs/hdf:0= - sci-libs/hdf5:0= - ) - hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -REQUIRED_USE=" - test? ( tools ) - szip? ( hdf5 ) - mpi? ( hdf5 )" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.1-big-endian-build.patch" - "${FILESDIR}/${PN}-4.7.4-big-endian-test.patch" -) - -src_prepare() { - # skip test that requires network - sed -i -e '/run_get_hdf4_files/d' hdf4_test/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - use mpi && export CC=mpicc - - # Temporary workaround for test breakage - # https://github.com/Unidata/netcdf-c/issues/1983 - # bug #827042 - append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DENABLE_DAP_REMOTE_TESTS=OFF - # Enable for >4.8.1 (not yet in a release) - #-DENABLE_LIBXML2=ON - -DBUILD_UTILITIES=$(usex tools) - -DENABLE_DAP=$(usex dap) - -DENABLE_DOXYGEN=$(usex doc) - -DENABLE_EXAMPLES=$(usex examples) - -DENABLE_HDF4=$(usex hdf) - -DENABLE_NETCDF_4=$(usex hdf5) - -DENABLE_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - # fails parallel tests: bug #621486 - cmake_src_test -j1 -} - -src_install() { - cmake_src_install - - # bug #827188 - sed -i -e "s:${EPREFIX}/usr/$(get_libdir)/libdl.so;:dl;:" "${ED}/usr/$(get_libdir)/cmake/netCDF/netCDFTargets.cmake" || die -} diff --git a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild index 538051367347..926fa896d4f4 100644 --- a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild +++ b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild @@ -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 ~x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE="cxx guile octave python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild index 8c7936051193..634c1c5947bf 100644 --- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild +++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild @@ -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 ~x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE="cxx guile octave python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest index b11a25b009e3..2dee1a62be07 100644 --- a/sci-libs/numkit/Manifest +++ b/sci-libs/numkit/Manifest @@ -1 +1,2 @@ DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034 +DIST numkit-1.2.3.tar.gz 150900 BLAKE2B b729917dd0f1df2710c1eec9f4b6c34495fdb0c6f93271a1fc515fd9111848e80820ea385d96603c5b124cfc65b6d3a9912f13936fca218fe6b32cbee69832b8 SHA512 96317196477a4398432205be5b2eab5263e1f60213ff8b6e99e5a1e44ed1cbec2a535cb3b0c56fc7bb24aada59ad120a3befb802868854e9d15eced2f23d6659 diff --git a/sci-libs/numkit/numkit-1.2.3.ebuild b/sci-libs/numkit/numkit-1.2.3.ebuild new file mode 100644 index 000000000000..84284156fb45 --- /dev/null +++ b/sci-libs/numkit/numkit-1.2.3.ebuild @@ -0,0 +1,26 @@ +# 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="Numerical first aid kit (with numpy/scipy)" +HOMEPAGE="https://numkit.readthedocs.io" +SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-release-${PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + >=dev-python/numpy-1.9[${PYTHON_USEDEP}] + >=dev-python/scipy-1.0[${PYTHON_USEDEP}] +" +RDEPEND="${BDEPEND}" + +distutils_enable_tests pytest diff --git a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild index 72f6e8d93cd2..e449cbd2f7e3 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND=" diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index abc71ea28ca7..d47a8a91e628 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -1,2 +1,4 @@ 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 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 new file mode 100644 index 000000000000..239e0bd3a56a --- /dev/null +++ b/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch @@ -0,0 +1,11 @@ +--- 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/onnx-1.13.1-r1.ebuild b/sci-libs/onnx/onnx-1.13.1-r1.ebuild new file mode 100644 index 000000000000..1de081f5931b --- /dev/null +++ b/sci-libs/onnx/onnx-1.13.1-r1.ebuild @@ -0,0 +1,32 @@ +# 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 new file mode 100644 index 000000000000..bed797b68a21 --- /dev/null +++ b/sci-libs/onnx/onnx-1.14.0-r1.ebuild @@ -0,0 +1,32 @@ +# 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/openblas/Manifest b/sci-libs/openblas/Manifest index 95fc46d6f9d5..ba6ab6c54c50 100644 --- a/sci-libs/openblas/Manifest +++ b/sci-libs/openblas/Manifest @@ -1,4 +1,2 @@ -DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152 -DIST openblas-0.3.19.tar.gz 12706050 BLAKE2B c29aa27faaf18e3330087f8d2ebed733f53878266d6865239dfbb1624a113f3cabc988bbfcc18a0aa5d971697bc68bb267795ef24e2d8e0e8d50f802cb817b57 SHA512 1fcbcfefb7744894b0b0c83c6071b342086ca311dc67f5c2745812d61dcc9d31ef7dd5e1215dfb2731ae7197d497dbdf8f8b26a432eb07d41a7db0983eb86a33 -DIST openblas-0.3.20.tar.gz 12742441 BLAKE2B 9ae808e2a7da39e28dbe26c7feb5da3c70275f3b48bd68455c22e3b16fc1f2d10b9d84c9593acff2c837fc1514f21f2bbc0e87708075c5fe13514d0d47cf0b5a SHA512 0742d40b74b11b781021280fd627fa5798e6856b49f2ba1111a5927aac1a7823bcb8162187555f4cf3a4dd7eadf5b1f2a4685c0b5e189847b2869166d1bc7391 DIST openblas-0.3.21.tar.gz 23729571 BLAKE2B 678bfb13ead69045e7d4d840bbcaed884d9ebedded5425cfa1f55e3d85bda31a3eb43dbbf9f07099d0d198f97ae68ef3b3b2b78aa1bd5b4999dd729dc08f7e28 SHA512 4625c8e6ccfa9120281fd714d3f6b7c3ba2265470c1be76121d6b25dc3dacb899d26e5d9a417ddc616d23909f1411495aa995ef8d8d6df8511cd5cefbabcb1c5 +DIST openblas-0.3.23.tar.gz 23950794 BLAKE2B 8394e09c682bba10450248cbbe090bb81c26661eac7d238942055ae0eecce752c8a3481af905de |