gentoo resync : 03.03.2021

3 files changed, 161 insertions, 2 deletions

diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index cee98e41047a..d6db9343fdcb 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -16,10 +16,14 @@ DIST scipy-1.5.4.tar.gz 25237512 BLAKE2B 719cfecd6794b037dc636793ba38a3b39f5fd1a
 DIST scipy-1.6.0-html.zip 23941941 BLAKE2B 3222e9b1e1aeebfd1ab0f8d179d25c25d6ab26a54c3d6c7f12d5cb24dd59af216685cb1db1d11980ca32c8e14595a1753b69438d8c7504f7c4fc1b386e1c944d SHA512 42cd5595e1f260bcd14d5ce159d9acd0eaefbcb1401270b90efe48b0e743681361dba5ee410e5932533bca03c19daaacb6042ef8edea9b2cccd5dae21a612072
 DIST scipy-1.6.0-ref.pdf 34332184 BLAKE2B 948a03372797915e47d5e8ce44a32dcacb3448a20e06c5233d3362f0f04f228e8f7505aa918dbbd9a50ad64adb7a17181acab6a726ab251b8e8acf245a1550d6 SHA512 fe4c316f91cffb10d14207882ceb7a1d3711b03ad74857d771d0ec244caad60f878902f7279f6688c947fd415762abbb5a7082c810dd85c73385e8f58fbc056c
 DIST scipy-1.6.0.tar.gz 27275413 BLAKE2B f65fca81a21a3077ead119123fc3bb2ed96aaacfee6f291473ef6780c291f3e9fee88d86501d4cb966f1d601fb7f0656956134f0437eb8fefb8030e762c363a5 SHA512 995ffaf56b713cdd4bdb98d8525b892e9ad84a511878b43213cb71a67f34d87c111da36cf1e0b044c75c0d5af64bfde4ad0f3e9c5e71cae2dbf053251f37064e
+DIST scipy-1.6.1-html.zip 23946591 BLAKE2B d3464c342b1d4f43e17e214c7557737913bf4131f88b9d569cff106c75dc7ebf0d065283792fddc189e2a3ddc322f1b2b4f38c6d313569f28395e79680060b58 SHA512 73561f9daa303c6e967f9b11952c6239dea7ff1a2fa02434354ac78fcffe7a552aa0f1043a17cb5c35a442def499eff199856cca8efa1415449cbf54f0d4913b
+DIST scipy-1.6.1-ref.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa18058d0dac480d0a000e9ea0b7ebcdd33c01adae17234dcdf630d4aef9078174127af46f1db55d5c14b3245346 SHA512 355f4681439c1720f45dca6badfe72d77edfca0962fd9b42df34f1cd8fff7121fa6e7f60570bb638abd3ba9693930fa46b25af862d8fc1568b508c6fdd785479
+DIST scipy-1.6.1.tar.gz 27346828 BLAKE2B 147d7b3f796023fe557f07b46eefa1b23631106556ff56bb0ab5640d7dccfa86fecc2031ba0571eee2560a9bf86705a5ef32527852650e6d0629a722574bf135 SHA512 778a7bca15bb880a3fd1c3d46ef753920335eca95fe5f2b8512883a2aec1bb8e9d8a8fdbf4fee90e823e31980408a51451cc53d4f10c632cd72faf2856c868c8
 EBUILD scipy-1.1.0.ebuild 4097 BLAKE2B 1e5c11336c35bd1a97e0ec15d8e4758a890f830bf4e529421da5d6f60962b318f4b2e4088ea3dabbac424ceb55beaeb78be1d0ffbb4e57c617a6264d7422ccef SHA512 91a4f1644fa44b6e438b7910bf9960a6729ac8c2a96566998edaf9b30d9bd0d52a224d53e2ea9e5eb086cb5f857e343aec07e56ac1ce6b6535abfe1ef30840e7
 EBUILD scipy-1.4.1.ebuild 4139 BLAKE2B 1a2f403c6ffc0339116db7c17dcb3965f120ae894d99eea94123573e72db8c6ee2c09a63dd2afd85eb2565fd4649ad8e12a7b211e59c6e7d21fc543031fda350 SHA512 8d98dac760d264e5d08eb2a64d54a54100f20b6a746275f8bc3337c56ce719f1f16ff9aeaca155f733e3eb7f0a72dee92d10ac7d3ee701b9624e00e59080ddad
 EBUILD scipy-1.5.2.ebuild 4381 BLAKE2B 8f625610784e22218a3156433bdb41d7ae70d872d7c3675632a5542f4cce0528e941bb9cd94264ddefeafd6eea315cfa1ea86d4675328b78c09f163129cc5927 SHA512 e7611bdd1f91af2d2adf7f55db99550368ac0ddab1aac83a018dd0e38eb257c07af5908c96dbafd82376a36a0eaeaff8448bf94f185fb14a1eaa31ba612feb30
 EBUILD scipy-1.5.3.ebuild 4382 BLAKE2B 7a33344b2c611098a2f13c970ef554643dcf19707754b20be2473b8dbfe8421e0675e891eb004cf0b34161b8e2220bf051972bd864c7cc2147e12756fd908a0f SHA512 2ca33651401e2d039bc8372d1a83198013e4cc673762d98b852033eb3ff0d077eceae8bbc87e35df0a5f34df3f6dd8e7ea6b535d3c87cb7a01787e89da858ee8
 EBUILD scipy-1.5.4.ebuild 4381 BLAKE2B 8f625610784e22218a3156433bdb41d7ae70d872d7c3675632a5542f4cce0528e941bb9cd94264ddefeafd6eea315cfa1ea86d4675328b78c09f163129cc5927 SHA512 e7611bdd1f91af2d2adf7f55db99550368ac0ddab1aac83a018dd0e38eb257c07af5908c96dbafd82376a36a0eaeaff8448bf94f185fb14a1eaa31ba612feb30
-EBUILD scipy-1.6.0.ebuild 4211 BLAKE2B ee63ef5ce1f5bb23dc5b10e6e1a388ee1f5f987807d86732cc3d35ef17dffaedd9950d2b1ddc6dd103efced4fef06c51a2d19e0f458067fbf38a6921173c8727 SHA512 a5541ad450a04be984abf628ae90ea4cc1b6f7383c19aa35e0eb56b3e6423acaf5ea9983ee27877614e1b9296ba5db9a10d54f9b1d91f25fb222db045f7e4d2f
+EBUILD scipy-1.6.0.ebuild 4209 BLAKE2B 1766143fc9b26994c4f2d33f354ef333a4fa6a1906fe4d1511fcadfcb50f34a5a61fb0da72c133c1d62b7d8cc6bfdcdc3d25950febdb2085f3302e5665eeea35 SHA512 489ef19e1eab7d76f22d494d79fcd9103b49d9b8287837f9c823cd4e4760301bfd0cdaf00ce578cd8e61cfb06b96e4746a0b95658cd03d8767d52205fae3140d
+EBUILD scipy-1.6.1.ebuild 4211 BLAKE2B ee63ef5ce1f5bb23dc5b10e6e1a388ee1f5f987807d86732cc3d35ef17dffaedd9950d2b1ddc6dd103efced4fef06c51a2d19e0f458067fbf38a6921173c8727 SHA512 a5541ad450a04be984abf628ae90ea4cc1b6f7383c19aa35e0eb56b3e6423acaf5ea9983ee27877614e1b9296ba5db9a10d54f9b1d91f25fb222db045f7e4d2f
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.0.ebuild b/dev-python/scipy/scipy-1.6.0.ebuild
index 65a1f0129c60..a1948aba7496 100644
--- a/dev-python/scipy/scipy-1.6.0.ebuild
+++ b/dev-python/scipy/scipy-1.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scipy/scipy-1.6.1.ebuild b/dev-python/scipy/scipy-1.6.1.ebuild
new file mode 100644
index 000000000000..65a1f0129c60
--- /dev/null
+++ b/dev-python/scipy/scipy-1.6.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+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/${P}/${PN}-html-${PV}.zip -> ${P}-html.zip
+		https://docs.scipy.org/doc/${P}/${PN}-ref-${PV}.pdf -> ${P}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${P}-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}"/${P}-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 "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}