gentoo auto-resync : 30:07:2022 - 15:10:23

5 files changed, 122 insertions, 29 deletions

diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 3f3b7dbaf94e..e8b1450073e0 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,9 +1,11 @@
 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.0.tar.gz 42016757 BLAKE2B ca25b3ad44091230c5ecdfa832b382a1f5449565aa460b169a886505e7583399d316fe48f420d45b9993e6522d46fbbd6405e08fcfb8dc02ed5febb2e09749e7 SHA512 03d38f3298e2ca2dcc376acb09593f47a007f2b166508b91cd6f3e3cc417fa3579084aaa806365afee8679b473340b0eba86b36def957da45be404c4b6607675
 DIST scipy-1.9.0rc3.tar.gz 42021439 BLAKE2B 148c5a2517ef18015123503837d921a24258996047b4c5df22a279febc98d0633bb8b6bd9c7b886db9458583e8a5c15886b6349e2095a0ed7d60a7c976d24145 SHA512 1e4f0eb3fc5d8cdc24c2e4f7ea8400f5db039d4a2bb7a7d7c4869392fbdca6836d4dfb0a1ead2452b177fe49a60aa7ef86d7d6aee596e001e870df79a5cbce04
 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_rc3.ebuild 1851 BLAKE2B ed4481800fed54aa595fa9b57991ae4d333dca1a58b4a7637b27a8e8a3531fa837afefced6e05ad51b8a98f26f3a423e7248e5123323fd53a1336d1912d956aa SHA512 0836886a7db479338ce97d85a1ec343336076370b080b9c2a138e6a15724e10a9c0db4d2c69b5ed433bb2f8c75c8e8f0922759b5b7474e5986352e58dfee59b3
-EBUILD scipy-1.9.9999.ebuild 1826 BLAKE2B 4a37e01a87ed6bc546614bab9509e5a59093c2c54b7cefdff3914c35cadf72caa20259347631b2f6ba3e9effb58ce00e7fef5df291abffbd74297461d1c40393 SHA512 9d23d1da0223a07e4fa51ebd3990ca2b782b3bfebe92e0a54d897cac2847648b5135e2b6f5a4b17dcc065388156d872d231e47694fa25c009fa223e629be740b
-MISC metadata.xml 1127 BLAKE2B 6019c7fe056a0198db927c1b149d5a60bd583a523d749e57c86ad899a880fd83e688e040cb693ec3f34be63cae1e5b785d5f6f7a378b98e992d6cb9368ea1b2c SHA512 f7c45d801c3344b3d8de3fabad26a95814cfdf92b604e8215bfac2cfd1cfb181cc8a9a9fa46c0b95c7fb55a34e44bab51c2d1cd7a5adcf421cd965a755722e73
+EBUILD scipy-1.9.0.ebuild 1924 BLAKE2B 0c837cf2f3a852f62525a84c67314d428db2bd983de168d8a2c300c9e6b71648809031db7e3038bf7c9b0f5c991db49577529cffb61ce2538139f50b654667be SHA512 e98214c1731dd1d97432f50a04ed0f5e73a3ed65a0a358eb163f51ab2b2e9e5904c6ff3367d8bfe6463e708bc59864fa1daca4b3bf97a67d4ea75e1e81e7a7d7
+EBUILD scipy-1.9.0_rc3.ebuild 1796 BLAKE2B 41ec3dc03509ee1f73cd9366eb0b39e24874b145d5463840af6c376159399174ae668f99794fa7f6da467549cfe12a513d03a76f5fb64c95e87815cd87a807fe SHA512 32e4d7b4b3e3e1e1a47ad081b458953f743f5d7dc630795a61f48e18511dcdba77921f682d9bb17a000e323eac164940b92d34f44a99c219a6170b08d6f7d614
+EBUILD scipy-1.9.9999.ebuild 1924 BLAKE2B 0c837cf2f3a852f62525a84c67314d428db2bd983de168d8a2c300c9e6b71648809031db7e3038bf7c9b0f5c991db49577529cffb61ce2538139f50b654667be SHA512 e98214c1731dd1d97432f50a04ed0f5e73a3ed65a0a358eb163f51ab2b2e9e5904c6ff3367d8bfe6463e708bc59864fa1daca4b3bf97a67d4ea75e1e81e7a7d7
+MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml
index 0192620473a3..727696087804 100644
--- a/dev-python/scipy/metadata.xml
+++ b/dev-python/scipy/metadata.xml
@@ -1,28 +1,29 @@
 <?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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-  SciPy is an open source library of scientific tools for Python. SciPy
-  supplements the popular numpy module, gathering a variety of high level
-  science and engineering modules together as a single package.
-  SciPy includes modules for graphics and plotting, optimization,
-  integration, special functions, signal and image processing, genetic
-  algorithms, ODE solvers, and others.
-</longdescription>
-  <use>
-    <flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
-    <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">scipy</remote-id>
-    <remote-id type="sourceforge">scipy</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+	SciPy is an open source library of scientific tools for Python. SciPy
+	supplements the popular numpy module, gathering a variety of high level
+	science and engineering modules together as a single package.
+	SciPy includes modules for graphics and plotting, optimization,
+	integration, special functions, signal and image processing, genetic
+	algorithms, ODE solvers, and others.
+	</longdescription>
+	<use>
+		<flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
+		<flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">scipy/scipy</remote-id>
+		<remote-id type="pypi">scipy</remote-id>
+		<remote-id type="sourceforge">scipy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/scipy/scipy-1.9.0.ebuild b/dev-python/scipy/scipy-1.9.0.ebuild
new file mode 100644
index 000000000000..ccb8c752ed10
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.0.ebuild
@@ -0,0 +1,84 @@
+# 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 -hppa"
+	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/meson-0.62.2
+	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
+)
+
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+)
+
+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_rc3.ebuild b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
index 66e0ae62dac4..577f837b091c 100644
--- a/dev-python/scipy/scipy-1.9.0_rc3.ebuild
+++ b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~amd64 -hppa"
 	fi
 fi
 
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
index 19c83a0756f4..ccb8c752ed10 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~amd64 -hppa"
 	fi
 fi
 
@@ -60,6 +60,7 @@ BDEPEND="
 	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/pythran[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
 	dev-util/patchelf
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
@@ -69,6 +70,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
 )
 
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+)
+
 distutils_enable_tests pytest
 
 python_test() {