From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- dev-python/scipy/Manifest | 6 +-- dev-python/scipy/scipy-1.9.0_rc1.ebuild | 78 --------------------------------- dev-python/scipy/scipy-1.9.0_rc2.ebuild | 78 +++++++++++++++++++++++++++++++++ dev-python/scipy/scipy-1.9.9999.ebuild | 13 ++++-- 4 files changed, 90 insertions(+), 85 deletions(-) delete mode 100644 dev-python/scipy/scipy-1.9.0_rc1.ebuild create mode 100644 dev-python/scipy/scipy-1.9.0_rc2.ebuild (limited to 'dev-python/scipy') diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest index ad84673471ec..f04595fc3530 100644 --- a/dev-python/scipy/Manifest +++ b/dev-python/scipy/Manifest @@ -1,9 +1,9 @@ AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea -DIST scipy-1.9.0rc1.tar.gz 42045828 BLAKE2B 8ecb112f611d52a69564329764b63d6f97bdcf6ba2fedc32134fb9f0da0c7f91d8507136bd81e2193c8a796273019cf2cf1a0f6009f6ac0803924a27ad216c37 SHA512 74d0ec0b94d33da683549b9c56966ec58dc807a5b60101413530501d2b1e789209b1b0e6cbca0a3bd0317dd0911406efc900dee5f90f1ea71c9aefa00f4c2dbe +DIST scipy-1.9.0rc2.tar.gz 41994528 BLAKE2B a1f72c54dda09a2086756e61cf35be30485e5f237b8a5c339002aa6532017fd215e029e9762b8b669d36975d0df751f7cbe1b0d1da60e12376f70e706af4bdf7 SHA512 dce69ee783d6a234c0a9300af055a59a4de23ba4fedfd2aa16e8dfd244eff72a217c242b332ab500389b236d3bac81ebb202a9f0ed8d1cffa82c36290fd49f77 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763 -EBUILD scipy-1.9.0_rc1.ebuild 1820 BLAKE2B 92723d62cbeececd71f58242ad0e5277461e989fc7c580134e4ab6debe6bddea21842e4a933d3bda4db1947a7135f317dc8bff16c165eba6d08e6cf6a2835a05 SHA512 2e4bb9668ce70fd343ebdcf8f1562ad7e7b816ba4c95f15784392ca92b4188abe599aa5f634aad147790143a9e95b4f9e72b8a084876078bf3e641a1bac9c00c -EBUILD scipy-1.9.9999.ebuild 1716 BLAKE2B 792f32928ff5ab56eb65a750d93c73cf2d1fe3a36024582580c91f747d8b9ebaf3925aadd2eb9f1709021d11366555b1ed5cc403a5436eee931d80ccc0a7a76a SHA512 cdfa9cf32379faf35529a260f420a9b00e62c4324a0689315a3e9a7a6d6e6d289441ebf3fa90cb37a341afe2ca323c801da5a6c4a2c30cecc4e22b46c3706cc7 +EBUILD scipy-1.9.0_rc2.ebuild 1826 BLAKE2B 4a37e01a87ed6bc546614bab9509e5a59093c2c54b7cefdff3914c35cadf72caa20259347631b2f6ba3e9effb58ce00e7fef5df291abffbd74297461d1c40393 SHA512 9d23d1da0223a07e4fa51ebd3990ca2b782b3bfebe92e0a54d897cac2847648b5135e2b6f5a4b17dcc065388156d872d231e47694fa25c009fa223e629be740b +EBUILD scipy-1.9.9999.ebuild 1826 BLAKE2B 4a37e01a87ed6bc546614bab9509e5a59093c2c54b7cefdff3914c35cadf72caa20259347631b2f6ba3e9effb58ce00e7fef5df291abffbd74297461d1c40393 SHA512 9d23d1da0223a07e4fa51ebd3990ca2b782b3bfebe92e0a54d897cac2847648b5135e2b6f5a4b17dcc065388156d872d231e47694fa25c009fa223e629be740b MISC metadata.xml 1127 BLAKE2B 6019c7fe056a0198db927c1b149d5a60bd583a523d749e57c86ad899a880fd83e688e040cb693ec3f34be63cae1e5b785d5f6f7a378b98e992d6cb9368ea1b2c SHA512 f7c45d801c3344b3d8de3fabad26a95814cfdf92b604e8215bfac2cfd1cfb181cc8a9a9fa46c0b95c7fb55a34e44bab51c2d1cd7a5adcf421cd965a755722e73 diff --git a/dev-python/scipy/scipy-1.9.0_rc1.ebuild b/dev-python/scipy/scipy-1.9.0_rc1.ebuild deleted file mode 100644 index aa0db9c53032..000000000000 --- a/dev-python/scipy/scipy-1.9.0_rc1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit fortran-2 distutils-r1 multiprocessing - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - # Upstream is often behind with doc updates - DOC_PV=1.8.1 - MY_PV=${PV/_rc/rc} - MY_P=${PN}-${MY_PV} - - SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf - )" - S="${WORKDIR}"/${MY_P} - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +sparse" - -DEPEND=" - >=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:0= - virtual/cblas - virtual/lapack - sparse? ( sci-libs/umfpack:0= )" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}]" -# TODO: restore pythran optionality? -BDEPEND=" - dev-lang/swig - >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/pythran[${PYTHON_USEDEP}] - dev-util/patchelf - virtual/pkgconfig - doc? ( app-arch/unzip ) - test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch -) - -distutils_enable_tests pytest - -python_test() { - cd "${T}" || die - - epytest -n "$(makeopts_jobs)" --pyargs scipy -} diff --git a/dev-python/scipy/scipy-1.9.0_rc2.ebuild b/dev-python/scipy/scipy-1.9.0_rc2.ebuild new file mode 100644 index 000000000000..19c83a0756f4 --- /dev/null +++ b/dev-python/scipy/scipy-1.9.0_rc2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=meson-python +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="threads(+)" + +inherit fortran-2 distutils-r1 multiprocessing + +DESCRIPTION="Scientific algorithms library for Python" +HOMEPAGE=" + https://scipy.org/ + https://github.com/scipy/scipy/ + https://pypi.org/project/scipy/ +" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + # Need submodules, so git for now. + EGIT_REPO_URI="https://github.com/scipy/scipy" + EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" + EGIT_SUBMODULES=( '*' ) +else + # Upstream is often behind with doc updates + DOC_PV=1.8.1 + MY_PV=${PV/_rc/rc} + MY_P=${PN}-${MY_PV} + + SRC_URI=" + mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz + doc? ( + https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip + https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf + )" + S="${WORKDIR}"/${MY_P} + + if [[ ${PV} != *rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + fi +fi + +LICENSE="BSD LGPL-2" +SLOT="0" +IUSE="doc +sparse" + +DEPEND=" + >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] + sci-libs/arpack:0= + virtual/cblas + >=virtual/lapack-3.8 + sparse? ( sci-libs/umfpack:0= )" +RDEPEND="${DEPEND} + dev-python/pillow[${PYTHON_USEDEP}]" +# TODO: restore pythran optionality? +BDEPEND=" + dev-lang/swig + >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/pythran[${PYTHON_USEDEP}] + dev-util/patchelf + virtual/pkgconfig + doc? ( app-arch/unzip ) + test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch +) + +distutils_enable_tests pytest + +python_test() { + cd "${T}" || die + + epytest -n "$(makeopts_jobs)" --pyargs scipy +} diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild index a25a63827ff7..19c83a0756f4 100644 --- a/dev-python/scipy/scipy-1.9.9999.ebuild +++ b/dev-python/scipy/scipy-1.9.9999.ebuild @@ -26,15 +26,20 @@ if [[ ${PV} == *9999* ]] ; then else # Upstream is often behind with doc updates DOC_PV=1.8.1 + MY_PV=${PV/_rc/rc} + MY_P=${PN}-${MY_PV} SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz doc? ( https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf )" + S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + if [[ ${PV} != *rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + fi fi LICENSE="BSD LGPL-2" @@ -42,10 +47,10 @@ SLOT="0" IUSE="doc +sparse" DEPEND=" - >=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}] + >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] sci-libs/arpack:0= virtual/cblas - virtual/lapack + >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= )" RDEPEND="${DEPEND} dev-python/pillow[${PYTHON_USEDEP}]" -- cgit v1.2.3