diff options
Diffstat (limited to 'sci-libs')
61 files changed, 510 insertions, 862 deletions
diff --git a/sci-libs/QNNPACK/QNNPACK-2019.08.28.ebuild b/sci-libs/QNNPACK/QNNPACK-2019.08.28-r1.ebuild index 11fde064e65b..aa539b84c440 100644 --- a/sci-libs/QNNPACK/QNNPACK-2019.08.28.ebuild +++ b/sci-libs/QNNPACK/QNNPACK-2019.08.28-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,6 +11,8 @@ HOMEPAGE="https://github.com/pytorch/QNNPACK/" SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" @@ -23,14 +25,13 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/FP16 dev-libs/FXdiv + dev-libs/clog " BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( static-libs )" -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/sci-libs/arprec/arprec-2.2.19.ebuild b/sci-libs/arprec/arprec-2.2.19-r1.ebuild index b31b5b5c86c7..dc6ff68e1078 100644 --- a/sci-libs/arprec/arprec-2.2.19.ebuild +++ b/sci-libs/arprec/arprec-2.2.19-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 FORTRAN_NEEDED=fortran FORTRAN_STANDARD=90 @@ -11,9 +11,10 @@ inherit autotools fortran-2 DESCRIPTION="Arbitrary precision float arithmetics and functions" HOMEPAGE="https://crd-legacy.lbl.gov/~dhbailey/mpdist/" SRC_URI="https://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz" +S="${WORKDIR}/${PN}" -SLOT="0" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran qd static-libs" @@ -24,20 +25,22 @@ PATCHES=( "${FILESDIR}"/${P}-gold.patch ) -S="${WORKDIR}/${PN}" - src_prepare() { default + sed -e '/TESTS =/s/ io//' -i tests/Makefile.am || die # bug 526960 + eautoreconf } src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - $(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \ - $(use_enable fortran) \ + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + $(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) + $(use_enable fortran) $(use_enable qd) + ) + econf "${myeconfargs[@]}" } src_compile() { @@ -75,10 +78,10 @@ src_install() { fi if ! use doc; then - rm "${ED%/}"/usr/share/doc/${PF}/*.pdf || die + rm "${ED}"/usr/share/doc/${PF}/*.pdf || die fi if ! use static-libs; then - find "${D}" -name '*.la' -delete || die + find "${D}" -type f -name '*.la' -delete || die fi } diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest index feff64952906..6671de7c7fc6 100644 --- a/sci-libs/blis/Manifest +++ b/sci-libs/blis/Manifest @@ -1 +1,2 @@ DIST blis-0.9.0.tar.gz 15078619 BLAKE2B f7c9632024e0adbba370a4077a7a47f05c54779ad6195b2ccda0950df8e784b8988b4338758ec2fabd424a69009010f8f02cbaef0eda1d74f6794127b43b4f70 SHA512 01e1990eefa4387839ac404089e4ffa32922ceaa30a1747c08a931c67706bcf29fed9d25e30c0faa36bba4f460821290e7973ed6b657d2cd95e126caaf853f81 +DIST blis-1.0.tar.gz 15714356 BLAKE2B 7e9b6132ab556adf7ccb2d1bff6c5195eb2f48a9193a6df57d409e25b42f1aaa64f053f97996a6467ad42cbe5848c3689f3e6c501579d5d1083523ca9ed52ce1 SHA512 91cd2a2944762e584f11cb931ba11c4b296e93040b553f105ba8579d748a49cfcb6db8ae2ce1b5a537c0ae88182c9d212a4a5daa757ca4d0a7beee552d2eb55c diff --git a/sci-libs/blis/blis-0.9.0.ebuild b/sci-libs/blis/blis-0.9.0-r1.ebuild index 171a0e9dacbe..1bf6e1ea736e 100644 --- a/sci-libs/blis/blis-0.9.0.ebuild +++ b/sci-libs/blis/blis-0.9.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 +PYTHON_COMPAT=( python3_{10..13} ) +inherit python-any-r1 toolchain-funcs DESCRIPTION="BLAS-like Library Instantiation Software Framework" HOMEPAGE="https://github.com/flame/blis" @@ -13,7 +13,12 @@ SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index" +CPU_USE=( + cpu_flags_ppc_{vsx,vsx3} + cpu_flags_arm_{neon,v7,v8,sve} + cpu_flags_x86_{ssse3,avx,fma3,fma4,avx2,avx512vl} +) +IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index ${CPU_USE[@]}" REQUIRED_USE=" ?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )" @@ -25,7 +30,10 @@ DEPEND=" )" RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl +" PATCHES=( "${FILESDIR}"/${PN}-0.6.0-blas-provider.patch @@ -34,9 +42,31 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9.0-rpath.patch ) +get_confname() { + local confname=generic + if use x86 || use amd64; then + use cpu_flags_x86_ssse3 && confname=penryn + use cpu_flags_x86_avx && use cpu_flags_x86_fma3 && confname=sandybridge + use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && confname=bulldozer + use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && use cpu_flags_x86_fma3 && confname=piledriver + use cpu_flags_x86_avx2 && confname=haswell + use cpu_flags_x86_avx512vl && confname=skx + elif use arm || use arm64; then + use arm && confname=arm32 + use arm64 && confname=arm64 + use cpu_flags_arm_neon && use cpu_flags_arm_v7 && confname=cortexa9 + use cpu_flags_arm_v8 && confname=cortexa53 + use cpu_flags_arm_sve && confname=armsve + elif use ppc || use ppc64; then + confname=power + use cpu_flags_ppc_vsx && confname=power7 + use cpu_flags_ppc_vsx3 && confname=power9 + fi + echo ${confname} +} + src_configure() { local BLIS_FLAGS=() - local confname # determine flags if use openmp; then BLIS_FLAGS+=( -t openmp ) @@ -46,17 +76,9 @@ src_configure() { BLIS_FLAGS+=( -t no ) fi use 64bit-index && BLIS_FLAGS+=( -b 64 -i 64 ) - # determine config name - case "${ARCH}" in - "x86" | "amd64") - confname=auto ;; - "ppc64") - confname=generic ;; - *) - confname=generic ;; - esac + # This is not an autotools configure file. We don't use econf here. - ./configure \ + CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ./configure \ --enable-verbose-make \ --prefix="${BROOT}"/usr \ --libdir="${BROOT}"/usr/$(get_libdir) \ @@ -65,7 +87,7 @@ src_configure() { --enable-cblas \ "${BLIS_FLAGS[@]}" \ --enable-shared \ - $confname || die + $(get_confname) || die } src_compile() { @@ -75,7 +97,8 @@ src_compile() { } src_test() { - LD_LIBRARY_PATH="${S}/lib/haswell" emake check + LD_LIBRARY_PATH=lib/$(get_confname) emake testblis-fast + ./testsuite/check-blistest.sh ./output.testsuite || die } src_install() { diff --git a/sci-libs/blis/blis-1.0.ebuild b/sci-libs/blis/blis-1.0.ebuild new file mode 100644 index 000000000000..348b809181a4 --- /dev/null +++ b/sci-libs/blis/blis-1.0.ebuild @@ -0,0 +1,137 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="BLAS-like Library Instantiation Software Framework" +HOMEPAGE="https://github.com/flame/blis" +SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +CPU_USE=( + cpu_flags_ppc_{vsx,vsx3} + cpu_flags_arm_{neon,v7,v8,sve} + cpu_flags_x86_{ssse3,avx,fma3,fma4,avx2,avx512vl} +) +IUSE="doc eselect-ldso openmp pthread serial static-libs 64bit-index ${CPU_USE[@]}" +REQUIRED_USE=" + ?? ( openmp pthread serial ) + ?? ( eselect-ldso 64bit-index )" + +DEPEND=" + eselect-ldso? ( + !app-eselect/eselect-cblas + >=app-eselect/eselect-blas-0.2 + )" + +RDEPEND="${DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.0-blas-provider.patch + # to prevent QA Notice: pkg-config files with wrong LDFLAGS detected + "${FILESDIR}"/${PN}-0.8.1-pkg-config.patch + "${FILESDIR}"/${PN}-0.9.0-rpath.patch + "${FILESDIR}"/${PN}-1.0-no-helper-headers.patch +) + +get_confname() { + local confname=generic + if use x86 || use amd64; then + use cpu_flags_x86_ssse3 && confname=penryn + use cpu_flags_x86_avx && use cpu_flags_x86_fma3 && confname=sandybridge + use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && confname=bulldozer + use cpu_flags_x86_avx && use cpu_flags_x86_fma4 && use cpu_flags_x86_fma3 && confname=piledriver + use cpu_flags_x86_avx2 && confname=haswell + use cpu_flags_x86_avx512vl && confname=skx + elif use arm || use arm64; then + use arm && confname=arm32 + use arm64 && confname=arm64 + use cpu_flags_arm_neon && use cpu_flags_arm_v7 && confname=cortexa9 + use cpu_flags_arm_v8 && confname=cortexa53 + use cpu_flags_arm_sve && confname=armsve + elif use ppc || use ppc64; then + confname=power + use cpu_flags_ppc_vsx && confname=power7 + use cpu_flags_ppc_vsx3 && confname=power9 + fi + echo ${confname} +} + +src_configure() { + local BLIS_FLAGS=() + # determine flags + if use openmp; then + BLIS_FLAGS+=( -t openmp ) + elif use pthread; then + BLIS_FLAGS+=( -t pthreads ) + else + BLIS_FLAGS+=( -t no ) + fi + use 64bit-index && BLIS_FLAGS+=( -b 64 -i 64 ) + + # This is not an autotools configure file. We don't use econf here. + CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ./configure \ + --enable-verbose-make \ + --prefix="${BROOT}"/usr \ + --libdir="${BROOT}"/usr/$(get_libdir) \ + $(use_enable static-libs static) \ + --enable-blas \ + --enable-cblas \ + "${BLIS_FLAGS[@]}" \ + --enable-shared \ + $(get_confname) || die +} + +src_compile() { + DEB_LIBBLAS=libblas.so.3 DEB_LIBCBLAS=libcblas.so.3 \ + LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \ + default +} + +src_test() { + LD_LIBRARY_PATH=lib/$(get_confname) emake testblis-fast + ./testsuite/check-blistest.sh ./output.testsuite || die +} + +src_install() { + default + use doc && dodoc README.md docs/*.md + + if use eselect-ldso; then + insinto /usr/$(get_libdir)/blas/blis + doins lib/*/lib{c,}blas.so.3 + dosym libblas.so.3 usr/$(get_libdir)/blas/blis/libblas.so + dosym libcblas.so.3 usr/$(get_libdir)/blas/blis/libcblas.so + fi +} + +pkg_postinst() { + use eselect-ldso || return + + local libdir=$(get_libdir) me="blis" + + # check blas + eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me} + local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) + if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then + eselect blas set ${libdir} ${me} + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + else + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + elog "To use blas [${me}] implementation, you have to issue (as root):" + elog "\t eselect blas set ${libdir} ${me}" + fi +} + +pkg_postrm() { + use eselect-ldso && eselect blas validate +} diff --git a/sci-libs/blis/files/blis-1.0-no-helper-headers.patch b/sci-libs/blis/files/blis-1.0-no-helper-headers.patch new file mode 100644 index 000000000000..ec747824e7dc --- /dev/null +++ b/sci-libs/blis/files/blis-1.0-no-helper-headers.patch @@ -0,0 +1,13 @@ +Don't install one-line "helper header" cblas.h into /usr/include, +as it conflicts with sci-libs/lapack. +--- a/Makefile ++++ b/Makefile +@@ -1052,7 +1052,7 @@ endif + + # --- Install header rules --- + +-install-headers: check-env $(MK_INCL_DIR_INST) install-helper-headers ++install-headers: check-env $(MK_INCL_DIR_INST) + + # Rule for installing main headers. + $(MK_INCL_DIR_INST): $(HEADERS_TO_INSTALL) $(CONFIG_MK_FILE) diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest index ac0880603f09..1bf88c0e58c3 100644 --- a/sci-libs/branca/Manifest +++ b/sci-libs/branca/Manifest @@ -1,2 +1,3 @@ DIST branca-0.7.0.tar.gz 42990 BLAKE2B b8de083b0b94d35dbb6df5d230e388832fe027d756767d24ae8091f25d9846ac1f2ae72799aa83583c99ec02d955c7f8cb80183f1543e503d0a802ce051acac5 SHA512 bfe6afd93752dda57e55ba7bdd433e079b51798056b2be8d9c19d4ccc4ed94cc95b733cabf0981c908887c1f8a96e16bd11cb1b495243ac91df4c1c1c1253282 DIST branca-0.7.1.tar.gz 43005 BLAKE2B 2f2834d87e32ef5507273b14b1b8fcebc33d7eae49e0ffb8e834c540b1a329d177805ccbc1441cd522092d396ba98f69f3c8ab95254068d7b352e6f7df52c60d SHA512 70b6e361e93a01c319928890a40e3aa1e887e718b0736afe0a65bc45fe56fe6ca24a4c50db099066d84876cc8efd540a5cc14aa48607671ac068df3ae5124d29 +DIST branca-0.7.2.tar.gz 42586 BLAKE2B 3bb6a1f93babb80788fbc1cbd37d8b0c2d5c975c9a98c5816298e37a447bcffb7742a768a0ad2fbb58af5ce0650ef28fdef42e8e4d505bbf29ab10c87ed388d6 SHA512 ad62e4496b43405dbc54b2cca35ee9d0265b8deeeb3df3b0868e63e6890fe491bfc4987318d74c1e78d83f05bdf56bfd570609699860ab1af9d189357bf00107 diff --git a/sci-libs/branca/branca-0.7.2.ebuild b/sci-libs/branca/branca-0.7.2.ebuild new file mode 100644 index 000000000000..6fbc4495a341 --- /dev/null +++ b/sci-libs/branca/branca-0.7.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +inherit distutils-r1 + +DESCRIPTION="spinoff from folium, host the non-map-specific features" +HOMEPAGE="https://github.com/python-visualization/branca" +SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) + +RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm + test? ( + dev-python/selenium[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +distutils_enable_sphinx docs/source \ + dev-python/nbsphinx + +python_test() { + epytest -m 'not headless' +} diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index f1df96691729..246ab4d21a1a 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,3 +1,3 @@ -DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747 SHA512 a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756 DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c +DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587 diff --git a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild index 60112b1a722e..cd3d8757daa6 100644 --- a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild +++ b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild @@ -106,6 +106,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch "${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch + "${FILESDIR}"/${P}-musl.patch ) src_prepare() { diff --git a/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild index 749359d26e11..c01e904d8eb0 100644 --- a/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild +++ b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}"/${MYP} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" +IUSE="cuda distributed fbgemm ffmpeg flash gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" RESTRICT="test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -28,7 +28,10 @@ REQUIRED_USE=" mpi? ( distributed ) gloo? ( distributed ) ?? ( cuda rocm ) - rocm? ( || ( ${ROCM_REQUIRED_USE} ) ) + rocm? ( + || ( ${ROCM_REQUIRED_USE} ) + !flash + ) " # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 @@ -93,6 +96,7 @@ DEPEND=" $(python_gen_cond_dep ' dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] ') " @@ -171,6 +175,7 @@ src_configure() { -DUSE_FAKELOWP=OFF -DUSE_FBGEMM=$(usex fbgemm) -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_FLASH_ATTENTION=$(usex flash) -DUSE_GFLAGS=ON -DUSE_GLOG=ON -DUSE_GLOO=$(usex gloo) diff --git a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild b/sci-libs/caffe2/caffe2-2.3.1.ebuild index 8198f516b251..53c270458dd2 100644 --- a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild +++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild @@ -20,17 +20,18 @@ S="${WORKDIR}"/${MYP} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm tensorpipe xnnpack" +IUSE="cuda distributed fbgemm ffmpeg flash gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" RESTRICT="test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} ffmpeg? ( opencv ) mpi? ( distributed ) - tensorpipe? ( distributed ) - distributed? ( tensorpipe ) gloo? ( distributed ) ?? ( cuda rocm ) - rocm? ( || ( ${ROCM_REQUIRED_USE} ) ) + rocm? ( + || ( ${ROCM_REQUIRED_USE} ) + !flash + ) " # CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 @@ -44,15 +45,14 @@ RDEPEND=" dev-libs/pthreadpool dev-libs/sleef virtual/lapack - >=sci-libs/onnx-1.12.0 - <sci-libs/onnx-1.15.0 + sci-libs/onnx sci-libs/foxi cuda? ( - =dev-libs/cudnn-8* - >=dev-libs/cudnn-frontend-0.9.2:0/8 + dev-libs/cudnn + >=dev-libs/cudnn-frontend-1.0.3:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) - fbgemm? ( >=dev-libs/FBGEMM-2023.11.02 ) + fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) @@ -78,14 +78,14 @@ RDEPEND=" >=sci-libs/miopen-5.7[${ROCM_USEDEP}] >=dev-util/roctracer-5.7[${ROCM_USEDEP}] ) - tensorpipe? ( sci-libs/tensorpipe[cuda?] ) + distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) " DEPEND=" ${RDEPEND} - cuda? ( >=dev-libs/cutlass-3.1.0 ) + cuda? ( >=dev-libs/cutlass-3.4.1 ) onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 @@ -96,20 +96,21 @@ DEPEND=" $(python_gen_cond_dep ' dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] ') " PATCHES=( - "${FILESDIR}"/${PN}-2.1.1-gentoo.patch + "${FILESDIR}"/${PN}-2.2.1-gentoo.patch "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch - "${FILESDIR}"/${PN}-2.0.0-gcc13.patch - "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch - "${FILESDIR}"/${PN}-2.1.1-cudaExtra.patch + "${FILESDIR}"/${PN}-2.3.0-cudnn_include_fix.patch "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch - "${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch + "${FILESDIR}"/${PN}-2.3.0-rocm-fix-std-cpp17.patch + "${FILESDIR}"/${PN}-2.2.2-musl.patch + "${FILESDIR}"/${PN}-2.3.0-CMakeFix.patch ) src_prepare() { @@ -138,9 +139,8 @@ src_prepare() { CMakeLists.txt if use rocm; then - sed -e "s:ROCM_PATH /opt/rocm:ROCM_PATH /usr:" \ - -e "s:HIP_PATH \${ROCM_PATH}/hip:HIP_PATH /usr:" \ - -e "s:\${HIP_PATH}/cmake:/usr/$(get_libdir)/cmake/hip:g" \ + sed -e "s:/opt/rocm:/usr:" \ + -e "s:lib/cmake:$(get_libdir)/cmake:g" \ -e "s/HIP 1.0/HIP 1.0 REQUIRED/" \ -i cmake/public/LoadHIP.cmake || die @@ -175,6 +175,7 @@ src_configure() { -DUSE_FAKELOWP=OFF -DUSE_FBGEMM=$(usex fbgemm) -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_FLASH_ATTENTION=$(usex flash) -DUSE_GFLAGS=ON -DUSE_GLOG=ON -DUSE_GLOO=$(usex gloo) @@ -186,7 +187,7 @@ src_configure() { -DUSE_QNNPACK=$(usex qnnpack) -DUSE_XNNPACK=$(usex xnnpack) -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex tensorpipe) + -DUSE_TENSORPIPE=$(usex distributed) -DUSE_PYTORCH_QNNPACK=OFF -DUSE_NUMPY=$(usex numpy) -DUSE_OPENCL=$(usex opencl) @@ -224,11 +225,11 @@ src_configure() { if use cuda; then addpredict "/dev/nvidiactl" # bug 867706 addpredict "/dev/char" + addpredict "/proc/self/task" # bug 926116 mycmakeargs+=( -DUSE_CUDNN=ON -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" - -DBUILD_NVFUSER=ON -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" ) @@ -236,7 +237,6 @@ src_configure() { export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)" mycmakeargs+=( - -DBUILD_NVFUSER=ON -DUSE_NCCL=ON -DUSE_SYSTEM_NCCL=ON ) @@ -266,18 +266,9 @@ src_install() { rm -rf python mkdir -p python/torch/include || die mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die - if use cuda || use rocm; then - mv "${ED}${S}"/nvfuser python/nvfuser || die - mv "${ED}"/usr/$(get_libdir)/nvfuser.so python/nvfuser/_C.so || die - fi cp torch/version.py python/torch/ || die python_domodule python/caffe2 python_domodule python/torch ln -s ../../../../../include/torch \ "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269 - if use cuda || use rocm; then - python_domodule python/nvfuser - fi - rm -rf "${ED}${WORKDIR}" - find "${ED}" -empty -delete } diff --git a/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch b/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch deleted file mode 100644 index f12623f2068a..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/third_party/nvfuser/CMakeLists.txt 2023-11-30 21:42:07.336946970 +0100 -+++ b/third_party/nvfuser/CMakeLists.txt 2023-11-30 21:46:35.101749250 +0100 -@@ -18,7 +18,7 @@ - set(NVFUSER_ROOT ${PROJECT_SOURCE_DIR}) - set(NVFUSER_SRCS_DIR "${NVFUSER_ROOT}/csrc") - set(TORCH_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../..") --set(TORCH_INSTALL_LIB_DIR ${TORCH_ROOT}/torch/lib) -+set(TORCH_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR}) - - # --- build nvfuser_codegen library - -@@ -218,7 +218,7 @@ - message(STATUS "somehow this is happening") - set_target_properties(${NVFUSER} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) - endif() -- install(TARGETS ${NVFUSER} EXPORT NvfuserTargets DESTINATION ${TORCH_ROOT}/nvfuser/) -+ install(TARGETS ${NVFUSER} EXPORT NvfuserTargets DESTINATION "${TORCH_INSTALL_LIB_DIR}") - - # install nvfuser python files - install(DIRECTORY "${NVFUSER_ROOT}/python/" ---- a/functorch/CMakeLists.txt 2023-11-30 20:30:45.805209036 +0100 -+++ b/functorch/CMakeLists.txt 2023-11-30 20:31:13.284766157 +0100 -@@ -35,4 +35,4 @@ - if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "") - set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) - endif() --install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}") -+install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch deleted file mode 100644 index 056ac9afe5b3..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch +++ /dev/null @@ -1,188 +0,0 @@ ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -487,7 +487,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) -@@ -543,7 +543,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") -@@ -803,7 +803,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") -@@ -848,6 +848,7 @@ - endif() - - if(USE_FBGEMM) -+ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) - caffe2_update_option(USE_FBGEMM ON) - else() - caffe2_update_option(USE_FBGEMM OFF) -@@ -1552,7 +1553,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) -@@ -1831,7 +1831,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`. - # -@@ -1840,9 +1839,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 -@@ -87,7 +87,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 -@@ -63,15 +63,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 -@@ -84,7 +78,6 @@ - python::python - pybind::pybind11 - shm -- fmt::fmt-header-only - ATEN_CPU_FILES_GEN_LIB) - - if(USE_ASAN AND TARGET Sanitizer::address) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -812,12 +812,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) -@@ -917,8 +916,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) - else() - # skip unwanted includes from windows.h - add_compile_definitions(WIN32_LEAN_AND_MEAN) ---- a/cmake/public/utils.cmake -+++ b/cmake/public/utils.cmake -@@ -492,8 +492,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 -@@ -107,7 +107,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 "") -@@ -1023,7 +1025,6 @@ - endif() - - if(NOT MSVC AND USE_XNNPACK) -- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) - endif() - - # ========================================================== -@@ -1143,8 +1146,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 ed1f9fa58993..e99253402e7a 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -9,6 +9,7 @@ <flag name="distributed">Support distributed applications</flag> <flag name="fbgemm">Use FBGEMM</flag> <flag name="ffmpeg">Add support for video processing operators</flag> + <flag name="flash">Enable flash attention</flag> <flag name="gloo">Use sci-libs/gloo</flag> <flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for blas, lapack and sparse blas routines</flag> <flag name="nnpack">Use NNPACK</flag> @@ -19,7 +20,6 @@ <flag name="openmp">Use OpenMP for parallel code</flag> <flag name="qnnpack">Use QNNPACK</flag> <flag name="rocm">Enable ROCm gpu computing support</flag> - <flag name="tensorpipe">Use tensorpipe</flag> <flag name="xnnpack">Use XNNPACK</flag> </use> <upstream> diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild index 747e151d1e59..eb2f320fe9bc 100644 --- a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild +++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz" LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 )" SLOT="0/1" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples cuda gflags lapack +schur sparse test" REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )" diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild index 4fc1ec9b185a..669494c2ea85 100644 --- a/sci-libs/cholmod/cholmod-3.0.14.ebuild +++ b/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2" LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )" -SLOT="0" +SLOT="0/3" KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="cuda doc +lapack +matrixops +modify +partition" diff --git a/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch new file mode 100644 index 000000000000..837a50f6b825 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch @@ -0,0 +1,23 @@ +From 60dcddbf5fab917338caf433b3e7dca283cf9720 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Thu, 4 Apr 2024 17:48:33 +0200 +Subject: [PATCH] Fix build with Poppler 24.05 (unreleased yet) + +--- + frmts/pdf/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt +index 9b9a1898a730..bcb19c3aa24c 100644 +--- a/frmts/pdf/CMakeLists.txt ++++ b/frmts/pdf/CMakeLists.txt +@@ -54,6 +54,9 @@ if (GDAL_USE_POPPLER) + if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+") + string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR ${Poppler_VERSION_MINOR}) + endif () ++ if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05") ++ target_compile_features(gdal_PDF PRIVATE cxx_std_20) ++ endif () + target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR} + -DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR}) + endif () diff --git a/sci-libs/gdal/gdal-3.8.5.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild index bb1c2e0bde5e..d566ab246d33 100644 --- a/sci-libs/gdal/gdal-3.8.5.ebuild +++ b/sci-libs/gdal/gdal-3.8.5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta LICENSE="BSD Info-ZIP MIT" SLOT="0/34" # subslot is libgdal.so.<SONAME> -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 )" @@ -101,6 +101,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-3.8.0-java21.patch "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch + "${FILESDIR}"/${P}-poppler-24.05.0.patch # in 3.9.0 ) pkg_setup() { diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest index 23cea03c57b1..0110e7bb188d 100644 --- a/sci-libs/htslib/Manifest +++ b/sci-libs/htslib/Manifest @@ -1,2 +1,2 @@ -DIST htslib-1.17.tar.bz2 4619884 BLAKE2B c45591b3f1da4f6ddfdf5e1a20864583d57de2a460d42049715335fce7dafe1f5cd14403e6033fee4f9d0bfc75f8777b5835d2d01bf2cadff0155d9fc92b97d9 SHA512 624ab449d57713dab2d34399926c065f8cff8a45e6fbe68e0bb518c601421f587b613caeb095f8639b1d67cdb4a65d658c85f942173bcaa48da026fe15def5d3 DIST htslib-1.19.1.tar.bz2 4775086 BLAKE2B 3af6770ade9505a3c71f6d522c0971eb77ea2549670043a539a2a4681e583554dc154b9b9fb33f1faa94be336a09945a28c57aa4bcfe0f39b03dd7585c49269a SHA512 a40de47ecae68756c158c1c7b578fa2a5c13bf6f98626e863af31a20d7880ffd415d966280c00bfe726f496d913eb0fcf014dd4beb8c1dbe36ed9735a48bd01e +DIST htslib-1.20.tar.bz2 4779028 BLAKE2B def7a135f37a4c7a167ada554b92b0e0107ab3dcbdab69abdea387035159f40fb183477275c137b0d786fdfc7264303898f98c54acb1714f9b7cb21e22612143 SHA512 a156f5c895fdae77f976f463a2d4d1111dc056893ef45b7e9cf62e9115898bc8cb47465bb1779e534c26943df478892385d44646e97bd0fa67fceb83ef7a649b diff --git a/sci-libs/htslib/htslib-1.17.ebuild b/sci-libs/htslib/htslib-1.20.ebuild index 6f690363326b..2a38fa8634c8 100644 --- a/sci-libs/htslib/htslib-1.17.ebuild +++ b/sci-libs/htslib/htslib-1.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index 258a72594337..faf6a9284aaf 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,2 +1,2 @@ -DIST indilib-2.0.6.tar.gz 2793169 BLAKE2B ebbbc40074df8ea77b781d09d802506003e3f71ee9450730b145ff9d190d9a0d41bcb7db4449fb05f138d536b811d7fcbfd095516b2f73a163bd110335d3d14d SHA512 e00ca31f4bc2298529586e5c1cc35389e9dcc72f9b93a1c5a4594c4c3d11f72a63e02d228a582f4ee08b7986a8eed6ebe53cb19b25fa05ebe53243708d2a8ff5 DIST indilib-2.0.7.tar.gz 2843758 BLAKE2B dee94a40d4b3c5c4d994d945a3608a41765af14c4937d475bdf80dca5d5847b814e0d9a1060f39b15b109916dee45f1876ce8edd29588e209276e3b1bf6f3dd7 SHA512 292c0a5b8f07b24c42ea9424be19012c97317206b837d8601ec4d771fa35c314bf00712509f8199ee3da193ea12f0c3e90036a49deece304dc256cdeba60810d +DIST indilib-2.0.8.tar.gz 2851129 BLAKE2B 061ed06bbb122e5579d881ff76d84e6629045eb9972da68fb0c66554f453e7a0660c0017858b8626af70a114bf099c3f7397c6789f41ed99335bde0de767fb95 SHA512 a9b4c5efe9841c024a7ccc271b2de6626ee442d3543f621822522950cc7549def9de111e66e6d183e0a63bead6d1e211fa6025463f9ca4bad30b7a457c5f66b9 diff --git a/sci-libs/indilib/indilib-2.0.7.ebuild b/sci-libs/indilib/indilib-2.0.7.ebuild index 78c307accfed..982a14057620 100644 --- a/sci-libs/indilib/indilib-2.0.7.ebuild +++ b/sci-libs/indilib/indilib-2.0.7.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" diff --git a/sci-libs/indilib/indilib-2.0.6.ebuild b/sci-libs/indilib/indilib-2.0.8.ebuild index 77b317737296..79e844a4015a 100644 --- a/sci-libs/indilib/indilib-2.0.6.ebuild +++ b/sci-libs/indilib/indilib-2.0.8.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" diff --git a/sci-libs/jama/jama-1.2.5.ebuild b/sci-libs/jama/jama-1.2.5-r1.ebuild index 7d96ea39577f..f2dafa318d92 100644 --- a/sci-libs/jama/jama-1.2.5.ebuild +++ b/sci-libs/jama/jama-1.2.5-r1.ebuild @@ -1,27 +1,21 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit versionator - -MYP="${PN}$(replace_all_version_separators '')" -DOCPV=102 +EAPI=8 DESCRIPTION="Java-like matrix C++ templates" HOMEPAGE="https://math.nist.gov/tnt/" -SRC_URI="https://math.nist.gov/tnt/${MYP}.zip - doc? ( https://math.nist.gov/tnt/${PN}${DOCPV}doc.zip )" +SRC_URI="https://math.nist.gov/tnt/${PN}${PV//./}.zip + doc? ( https://math.nist.gov/tnt/${PN}102doc.zip )" +S="${WORKDIR}" LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" -DEPEND="app-arch/unzip" RDEPEND="sci-libs/tnt" - -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_install() { doheader *.h diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest deleted file mode 100644 index ab10fe6c757d..000000000000 --- a/sci-libs/keras-applications/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6 diff --git a/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild deleted file mode 100644 index 16e901fdb80a..000000000000 --- a/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="Keras deep learning library reference implementations of deep learning models" -HOMEPAGE="https://keras.io/applications/" -SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" - -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" diff --git a/sci-libs/keras-applications/metadata.xml b/sci-libs/keras-applications/metadata.xml deleted file mode 100644 index 00ca801f5326..000000000000 --- a/sci-libs/keras-applications/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <longdescription lang="en"> - Keras Applications is the applications module of the Keras deep learning library. It provides model definitions and pre-trained weights for a number of popular archictures, such as VGG16, ResNet50, Xception, MobileNet, and more. - </longdescription> - <upstream> - <remote-id type="github">keras-team/keras-applications</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest deleted file mode 100644 index 15b2d81619e5..000000000000 --- a/sci-libs/keras-preprocessing/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c99e1180c8c06d8fab4d6707890b1f24466d287f6da54d66b395e5e50c7aac67cc0abc8153fbfbeb4ffb0e79561bca528a6b81b SHA512 aae4d52accdfb9df260070336b1c5a628e57563978f7cb299aa67a6265f26eb44deb803cef795616a5e94cd8bcd2b9aa067570258fff96642b88cc0c701c3cec diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild deleted file mode 100644 index 120e85768ffc..000000000000 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYPI_PN="Keras_Preprocessing" -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models" -HOMEPAGE="https://keras.io/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" diff --git a/sci-libs/keras-preprocessing/metadata.xml b/sci-libs/keras-preprocessing/metadata.xml deleted file mode 100644 index 89bac5c2363d..000000000000 --- a/sci-libs/keras-preprocessing/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <longdescription lang="en"> - Keras Preprocessing is the data preprocessing and data augmentation module of the Keras deep learning library. It provides utilities for working with image data, text data, and sequence data. - </longdescription> - <upstream> - <remote-id type="github">keras-team/keras-preprocessing</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/kissfft/kissfft-131.1.0.ebuild b/sci-libs/kissfft/kissfft-131.1.0.ebuild index 453b134283b6..9fb779d33ddd 100644 --- a/sci-libs/kissfft/kissfft-131.1.0.ebuild +++ b/sci-libs/kissfft/kissfft-131.1.0.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~riscv ~x86" fi LICENSE="BSD" diff --git a/sci-libs/lapack/lapack-3.12.0-r1.ebuild b/sci-libs/lapack/lapack-3.12.0-r1.ebuild index c8770940f40e..3432143696f3 100644 --- a/sci-libs/lapack/lapack-3.12.0-r1.ebuild +++ b/sci-libs/lapack/lapack-3.12.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 # Some additional tests are run if Python is found -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake flag-o-matic fortran-2 python-any-r1 DESCRIPTION="BLAS, CBLAS, LAPACK, LAPACKE reference implementations" diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest index 4fcf5d210edf..811136e73542 100644 --- a/sci-libs/libcifpp/Manifest +++ b/sci-libs/libcifpp/Manifest @@ -1,6 +1,4 @@ -DIST libcifpp-5.1.1-components.cif.xz 58896016 BLAKE2B 2bf61944fe6b11325df3c6c32eaabeb27b0f117eed362dd2eba51f623f4054d142ee84aeb04908322b7aebd30a1bd17da969eeda953f7423cca922006fe767d2 SHA512 d4103ac0b0ae5698dd4c17e452ea35871c4854827d3a2ee93f00b73b6f57b87ee2278b44ec0501f818dfc34284b4c19d4617ba3a98df9552da5ebedaa59c9622 -DIST libcifpp-5.1.1.tar.gz 2244833 BLAKE2B 3a5feada63ee123dbed1ba776d0248569f46bbc2d39748db7d3cdfdfb66c89e08c54cdf5133182978e9ef4808c19adfc794ee895a95e882f0d5ff3d173e57311 SHA512 3e988d0e4f24174fb47274b0feaae5a8a793441efb9c8273b328f412fbd29ee082cd91e19f19008069ebfd3507c83f7945dc33fc015784727603f987091eaa5c -DIST libcifpp-5.1.2-components.cif.xz 59092332 BLAKE2B 3672ca8e9553be80822ca7d7398fd3b73b14b1bf375e63f3a7aef33c2ee92d837c9ca08b3a756d838c512ac5918a0537d70e9a422331fafaf0ff77ecf2134515 SHA512 b2d3507d339d8467b10d0a638a5b86e75ed73fb64fee854aefeb2f0ce999e6a99755af30483749ce75e8a4ce63536111bd2a7a5f698dfc86d1a2be3d243304ce -DIST libcifpp-5.1.2.tar.gz 2244795 BLAKE2B 7bec9f901c112fabf86c9ce691229f42dcf854be4c99bdf09dbe7dd0d0a3a7e92831cb2b72afa4debc1ce8b1a3a33e27cceda048adca6805802189e0ad50349c SHA512 3adb801ed52b250f6779228288a2c2926c1c7d8d0eff0bb6ed610b4258de8537253d2ce95208e8682b2eb8d0c09ecb53b6269c24bdce907360d9478c6c8c3c1b DIST libcifpp-5.2.2-components.cif.xz 60754468 BLAKE2B 899120c2d6749fb2da9be94de8665f4e961d08c101b33bce98b84bf126b32d43bb79c88da98fb926047522a6f138512dcc59df698f57a83b716e039d422308d4 SHA512 d861b83f8b363f2e64ccf073bae768d73f9f57ec2674bf30d43b05fc9a32d235e26c888faaa02b6276e0734632b237b6dd00d8b966dd63b4fcf6562ebcf41cfc DIST libcifpp-5.2.2.tar.gz 2277238 BLAKE2B a31af09bed7f1dbd6f610e104f0a8439742c863bc58b3680c058cb570a1f93fbcd6d23f29a372aafbb7166a4d86b2590cd24e092b1cc7af25bd09bbe437c93eb SHA512 2bbe9b13fd0ce8f686b5fa9e1675a41cc37c954cd9d80326fcc7c5f4c767be95dd71f6ddc3e841b6102214cd66205303515fa0750683e539f48b038a32a51af9 +DIST libcifpp-7.0.4-components.cif.xz 62591092 BLAKE2B f5fc502cfb0d5c33c2218a02ccbf652c87f0d9d0ac93a8f2eb7c5a7e1e301555cb641f3df815fefbb998ca00f0b04f4fd39de2023dd69ca88de29a814208cd70 SHA512 6f85b84b9e4c63b134dedbc41a6a3ba4a7bec6a66b0ce1fcc9248c06b3e5600b8fe31c5ed72722cb40cb431227f17bb9f485e7b471c84efa313b04adfb161ec2 +DIST libcifpp-7.0.4.tar.gz 2598838 BLAKE2B db6e4b1573d243c511f15ea1fc28867c8a57eb1050c24a59c12a4608b59890ee567569ca4035daead7e74d206a77bb280c56d54ef8b050fe297ccd75cf48ffeb SHA512 6957b3e3ace855c22923391cfd05db40399b6b84fb194ccceaf7b460493ee8576573056296eb06fecf9e6e83c590776fdd5a09f06bb316de61f44468d2a53392 diff --git a/sci-libs/libcifpp/libcifpp-5.1.2.ebuild b/sci-libs/libcifpp/libcifpp-5.1.2.ebuild deleted file mode 100644 index 47d08fc49c68..000000000000 --- a/sci-libs/libcifpp/libcifpp-5.1.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2023 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" -# 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.xz -" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-cpp/eigen:3 - dev-libs/boost:= -" -RDEPEND="${DEPEND}" - -src_configure() { - cp "${WORKDIR}"/${P}-components.cif data/components.cif || die - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCIFPP_DOWNLOAD_CCD=OFF - -DCIFPP_INSTALL_UPDATE_SCRIPT=OFF - -DENABLE_TESTING="$(usex test)" - ) - cmake_src_configure -} diff --git a/sci-libs/libcifpp/libcifpp-5.1.1.ebuild b/sci-libs/libcifpp/libcifpp-7.0.4.ebuild index 8d30793f975e..8c10d84a2291 100644 --- a/sci-libs/libcifpp/libcifpp-5.1.1.ebuild +++ b/sci-libs/libcifpp/libcifpp-7.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="Code to work with mmCIF and PDB files" HOMEPAGE="https://github.com/PDB-REDO/libcifpp" # Update components file on every bump -# ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz +# https://files.wwpdb.org/pub/pdb/data/monomers/components.cif.gz SRC_URI=" https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz @@ -20,19 +20,26 @@ IUSE="test" RESTRICT="!test? ( test )" DEPEND=" - dev-cpp/eigen:3 + >=dev-cpp/eigen-3.4.0:3 dev-libs/boost:= + sys-libs/zlib + test? ( dev-cpp/catch:0 ) " RDEPEND="${DEPEND}" +src_prepare() { + # https://github.com/PDB-REDO/libcifpp/issues/59 + sed -i -e '/unit-3d/d' test/CMakeLists.txt || die + cmake_src_prepare +} + src_configure() { - cp "${WORKDIR}"/${P}-components.cif data/components.cif || die + cp "${WORKDIR}"/${P}-components.cif rsrc/components.cif || die local mycmakeargs=( -DBUILD_SHARED_LIBS=ON - -DCIFPP_DOWNLOAD_CCD=OFF -DCIFPP_INSTALL_UPDATE_SCRIPT=OFF - -DENABLE_TESTING="$(usex test)" + -DBUILD_TESTING="$(usex test)" ) cmake_src_configure } diff --git a/sci-libs/libqalculate/libqalculate-4.8.1.ebuild b/sci-libs/libqalculate/libqalculate-4.8.1.ebuild index eebf39f1b7ff..11f18e6d5570 100644 --- a/sci-libs/libqalculate/libqalculate-4.8.1.ebuild +++ b/sci-libs/libqalculate/libqalculate-4.8.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz LICENSE="GPL-2+" # SONAME changes pretty often on bumps. Check! SLOT="0/22" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +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 )" diff --git a/sci-libs/libticables2/libticables2-1.3.5.ebuild b/sci-libs/libticables2/libticables2-1.3.5-r1.ebuild index 7f0e4f959203..f71abc217606 100644 --- a/sci-libs/libticables2/libticables2-1.3.5.ebuild +++ b/sci-libs/libticables2/libticables2-1.3.5-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -17,11 +17,13 @@ IUSE="debug doc nls static-libs usb" RDEPEND=" dev-libs/glib:2 usb? ( virtual/libusb:1 ) - nls? ( virtual/libintl )" - -DEPEND="${RDEPEND} + nls? ( virtual/libintl ) +" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt ) @@ -31,23 +33,24 @@ src_prepare() { } src_configure() { - # --disable-libusb $(use_enable usb libusb10) would enable virtual/libusb:1 - econf \ - --disable-rpath \ - $(use_enable static-libs static) \ - $(use_enable debug logging) \ - $(use_enable nls) \ - $(use_enable usb libusb) \ + local myeconfargs=( + --disable-rpath + $(use_enable static-libs static) + $(use_enable debug logging) + $(use_enable nls) + $(use_enable usb libusb) $(use_enable usb libusb10) + ) + econf "${myeconfargs[@]}" } src_install() { use doc && HTML_DOCS+=( docs/html/. ) default - find "${D}" -name '*.la' -delete || die + find "${D}" -type f -name '*.la' -delete || die } pkg_postinst() { - elog "Please read README in ${EROOT%/}/usr/share/doc/${PF}" + elog "Please read README in ${EROOT}/usr/share/doc/${PF}" elog "if you encounter any problem with a link cable" } diff --git a/sci-libs/med/med-4.1.1-r3.ebuild b/sci-libs/med/med-4.1.1-r3.ebuild index c5d4f76fecce..3fc844af69b3 100644 --- a/sci-libs/med/med-4.1.1-r3.ebuild +++ b/sci-libs/med/med-4.1.1-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 FORTRAN_NEEDED=fortran -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake flag-o-matic fortran-2 python-single-r1 diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild index 1a1079b72566..dddb7002fbd6 100644 --- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild +++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.unidata.ucar.edu/netcdf-cxx/${PV}/${PN}4-${PV}.tar.gz LICENSE="UCAR-Unidata" SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples" # 6 out of 9 fail, reported upstream #RESTRICT="test" diff --git a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild index 458001188497..45758fb6ef38 100644 --- a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild +++ b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV} LICENSE="UCAR-Unidata" # SONAME of libnetcdf.so SLOT="0/19" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd" RESTRICT="!test? ( test )" @@ -89,8 +89,9 @@ src_configure() { } src_test() { - [[ -f "${BUILD_DIR}/nc_test4/run_par_test.sh" ]] && \ - sed -e 's/mpiexec/mpiexec --use-hwthread-cpus/g' -i "${BUILD_DIR}/nc_test4/run_par_test.sh" || die + if [[ -f "${BUILD_DIR}/nc_test4/run_par_test.sh" ]]; then + sed -e 's/mpiexec/mpiexec --use-hwthread-cpus/g' -i "${BUILD_DIR}/nc_test4/run_par_test.sh" || die + fi cmake_src_test } diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild index bd1b810d4ad8..4788982d8935 100644 --- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild +++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) FORTRAN_NEEDED="test" inherit python-r1 cmake fortran-2 diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index 9b84f011ad21..9d273cf27dc6 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -1,3 +1 @@ -DIST onnx-1.14.1.tar.gz 11570627 BLAKE2B df478219b5d557ad7e0717377996eefc02baa88a89d9681b17e00670e42fa3c8e47db0f5c5fdfab682fa7d80032559da8276c5106a91a7599d190427e2b6e4a8 SHA512 f846fffb286c4aeadc01462f220515f0a5c2ce1cbec849da7092a08c2676f8308af7315318a2866e9182f9aed719984ef95a9ddc69ffe0e62e40664395df5efd -DIST onnx-1.15.0.tar.gz 12360484 BLAKE2B 4d35b82c128a69124b9bfcb3e56b3d584b7451ae739a91039e201dd485efa3e90e34e6cf135993317622f8f524160a38556231b2b0561e93d8cd0487abf35c1b SHA512 b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd DIST onnx-1.16.0.tar.gz 12428161 BLAKE2B b0d16212c527078fcbe46af8efaf8bfccb0a22825cfee3c88728314599bc90f5b43ae407cc9ec10300ed19367dff769a5d6ba29d2faa61fd8e27029e2d64e83a SHA512 ef641447d8d6c4ed9f083793fe14a8568d6aa7b9b7e7b859a4082e9b892acd801230da2027d097ceaa0d68bbd37b2422b89bb7d1d55d5c3b5955c0f9c7c657c5 diff --git a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch b/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch deleted file mode 100644 index 239e0bd3a56a..000000000000 --- a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2023-09-01 12:19:40.772172388 +0200 -+++ b/CMakeLists.txt 2023-09-01 12:19:53.422188861 +0200 -@@ -58,7 +58,7 @@ - # Required to use /std:c++17 or higher on Windows - # For other platforms, set C++11 as standard for the whole project - if(NOT MSVC) -- set(CMAKE_CXX_STANDARD 11) -+ set(CMAKE_CXX_STANDARD 14) - else() - string(APPEND CMAKE_CXX_FLAGS " /std:c++17") - endif() diff --git a/sci-libs/onnx/files/onnx-1.14.1-musl.patch b/sci-libs/onnx/files/onnx-1.14.1-musl.patch deleted file mode 100644 index 04748ed67e6a..000000000000 --- a/sci-libs/onnx/files/onnx-1.14.1-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/onnx/checker.cc 2024-02-18 15:30:03.316320035 +0100 -+++ b/onnx/checker.cc 2024-02-18 15:31:05.715473732 +0100 -@@ -184,7 +184,7 @@ - } - std::string data_path = path_join(ctx.get_model_dir(), relative_path); - // use stat64 to check whether the file exists --#if defined(__APPLE__) || defined(__wasm__) -+#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__) - struct stat buffer; // APPLE does not have stat64 - if (stat((data_path).c_str(), &buffer) != 0) { - #else diff --git a/sci-libs/onnx/metadata.xml b/sci-libs/onnx/metadata.xml index 2a58de7a87a9..e06b5c6e88c2 100644 --- a/sci-libs/onnx/metadata.xml +++ b/sci-libs/onnx/metadata.xml @@ -5,6 +5,9 @@ <email>tupone@gentoo.org</email> <name>Tupone Alfredo</name> </maintainer> + <use> + <flag name="disableStaticReg">Disable Static Registration</flag> + </use> <upstream> <remote-id type="github">onnx/onnx</remote-id> </upstream> diff --git a/sci-libs/onnx/onnx-1.14.1-r2.ebuild b/sci-libs/onnx/onnx-1.14.1-r2.ebuild deleted file mode 100644 index e6ecbfd239bc..000000000000 --- a/sci-libs/onnx/onnx-1.14.1-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{9..12} ) -inherit distutils-r1 cmake - -DESCRIPTION="Open Neural Network Exchange (ONNX)" -HOMEPAGE="https://github.com/onnx/onnx" -SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="python" -RESTRICT="test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - python? ( - ${PYTHON_DEPS} - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ) - dev-libs/protobuf:= -" -DEPEND="${RDEPEND}" - -BDEPEND="python? ( - ${DISTUTILS_DEPS} -)" - -PATCHES=( - "${FILESDIR}"/${PN}-1.14.0-cxx_14.patch - "${FILESDIR}"/${P}-musl.patch -) - -src_prepare() { - cmake_src_prepare - use python && distutils-r1_src_prepare -} - -src_configure() { - mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - -DONNX_USE_LITE_PROTO=ON - ) - cmake_src_configure - use python && distutils-r1_src_configure -} - -src_compile() { - cmake_src_compile - use python && CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile -} - -src_install() { - cmake_src_install - use python && distutils-r1_src_install -} diff --git a/sci-libs/onnx/onnx-1.15.0-r3.ebuild b/sci-libs/onnx/onnx-1.15.0-r3.ebuild deleted file mode 100644 index cd9731d69130..000000000000 --- a/sci-libs/onnx/onnx-1.15.0-r3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{9..12} ) -inherit distutils-r1 cmake - -DESCRIPTION="Open Neural Network Exchange (ONNX)" -HOMEPAGE="https://github.com/onnx/onnx" -SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -RESTRICT="test" - -RDEPEND=" - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-libs/protobuf:= -" -DEPEND="${RDEPEND}" - -src_prepare() { - eapply "${FILESDIR}"/${P}-hidden.patch - cmake_src_prepare - distutils-r1_src_prepare -} - -python_configure_all() -{ - mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - -DONNX_USE_LITE_PROTO=ON - -DONNX_BUILD_SHARED_LIBS=ON - ) - cmake_src_configure -} - -src_configure() { - distutils-r1_src_configure -} - -src_compile() { - mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - -DONNX_USE_LITE_PROTO=ON - -DONNX_BUILD_SHARED_LIBS=ON - ) - CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile -} - -python_compile_all() { - cmake_src_compile -} - -python_install_all() { - cmake_src_install - distutils-r1_python_install_all -} - -src_install() { - distutils-r1_src_install -} diff --git a/sci-libs/onnx/onnx-1.16.0.ebuild b/sci-libs/onnx/onnx-1.16.0-r1.ebuild index e5a6b1c71b41..16f073d9b4d3 100644 --- a/sci-libs/onnx/onnx-1.16.0.ebuild +++ b/sci-libs/onnx/onnx-1.16.0-r1.ebuild @@ -15,6 +15,7 @@ SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~riscv" +IUSE="disableStaticReg" RESTRICT="test" RDEPEND=" @@ -22,7 +23,8 @@ RDEPEND=" dev-python/pybind11[${PYTHON_USEDEP}] dev-libs/protobuf:= " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-cpp/abseil-cpp" src_prepare() { eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch @@ -36,6 +38,7 @@ python_configure_all() -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON -DONNX_BUILD_SHARED_LIBS=ON + -DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF) ) cmake_src_configure } @@ -49,6 +52,7 @@ src_compile() { -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON -DONNX_BUILD_SHARED_LIBS=ON + -DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF) ) CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile } diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 62ffefd253d6..9b9b818237e4 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1 +1,2 @@ DIST pcl-1.14.0.tar.gz 68662907 BLAKE2B 5e797666b2a6cd5b828b399592daaa78c3bcbc0968c1ec5dafe441717bb4067de4604cdab11d3317370c7f69a1b29db0cca6348e91697d16846ae44c1952ce3e SHA512 0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f +DIST pcl-1.14.1.tar.gz 68672885 BLAKE2B 207389d844ac2793f6f321504c05282ace2d8e51aaf0277c13fb11f5be22ac93f7e044f34fc2259aca7d7e34ae3b9b00287ee9df0d15f851f1f4b4bd651578c7 SHA512 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1.ebuild new file mode 100644 index 000000000000..46645bec9842 --- /dev/null +++ b/sci-libs/pcl/pcl-1.14.1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake cuda + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" +else + KEYWORDS="~amd64 ~arm" + SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz" + S="${WORKDIR}/${PN}-${P}" +fi + +HOMEPAGE="https://pointclouds.org/" +DESCRIPTION="2D/3D image and point cloud processing" +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials" +# tests need the gtest sources to be available at build time +RESTRICT="test" + +RDEPEND=" + >=sci-libs/flann-1.7.1 + dev-libs/boost:= + dev-cpp/eigen:3 + opengl? ( virtual/opengl media-libs/freeglut ) + openni? ( dev-libs/OpenNI ) + openni2? ( dev-libs/OpenNI2 ) + pcap? ( net-libs/libpcap ) + png? ( media-libs/libpng:0= ) + qhull? ( media-libs/qhull:= ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtopengl:5 + vtk? ( sci-libs/vtk[qt5] ) + ) + qt6? ( + !qt5? ( + dev-qt/qtbase:6[concurrent,gui,opengl] + vtk? ( sci-libs/vtk[-qt5,qt6] ) + ) + ) + usb? ( virtual/libusb:1 ) + vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) +" +DEPEND="${RDEPEND} + !!dev-cpp/metslib +" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + virtual/latex-base + ) + tutorials? ( + dev-python/sphinx + dev-python/sphinx-rtd-theme + dev-python/sphinxcontrib-doxylink + ) + virtual/pkgconfig" + +REQUIRED_USE=" + openni? ( usb ) + openni2? ( usb ) + tutorials? ( doc ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch + "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch +) + +src_prepare() { + if use cuda; then + cuda_src_prepare + cuda_add_sandbox -w + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DDOC_INSTALL_DIR=share/doc/${PF}" + "-DLIB_INSTALL_DIR=$(get_libdir)" + "-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)" + "-DWITH_CUDA=$(usex cuda TRUE FALSE)" + "-DWITH_LIBUSB=$(usex usb TRUE FALSE)" + "-DWITH_OPENGL=$(usex opengl TRUE FALSE)" + "-DWITH_PNG=$(usex png TRUE FALSE)" + "-DWITH_QHULL=$(usex qhull TRUE FALSE)" + "-DWITH_VTK=$(usex vtk TRUE FALSE)" + "-DWITH_PCAP=$(usex pcap TRUE FALSE)" + "-DWITH_OPENNI=$(usex openni TRUE FALSE)" + "-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)" + "-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)" + "-DWITH_DOCS=$(usex doc TRUE FALSE)" + "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)" + "-DBUILD_global_tests=FALSE" + ) + + if use qt5; then + mycmakeargs+=( "-DWITH_QT=QT5" ) + elif use qt6; then + mycmakeargs+=( "-DWITH_QT=QT6" ) + else + mycmakeargs+=( "-DWITH_QT=NO" ) + fi + + cmake_src_configure +} diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild deleted file mode 100644 index ca95b9fefd98..000000000000 --- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fortran-2 flag-o-matic toolchain-funcs - -MY_P="${PN}${PV//.}" - -DESCRIPTION="FORTRAN/C device-independent scientific graphic library" -HOMEPAGE="https://www.astro.caltech.edu/~tjp/pgplot/" -SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz" - -LICENSE="free-noncomm" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc motif static-libs tk" - -RDEPEND=" - media-libs/libpng:= - x11-libs/libX11:= - x11-libs/libXt:= - motif? ( x11-libs/motif:= ) - tk? ( dev-lang/tk:= )" -DEPEND="${RDEPEND} - doc? ( virtual/latex-base )" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}"/${PN}-drivers.patch - "${FILESDIR}"/${PN}-makemake.patch - "${FILESDIR}"/${PN}-compile-setup.patch - "${FILESDIR}"/${PN}-headers.patch - "${FILESDIR}"/${PN}-libpng15.patch - "${FILESDIR}"/${PN}-tk86.patch -) - -src_prepare() { - default - - # fix pointers for 64 bits - if use amd64 || use ia64; then - sed -e 's/INTEGER PIXMAP/INTEGER*8 PIXMAP/g' \ - -i drivers/{gi,pp,wd}driv.f || die "sed 64bits failed" - fi - - cp sys_linux/g77_gcc.conf local.conf - - sed -e "s:FCOMPL=.*:FCOMPL=\"$(tc-getFC)\":g" \ - -e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \ - -i local.conf || die "sed flags failed" - - if [[ "$(tc-getFC)" = if* ]]; then - sed -e 's/-Wall//g' \ - -e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \ - -i local.conf || die "sed drivers failed" - fi - - sed -e "s:/usr/local/pgplot:${EPREFIX}/usr/$(get_libdir)/pgplot:g" \ - -e "s:/usr/local/bin:${EPREFIX}/usr/bin:g" \ - -i src/grgfil.f makehtml maketex || die "sed path failed" - - use motif && sed -i -e '/XMDRIV/s/!//' drivers.list - use tk && sed -i -e '/TKDRIV/s/!//' drivers.list -} - -src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/862918 - # - # Upstream contact method is email. I have sent one. - filter-lto - - # GCC 10 workaround - # bug #722190 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - ./makemake . linux - # post makefile creation prefix hack - sed -i -e "s|/usr|${EPREFIX}/usr|g" makefile || die -} - -src_compile() { - emake \ - CFLAGS="${CFLAGS} -fPIC" \ - FFLAGS="${FFLAGS} -fPIC" \ - shared cpg-shared pgxwin_server pgdisp pgplot.doc - - use tk && emake CFLAGS="${CFLAGS} -fPIC" libtkpgplot.so - use motif && emake CFLAGS="${CFLAGS} -fPIC" libXmPgplot.so - - emake -j1 clean - use static-libs && emake all cpg - - if use doc; then - export VARTEXFONTS="${T}/fonts" - emake pgplot.html pgplot-routines.tex - pdflatex pgplot-routines.tex - pdflatex pgplot-routines.tex - fi - - # this just cleans out not needed files - emake -j1 clean -} - -src_test() { - # i can go to 16 - local i j - for i in 1 2 3; do - emake pgdemo${i} - # j can also be LATEX CPS... - for j in NULL PNG PS CPS LATEX; do - local testexe=./test_${j}_${i} - echo "LD_LIBRARY_PATH=. ./pgdemo${i} <<EOF" > ${testexe} - echo "/${j}" >> ${testexe} - echo "EOF" >> ${testexe} - sh ${testexe} || die "test ${i} failed" - done - done -} - -src_install() { - insinto /usr/$(get_libdir)/pgplot - doins grfont.dat grexec.f *.inc rgb.txt - echo "PGPLOT_FONT=${EPREFIX}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot - doenvd 99pgplot - - dolib.so libpgplot.so* - dobin pgxwin_server pgdisp - - # C binding - insinto /usr/include - doins cpgplot.h - dolib.so libcpgplot.so* - - if use motif; then - insinto /usr/include - doins XmPgplot.h - dolib.so libXmPgplot.so* - fi - - if use tk; then - insinto /usr/include - doins tkpgplot.h - dolib.so libtkpgplot.so* - fi - - use static-libs && dolib.a lib*pgplot.a - - # minimal doc - dodoc aaaread.me pgplot.doc - newdoc pgdispd/aaaread.me pgdispd.txt - - if use doc; then - dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc pgplot.html - dodoc pgplot-routines.pdf pgplot-routines.tex - docinto examples - dodoc -r examples/. cpg/cpgdemo.c - docompress -x /usr/share/doc/${PF}/examples - dodoc -r applications - docompress -x /usr/share/doc/${PF}/applications - if use motif; then - docinto pgm - dodoc -r pgmf/. drivers/xmotif/pgmdemo.c - docompress -x /usr/share/doc/${PF}/pgm - fi - if use tk; then - docinto pgtk - dodoc drivers/xtk/pgtkdemo.* - docompress -x /usr/share/doc/${PF}/pgtk - fi - fi -} diff --git a/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild index e42bace2cf5a..64ee3a5011c8 100644 --- a/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild +++ b/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz" LICENSE="free-noncomm" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc motif static-libs tk" RDEPEND=" diff --git a/sci-libs/plplot/files/plplot-5.15.0_p6-configure-c99.patch b/sci-libs/plplot/files/plplot-5.15.0_p6-configure-c99.patch new file mode 100644 index 000000000000..60bb7aaf4501 --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.15.0_p6-configure-c99.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/879761 +https://sourceforge.net/p/plplot/patches/37/ + +Avoid implicitly declaring exit. Future compilers will not support +implicit function declarations, so this cmake probe will always fail. + +--- a/cmake/modules/TestForHighBitCharacters.c ++++ b/cmake/modules/TestForHighBitCharacters.c +@@ -17,6 +17,6 @@ int + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) +- exit(1); +- exit (0); ++ return 1; ++ return 0; + } + diff --git a/sci-libs/plplot/plplot-5.15.0_p6.ebuild b/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild index 57b6884acdff..9ea598c98339 100644 --- a/sci-libs/plplot/plplot-5.15.0_p6.ebuild +++ b/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild @@ -120,6 +120,7 @@ src_prepare() { for p in $(<"${WORKDIR}"/debian/patches/series) ; do eapply -p1 "${WORKDIR}/debian/patches/${p}" done + eapply "${FILESDIR}"/${PN}-5.15.0_p6-configure-c99.patch # avoid installing license sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index f1df96691729..d70fba8fc67b 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -1,3 +1,2 @@ -DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747 SHA512 a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756 DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c diff --git a/sci-libs/pytorch/files/pytorch-2.1.1-emptyso.patch b/sci-libs/pytorch/files/pytorch-2.1.1-emptyso.patch deleted file mode 100644 index b2983609819a..000000000000 --- a/sci-libs/pytorch/files/pytorch-2.1.1-emptyso.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/setup.py 2023-04-05 11:23:00.713405789 +0200 -+++ b/setup.py 2023-04-05 11:23:36.900876249 +0200 -@@ -1037,10 +1037,6 @@ - extensions.append( - Extension(name="caffe2.python.caffe2_pybind11_state_hip", sources=[]), - ) -- if cmake_cache_vars["BUILD_FUNCTORCH"]: -- extensions.append( -- Extension(name="functorch._C", sources=[]), -- ) - if cmake_cache_vars["BUILD_NVFUSER"]: - extensions.append( - Extension(name="nvfuser._C", sources=[]), diff --git a/sci-libs/pytorch/pytorch-2.1.2-r1.ebuild b/sci-libs/pytorch/pytorch-2.1.2-r1.ebuild deleted file mode 100644 index 40a5e8ab3df1..000000000000 --- a/sci-libs/pytorch/pytorch-2.1.2-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_EXT=1 -inherit distutils-r1 prefix - -DESCRIPTION="Tensors and Dynamic neural networks in Python" -HOMEPAGE="https://pytorch.org/" -SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} -RDEPEND=" - ${PYTHON_DEPS} - ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/sympy[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND} - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" - -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-2.1.1-dontbuildagain.patch \ - "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ - "${FILESDIR}"/${PN}-2.0.0-global-dlopen.patch \ - "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ - "${FILESDIR}"/${PN}-1.13.0-setup.patch \ - "${FILESDIR}"/${PN}-2.1.1-emptyso.patch \ - - # Set build dir for pytorch's setup - sed -i \ - -e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \ - tools/setup_helpers/env.py \ - || die - distutils-r1_src_prepare - - hprefixify tools/setup_helpers/env.py -} - -python_compile() { - PYTORCH_BUILD_VERSION=${PV} \ - PYTORCH_BUILD_NUMBER=0 \ - USE_SYSTEM_LIBS=ON \ - CMAKE_BUILD_DIR="${BUILD_DIR}" \ - distutils-r1_python_compile develop sdist -} - -python_install() { - USE_SYSTEM_LIBS=ON distutils-r1_python_install -} diff --git a/sci-libs/stellarsolver/stellarsolver-2.5-r1.ebuild b/sci-libs/stellarsolver/stellarsolver-2.5-r1.ebuild index f60a2a9b7daf..c287cbf520bb 100644 --- a/sci-libs/stellarsolver/stellarsolver-2.5-r1.ebuild +++ b/sci-libs/stellarsolver/stellarsolver-2.5-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND=" diff --git a/sci-libs/volk/volk-3.1.2.ebuild b/sci-libs/volk/volk-3.1.2.ebuild index 0a400d90ff06..a6c27ce5a74e 100644 --- a/sci-libs/volk/volk-3.1.2.ebuild +++ b/sci-libs/volk/volk-3.1.2.ebuild @@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/gnuradio/volk.git" else SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~riscv ~x86" + KEYWORDS="amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-3" diff --git a/sci-libs/vtk/vtk-9.3.0.ebuild b/sci-libs/vtk/vtk-9.3.0.ebuild index 745cb1354799..e2f30ffb2241 100644 --- a/sci-libs/vtk/vtk-9.3.0.ebuild +++ b/sci-libs/vtk/vtk-9.3.0.ebuild @@ -8,7 +8,7 @@ EAPI=8 # properly before building. # - replace usex by usev where applicable -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_OPTIONAL=yes WEBAPP_MANUAL_SLOT=yes |