gentoo resync : 25.08.2020

4 files changed, 324 insertions, 2 deletions

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 7910e0790e21..0d594184be31 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -7,7 +7,15 @@ DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91
 DIST scipy-1.5.0-html.zip 23579592 BLAKE2B 6e35a881967d38db67278d6990fbb1912238bca05c7064585aaaf849861371680c2cd5d3e9a150301c29984aa12db0eeebf5f23cb7d2a438edb28fed9654ac79 SHA512 a1dcf9c2d003b1f722a216c8bf0fda7022765c01505343e86da64ec9a4dbda4eb7da74ad09147e5b79e610f090740d19bda6017d6f894f2566547a42e8aa97b3
 DIST scipy-1.5.0-ref.pdf 33694300 BLAKE2B a7701cdfd8f6da71b59efcefca5c080426b175976429cb64d47f05f42795fea3abb6764c2e2d1807f215c9e00ccd5b2de254f1c68269b266492dfaf76f887972 SHA512 3208ab84421fbec0597931c6050666e9da7d21c6e73a685f084e9570a39539e9c2e5f7fbdfe27951b2ba8e51a1bc42b06ddd6c906a6a13c81a34a16dc0672dda
 DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B f505e5f0627687aeefe0af0886b03eead9f6426f17bca21a3f73cc0d4957ac574e0123b86424ccf0d5f8f4a963b707a1443ddcd6e149f2a4e747daa55b1be95c SHA512 4c981a3125a88593cbc5a17417022a5db8f6ccb4c1c24e78afeb9bb26428b81d2d0fe9965caa418753b1bbbda2fa30533fa1307aac6ab168458d68f7b46049be
-EBUILD scipy-1.1.0.ebuild 4122 BLAKE2B 6c4d91c33b7f02a461f0b2805a859e160687d8a4e4792f3a12a44dcadfb33b056a705e836b2ef4fa9da36a41e7e79e285da6571b97e0172262b991dc5aa715f2 SHA512 0df59214221d5ad19b70ee60e965008f9ba598d234e1b6bda0c8f2cd99cf0eba7dc3a718bc32d01b3f5f194b2858fa04eabee4aa0012519ce43c322887a04b2c
+DIST scipy-1.5.1-html.zip 23582280 BLAKE2B 97b256bc7367836f35ce7e0ac47436dd72c1afe249dea1a2f437ea883e74ecb8f5bbe22e20bb804aac66b86fb35e8b4f0e329c44d9d601318ef1accc82e8e850 SHA512 eb0c7736d2bdc9f45926d19f4a22e1168d0f06e21b338cd7e7884af79c7634885350c510251d4cd1629b2a294003e93f8e71bafd8ec64c1aea4d4174c3946597
+DIST scipy-1.5.1-ref.pdf 33698325 BLAKE2B 6ff0d13474acf2960352580765c86ef54faa9bb616b4b8097665fa3b8a3a6033acb524d5bb76757b23d0ea9550b556293509a91e5cbeb7b0a388ea75d1bec29b SHA512 c0fbebb5dec19aebe7783507ccebf28134227096caad915e1f28f963386a07b1246fa624e4680691809c5ba31a09d3dd6e4f27f9e86f5985f8a7eecb1eea82d3
+DIST scipy-1.5.1.tar.gz 25575560 BLAKE2B e431a54f1810590b75d0f115bdbcd3c561d0d918664d91654fa4f2583d4d2807deae36b3293be0a5add650fb5d99f744e1d893d369f6053741d863e2826dcc3c SHA512 d46abaaa52e5521d8f3f6d79f58c8473a8649faa01e93d250d2ee19d5778e31c13aaa855bd8f059ddc1424ae13001f15a41f240fa6b0acf3ffd911ea30da1040
+DIST scipy-1.5.2-html.zip 23166876 BLAKE2B a90d6a2eb25c56147c0c1cccb58cddd230c20cd70dcc5c39b7307acaeac5320ff1c6ed46e3027ec40f604db503a90620cf87212e45f3158c667ec20d95bac649 SHA512 35c675821675844b163eacdaf448173edb78adb5e9f3e438a70809b8b59425a987fd3ed7d6f7863612111ece4a6a36504279ef4492166f5e24a9b2c7ea9d21e7
+DIST scipy-1.5.2-ref.pdf 33462200 BLAKE2B 5784612eb41221a02520778d72341702a7dd4ee8c0147592e170054107219b03af4ccebe1f5e2a57f90f3b892455f95ec45d8eac8e4a7155e21e9ae0526b302f SHA512 15961b7280eb903d2db7a05915b94b3c298cabf68a6694da217680e23fe621885dd169dc88a033ee001a89bc6e6b13ef787ec61009f6ffe38aeaa2dfb84f8a47
+DIST scipy-1.5.2.tar.gz 25423944 BLAKE2B 0a4987da0cde4f33bbb0e2be571b59e9064b1c6554c61c1655100abdecfde54d64845cd30c5b3fcac3ae7426572757aa9a66065dd3b48e6e4cdd4d0ea847868e SHA512 45463df30a0f6270d9f4cf52235f31607904a6ae1375e12600e7f1ab2d27b1dc25a6211b49dceb71506be22c756890adaf9f81d9e6be7455def86c9caf0dc923
+EBUILD scipy-1.1.0.ebuild 4112 BLAKE2B 1dec8bf858c2051c3ca18bd77759b5add6ee996331e14f1a8c1831be44f5a5b95340bdefccfba44f0753bef43e07ec445e93d2955dce05e305dc5cba505b0846 SHA512 e99d842e6d558907e0e17164edba323e94ff8fe12bbcab8f9c3f840c25a36822f9d507a2fd3ae30870aefbe8e143a2b90155c8c094bb91b62f99b89edf2fa2d2
 EBUILD scipy-1.4.1.ebuild 4150 BLAKE2B 4f7ee074825feb1c58c2d297b6817137c95b2c12b97112adfe4006996e6ca6a20325cc2b7e19c99ba09cf0dd9fc42cec9c917bc3abae0a89e4152a834326c9e6 SHA512 2f7473b792726c709f1a62b2d465168ffeba66891117c1d203f1dc2f1b2de6f9dfd945580e539ffdc2e5d8254bfcd0a05d5abdc0b1216b4e94a5b31f2adeb5bb
 EBUILD scipy-1.5.0.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
+EBUILD scipy-1.5.1.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
+EBUILD scipy-1.5.2.ebuild 4393 BLAKE2B 2275f198af444b4650a3cfedba5920d83953bf93314f281d451fe72cdb3aaaf1cb9b854f5a654e39d2056a8975b081bc79d90cdc58144f5aa10650d706487db5 SHA512 56762eea7116319f68c5e058a40800f461c08726682845b5666db76116c1f315b7a1f5dad0118d36584c798b9b2ec0fd81d171b1d575e574603134f95c089d8f
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index a4576826f4cd..119210dc4f00 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
diff --git a/sci-libs/scipy/scipy-1.5.1.ebuild b/sci-libs/scipy/scipy-1.5.1.ebuild
new file mode 100644
index 000000000000..21948a8eb2c5
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.5.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/sci-libs/scipy/scipy-1.5.2.ebuild b/sci-libs/scipy/scipy-1.5.2.ebuild
new file mode 100644
index 000000000000..a3d305b08469
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.5.2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	# TODO
+	sed -e 's:test_magic_square_sparse_no_presolve:_&:' \
+		-i scipy/optimize/tests/test_linprog.py || die
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}