gentoo resync : 25.08.2020

5 files changed, 8 insertions, 159 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 8507f1eb09f1..e3a8305f34b1 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -3,15 +3,13 @@ AUX numpy-1.16.5-setup.py-install-skip-build-fails.patch 916 BLAKE2B 0745e076d43
 AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
 DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
 DIST numpy-1.17.4.zip 6366657 BLAKE2B 89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f SHA512 f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
-DIST numpy-1.18.3.zip 5435268 BLAKE2B aaf14627ca24e27806e6a5498a8b91f85c2582794db2ef2ec315e88b107435aeb2e8f288c68ba00593150787d6deb887faa029f850df4c6cb65426499f7ee83f SHA512 afb14dec81ade556e10b7de372e9d7b01b4bf246609c5eea26ad76ce93e6d9caa95479ae70dbfb725f28ac4802f94203c92e1e991852d2866b5225fc9d68e68d
-DIST numpy-1.18.5.zip 5441636 BLAKE2B d11bbf3c38a4194942d024ef82d63aa80a3d9044480a54e1b25d57b26f4dd7936b8ddd9c8b2636e307392c96fc51cb687e7a0e32ea7df9c85d46d80be45bdb46 SHA512 ea1896535016d3b207152c503005bf82095cc82c263f7f32ea75ce2d9394724f9700cf2265f9fb1f38169c37a0fe63ef97e88f84637f11758c52c624eec3d141
 DIST numpy-1.19.0.zip 7296082 BLAKE2B e388a1b8aa8fa5e23b57c69c5aa5f2b7b286a69fca6007843adbfa374d541ace7875757a302e851bc41194f565390b52777fff13da8166e7a2c6b0a0f3efd29c SHA512 24f8847ff6b72dd44db197fbd80596677f9f3c5afcc87f30c41a4c0a2ccd4ee652ca630a537997ba8fe68c4919fa488e9d8cadd9a310e5356b017f6086055850
+DIST numpy-1.19.1.zip 7301568 BLAKE2B f7c17666d8cd4f477d7946be383d2ff1656c412e23dc49c55f94a6fcb95a6cffe6b4958169b1b27e027a7d674feb96de979d8bba4f1e3d9daef9b72e7f48cafa SHA512 ddc5f5e262d6f7f6e1a8879165860427baa237b6aad5b09d5b943a36bb0d5922424aac4c0e32a2cc3e14087bf6eb671988b6ff6df0d9ab8c89724e093220eead
 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.16.5-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993de72ea3495f3b41bc5a7ce2d39df3e92ac8f60e14a32cba17e062a97c45bc8c975e94c09a4213b4651f9c0d78bc SHA512 cc185d66671c12022ef77ad93117b01035302daad8bc71409e43ba5ed90ff1453b7ae05896aaf085fd94eee7abbd572e476e11996e16106b2fcb265aed274d73
-EBUILD numpy-1.17.4-r3.ebuild 3692 BLAKE2B 3066645644584c6cdeaeddb84da1ea811300e8f7df77efc643e39461253451fb3008d9194998db83f13648e1e79a6b06c85bc063678a1b76b1c3acf051583502 SHA512 622b8faddb286e75b85ca73cad6946ca6fc2fcf78f38bc38095ca0a0e038cdabe104681b51e093f6b1ed27602d5088b2f036494c217045368a0e3bd0ca7156ce
-EBUILD numpy-1.18.3.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
-EBUILD numpy-1.18.5.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
-EBUILD numpy-1.19.0.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
+EBUILD numpy-1.17.4-r3.ebuild 3563 BLAKE2B 638577e95e35d83b2f343e35c7035e3e7e4f6180e1d5ba4b2088febb5dc417acfaa17704d2b499ec2ff4196dc276a55f5050e6f43c01b9e55a94a991de305d6e SHA512 ed5d291db03806a28c16fc1011bf61a52cd81457b2d6825d94f0e3b2f11a32353e2ff7b93f2d0927bf81e710dc457ca9eea896159d6c52bb72fa3d598c1a1077
+EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
+EBUILD numpy-1.19.1.ebuild 3734 BLAKE2B 77a3823e986b7cb9fc4f29b8eb29988ad63c73d8d0a5cc40836339519b9d54978c725e4e68f6c191be2e47ef53bf6d53b916a9fb1246355b428ebe0e6e6aa2af SHA512 ec1db0b21abbe07d24267a4d773ed6473efb1b640aaf2eea874526971a75fae4dd263d0f13581756703b4a923c037239093dc266a64ef5d74678cedd3b562100
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.17.4-r3.ebuild b/dev-python/numpy/numpy-1.17.4-r3.ebuild
index 6c64e49ccdba..9a848fbc3731 100644
--- a/dev-python/numpy/numpy-1.17.4-r3.ebuild
+++ b/dev-python/numpy/numpy-1.17.4-r3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 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 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
@@ -103,11 +103,7 @@ python_prepare_all() {
 python_compile() {
 	export MAKEOPTS=-j1 #660754
 
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
 }
 
 python_test() {
diff --git a/dev-python/numpy/numpy-1.18.5.ebuild b/dev-python/numpy/numpy-1.18.5.ebuild
deleted file mode 100644
index eb27fd1bee00..000000000000
--- a/dev-python/numpy/numpy-1.18.5.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 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://www.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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.15[${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
-}
diff --git a/dev-python/numpy/numpy-1.19.0.ebuild b/dev-python/numpy/numpy-1.19.0.ebuild
index eb27fd1bee00..099367952cc5 100644
--- a/dev-python/numpy/numpy-1.19.0.ebuild
+++ b/dev-python/numpy/numpy-1.19.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.18.3.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
index eb27fd1bee00..e70cf23d73a1 100644
--- a/dev-python/numpy/numpy-1.18.3.ebuild
+++ b/dev-python/numpy/numpy-1.19.1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	app-arch/unzip
-	>=dev-python/cython-0.29.15[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
 	lapack? ( virtual/pkgconfig )
 	test? (
 		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]