gentoo resync : 08.01.2021

5 files changed, 156 insertions, 9 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index e96f579db6a2..e3b41ef84752 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,10 +2,12 @@ AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67
 DIST numpy-1.19.2.zip 7310530 BLAKE2B a019c64809bd61071a4dd5e10c2cdf6927f392ebe58b45a08529295079bca68a683502aba89847578e122271d2fa4ea6d2d5461f1e58322f550cda863d36125b SHA512 56ae348f08818e30b6675df7d41a2b03687af452d7a96356fccfce2994843c7b61918946381c3af25fe03f209413d0378ee691fc38d805491a12c464e49bb59c
 DIST numpy-1.19.3.zip 7315638 BLAKE2B 77f5ab83bfc69fcdb1c1bc0735e46914619be9e8291eb8ded3d5fa98694080f5272692453803b3924b371611014655f4532c85126c29ce1a84a4b807371cbb17 SHA512 9595e5adbad5debc7edb9fe2d4c511111a92413b6c3e5086c7dfb2f68974c0493d2dd2cb1cb8b07486b1f4fbef324fbdfa54f80a4c4cab66215980a40440f79f
 DIST numpy-1.19.4.zip 7315971 BLAKE2B 4809ad6aaf7f9893ea6ed4c2456f4827aa5728b9dba00ed4c8e517267dd299933ca6c9205e3e31ef61ba25a6c13dde32dbe7d268c2d54391bd532d368bb3c5e8 SHA512 ae8e6b2792022c147159a11188f9702fa9fa9c9707c834da4f21aa43752451509b0a5b8807d93dfa86dff7e95c127dab20e4f372336a66f25f9b56c2869a486f
+DIST numpy-1.19.5.zip 7318340 BLAKE2B a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd5666640d08b1ec9919f86cc8e SHA512 dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-1.19.2.ebuild 3734 BLAKE2B 516cb3fcdd3d26da409ef8bf3522f8638ecaf4e02fff6025311d3fe874f114e95cfb88a0b167c4058d214aea6d805ea6b914d574e2af90b859901b94dd109832 SHA512 4e77f799e2600998180438b6cc6f7f3a224f5b342f78cab23bce5abee59b36f16e9646829a3ef9f3bce7daec6eaf8a07625369924b87dd4829cd0f7b60f26e9e
-EBUILD numpy-1.19.3.ebuild 3734 BLAKE2B 4b9b8959e74734c345637f661bd3b92bf05cd2c189cdb62867a1c535803e6081087d54f4287f8c678fb93ecbf392412d0f812f88c5cdca40eb00401945aa1b6c SHA512 5d09662fbfe7da320b3da3b39863f6f71383dc02b68aa20248fc377946757755e023b94ae267ee10c2e63dfd4e9bf03711a88c0b2f127ae4ed58fe6b70c412c7
-EBUILD numpy-1.19.4.ebuild 3735 BLAKE2B 92e140e6010ebc0b866082b0da267c4ccdd2e6c824895fd70669adf866e7779457a977d74fa54972f113fcbd9fcbec0e538ef59f04afc5ade1ed44d4766334c4 SHA512 70e637310264d4d34db4084fbe508286acd233c72d59ae51aad6d9a9a1f27e4cfb61ae61457cff4cb3e639143fb6f33e7119b67644d4fc758d0b2381312e4136
+EBUILD numpy-1.19.2.ebuild 3723 BLAKE2B 7e0963e7d7ee8b144607007e75fc25683f500ad8e397dfb7486171b1ebdc5403fc5f057d1a38c2247b545083c31e318d23e723275cc18ce8298210a6daef5b87 SHA512 aa186def7dc49040d38d282955480d619c6f4710f4cfa722c543da63297822112a4a1dcf53d2cfe046112056506d460610a814acf266459e1bd2dc11a95ea097
+EBUILD numpy-1.19.3.ebuild 3723 BLAKE2B 1bed9878cad546144d0cbaa2e4880d1338fca085cd5f78666c7c736ad6a98b5ea04f18bd36bbe5827824c5b69ed62aae7b640d2bc37f02a8b30fa9f7a1a63db6 SHA512 5c33d025cedba3d5db5be0b1a2f280ece082f3870fefbb54ba2ca6fe1d02b41bdc3325689aa542ede5e7d363bc89810ad52554022626690a75e9b69f2db8ec75
+EBUILD numpy-1.19.4.ebuild 3724 BLAKE2B 091f47bcb53503f8d9163f46cdc42a13a0d0864e4f4563c81165be9effa35d9d9948e08592437f3f621344e95f91e67029ac6de195720afd2ae5353f5eed92f4 SHA512 0895b1631a2ec82ad5bd059c0b7d4f1175e8aa4f1ee3bdb03d043aa21fdc9440ca46563cd92412e818058afc202e8ac29d70bbc414e96ba9db387f3e38d4d584
+EBUILD numpy-1.19.5.ebuild 3727 BLAKE2B 4b53792aaa504e71120f6a8261daab8c4a2f207ffc877770a90b766f4736320130ba7585e1721f671f0c9492fdfc2019f9f557f2f7bf834998ee0c6b81a9260b SHA512 b76dcfe4c843277931d57e5a7c71176fca3e921c1cd3b691fd973a6d891ab0983e000f0dcb077098defb8506f2367089c2ba579fe600059e3057b72ba5513b9f
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.2.ebuild b/dev-python/numpy/numpy-1.19.2.ebuild
index 48722d1cb9a4..bdeb53a49fdc 100644
--- a/dev-python/numpy/numpy-1.19.2.ebuild
+++ b/dev-python/numpy/numpy-1.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.19.3.ebuild b/dev-python/numpy/numpy-1.19.3.ebuild
index 848573d5b850..dadaf7382f37 100644
--- a/dev-python/numpy/numpy-1.19.3.ebuild
+++ b/dev-python/numpy/numpy-1.19.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.19.4.ebuild b/dev-python/numpy/numpy-1.19.4.ebuild
index 7dab416db9a1..333b3a347e35 100644
--- a/dev-python/numpy/numpy-1.19.4.ebuild
+++ b/dev-python/numpy/numpy-1.19.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.19.5.ebuild b/dev-python/numpy/numpy-1.19.5.ebuild
new file mode 100644
index 000000000000..0c509e824a4c
--- /dev/null
+++ b/dev-python/numpy/numpy-1.19.5.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="1.16.4"
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	"${EPYTHON}" -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}