gentoo auto-resync : 09:10:2022 - 07:31:31

3 files changed, 22 insertions, 17 deletions

diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 9249ee1a5c1f..59ccc23f4d76 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,11 +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.1.tar.gz 42019478 BLAKE2B aa7f9e8f354d2c73cfeb0e349562279ec323e6c16641c82c47080108d21f385acb1431c1f072e454a043f56e8fd708778fc34c0eddaceedca979f40b6b11e358 SHA512 1378a24c59b66e2818929acd015fe5408cdd57926d96b7b909d5eb7e2bb6bae942e8fe802f107c8b0901af9873b8e24461624ca0917867e24bb50c7d28e09e71
+DIST scipy-1.9.2.tar.gz 42068300 BLAKE2B 0962115990a12339d8b87eabbee02d52a52e57259fbe2e74884fa2f08d66d8b7505f84561f643b539603bc8bf4ef3bf73c3d908453fbb0c99f732c3a81f8a328 SHA512 5f8667aa66aa0b5fad689d960f742874ce09f830bfd5aa241917526f153fbc09c7f709bc84113f83283fcbb8a47113eb215478d9c3473f76d8f7dbf0989429a2
 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-r1.ebuild 2287 BLAKE2B 01f8dbe3bc789af389da8f7eb4853f3f1c84329368f7baa8542ec3da0ea8f13abcb7ea9b7048ade6c8978ed877abe7b305711123046000c6bead9eec9d2774a4 SHA512 9a328fa90b73836e297f975e9a67faf359a581ba5021c91fedc99d1054704fe8f63e1bb199e15749fd54f2f3f5641ca7f13ecf3b0955b2870ee32edbe99f0fb9
 EBUILD scipy-1.9.1.ebuild 2287 BLAKE2B 01f8dbe3bc789af389da8f7eb4853f3f1c84329368f7baa8542ec3da0ea8f13abcb7ea9b7048ade6c8978ed877abe7b305711123046000c6bead9eec9d2774a4 SHA512 9a328fa90b73836e297f975e9a67faf359a581ba5021c91fedc99d1054704fe8f63e1bb199e15749fd54f2f3f5641ca7f13ecf3b0955b2870ee32edbe99f0fb9
-EBUILD scipy-1.9.9999.ebuild 2334 BLAKE2B 78ba760091ee32ce1f3f8f35d7703a8a45b85a7600debfd27beae7f26e8ec598ad850ff790de7057dca3ac6b6a70a55aa1d05a26fe83af3d2a9ea4a7736177a3 SHA512 49051b56bb343a880cc18fd3d813ce3fb266355ad10fbc8f41b30958d2413c55bb2caade2cd1ebadd8c374d0d4bf1196790bf1f07dc603d07da0a33cca7570e2
+EBUILD scipy-1.9.2.ebuild 2349 BLAKE2B 37a3e76f0b2b3d43b6d3d88a8a6061aa8dbd28901d88b51c4b3b851dfb4e4930608ec57072af77e1d430f9a0c8ddbb76a60cbfc7240a5c637a729e9210adf529 SHA512 2d7fd770c079a35a73933caba60a807b4ca4fb586453232205c80cb2a4624751621900f602518ef1ee7f96971ddd9703f7e774985f8911348c229504613d82da
+EBUILD scipy-1.9.9999.ebuild 2339 BLAKE2B 8b34952534298e156de44cffe5552c1895c343095bf4ec0e9d199fc915dcff549ac9b44cae9255634b244f207396b31428f817b8a4920dcf8c8bafc6c89ac7d2 SHA512 fbdfaabc2de08aa51f6d27ca230c69c812590de18adaca11fb956ebac77d56e98c88a710f9916b88f1ae9e783ed4a89b4ed763fa5fd4b109829cddacbaa76da1
 MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/scipy-1.9.0-r1.ebuild b/dev-python/scipy/scipy-1.9.2.ebuild
index 3968a54a22ab..081b5f7652d5 100644
--- a/dev-python/scipy/scipy-1.9.0-r1.ebuild
+++ b/dev-python/scipy/scipy-1.9.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit fortran-2 distutils-r1 multiprocessing
@@ -38,13 +38,13 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 -hppa ~ppc64 ~riscv"
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc64 ~riscv ~x86"
 	fi
 fi
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-IUSE="doc"
+IUSE="doc +pythran"
 
 # umfpack is technically optional but it's preferred to have it available.
 DEPEND="
@@ -58,16 +58,15 @@ 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 )
+	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
 
 PATCHES=(
@@ -89,6 +88,10 @@ src_unpack() {
 	fi
 }
 
+src_configure() {
+	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
+}
+
 python_test() {
 	cd "${T}" || die
 
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
index e2718fe21ca6..06820b113911 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit fortran-2 distutils-r1 multiprocessing
@@ -38,13 +38,13 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 -hppa ~ppc64 ~riscv"
+		KEYWORDS="~amd64 ~arm64 -hppa ~ppc64 ~riscv"
 	fi
 fi
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-IUSE="doc"
+IUSE="doc +pythran"
 
 # umfpack is technically optional but it's preferred to have it available.
 DEPEND="
@@ -58,16 +58,15 @@ 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 )
+	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
 
 PATCHES=(
@@ -84,11 +83,15 @@ distutils_enable_tests pytest
 src_unpack() {
 	default
 
-	if [[ ${PV} != *9999 ]] && use doc; then
+	if use doc; then
 		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
 	fi
 }
 
+src_configure() {
+	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
+}
+
 python_test() {
 	cd "${T}" || die
 
@@ -96,10 +99,9 @@ python_test() {
 }
 
 python_install_all() {
-	if [[ ${PV} != *9999 ]] && use doc; then
-		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf )
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
 		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	fi
 
 	distutils-r1_python_install_all
 }