gentoo resync : 28.04.2021

3 files changed, 45 insertions, 10 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7acd5b144842..b0967a0c9e6f 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,10 +1,11 @@
 AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
 AUX numpy-1.20.1-no-hardcode-blasv2.patch 2582 BLAKE2B 5057f925a12e6703ab5d9d4c342db80f7f5a7f02a5b5884bd9fac574dcadb9234901b08b1b2ca5bc5ba0345a58e896a241e3a48b4b050b2f5a1063324359d84c SHA512 4418b9c5ed3842848bc06a56ebbd7cd9261657e407775374f2f060944522128d8a5178888def6e4cf42ff6d81082d9cc1425d9553c5334ad4e728d0df9b86bc8
+AUX numpy-1.20.2-fix-ccompiler-tests.patch 1616 BLAKE2B 3e2796029854207187322b1061201e7f014472c64d8c66a2dd3f82ec2eed7311f5cc3351d98aeb4b8b75d95608853066a30394e5316bb91e443744f33d66966b SHA512 5ed01b466a0da96b5d7c56b78e420d6c589c48c20053b9da66344384fa93048f90e281d3ed5caa9325f6afe00ff48841b24abc926c75aacb8a6bd5418ed32117
 DIST numpy-1.19.5.zip 7318340 BLAKE2B a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd5666640d08b1ec9919f86cc8e SHA512 dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4
-DIST numpy-1.20.1.zip 7750776 BLAKE2B 0f3915f2e8dfa6e0e7a6251fcba5365379d91b448101513860573f07e1f3fa24b097177a333230d7cbea1f58afed1718346d0348d14344544fe063e4baa6786a SHA512 edd1be2df27940f050ebd8eeb7b053b9987849d3b4aa0cb3c75d2fe2318f358e1b37f3bafedc772c224021e9316ebce45e1b75aa0e35d248f8ba9a9112b57b86
+DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 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.5.ebuild 3719 BLAKE2B 89f1510bf7a43e52f697c67912be79c3bef0a1320eb35e26290c7f7556c630ab8555d029c931966a94598e33eb9f8c3b76a5a59ab1284df3d8386c63c843774f SHA512 3f6ca348191de750bcd92c5a1206d92fcf82333e58081f86eee56c3cb5730a9cdea6678973db3049273b7f3d1d6bf3812e154b218d69c144430a092b0779deff
-EBUILD numpy-1.20.1.ebuild 3727 BLAKE2B fafca319c164ac66f10193f4f364829d4a3ea3eb9e1e03b1261c3348b381e58b91700e12f70a7e026515f54acb1e06e93bca86e82d6eb7aa2f21c25e7e75603a SHA512 188b6584b9c3020768311c782920335386c714ecdb5b97fe1b832882c3df155e4b44fb2ff09a1c90ab5083318669e47aa696da42d31c6ca8fcb3953de05e5c88
+EBUILD numpy-1.20.2.ebuild 3741 BLAKE2B ee40697580172840895aa01c24fe0a8aba402bd7ea42b150bd3618b2c1009c6fc1a4c708206d72a8e1376af7463db2dd64b1f38e2ac32067f92d2988837e366b SHA512 c01f8c556083e8f6fd28db418cc3e459d8f418b9d312d56e186071f366fd29dbb941e07742e24eda6cd4407989e8b5eff7e186e6f2b139953e162884b95587c9
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch b/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch
new file mode 100644
index 000000000000..2312dd89a9b2
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch
@@ -0,0 +1,36 @@
+From 6f2f26e08c6e0d476593c82ad31d13847f30cbf4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 28 Mar 2021 10:00:14 +0200
+Subject: [PATCH] BUG: Fix test_ccompiler_opt when path contains dots
+
+Fix test_ccompiler_opt not to be confused by dots occurring on the path
+to the temporary directory, by using only the source file's basename
+when grabbing options.  Otherwise, the test can fail with mismatches
+such as:
+
+    E           AssertionError: 'sources_status' returns different targets than the compiled targets
+    E           ['AVX512F', 'AVX2'] != ['(20 2/TEMP/TMPB0YHSCAI/TEST_TARGETS AVX512F)', '(20 2/TEMP/TMPB0YHSCAI/TEST_TARGETS AVX2)']
+
+This is because our TMPDIR value includes numpy version, i.e. 1.20.2.
+The splitting happens on the first dot that is part of the directory
+path rather than test filename.
+---
+ numpy/distutils/tests/test_ccompiler_opt.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/distutils/tests/test_ccompiler_opt.py b/numpy/distutils/tests/test_ccompiler_opt.py
+index 287a683c8..d2b0a4c58 100644
+--- a/numpy/distutils/tests/test_ccompiler_opt.py
++++ b/numpy/distutils/tests/test_ccompiler_opt.py
+@@ -112,7 +112,7 @@ class _Test_CCompilerOpt(object):
+             gflags = {}
+             fake_objects = opt.try_dispatch([file])
+             for source, flags in fake_objects:
+-                gtar = source.split('.')[1:-1]
++                gtar = path.basename(source).split('.')[1:-1]
+                 glen = len(gtar)
+                 if glen == 0:
+                     gtar = "baseline"
+-- 
+2.31.1
+
diff --git a/dev-python/numpy/numpy-1.20.1.ebuild b/dev-python/numpy/numpy-1.20.2.ebuild
index fe497e494abe..c87ee1103a27 100644
--- a/dev-python/numpy/numpy-1.20.1.ebuild
+++ b/dev-python/numpy/numpy-1.20.2.ebuild
@@ -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 ~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="
@@ -46,7 +46,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.20.1-no-hardcode-blasv2.patch
+	"${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch
+	"${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch
 )
 
 distutils_enable_tests pytest
@@ -118,12 +119,9 @@ 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}"
+	cd "${TEST_DIR}/lib" || die
+	epytest \
+		--deselect 'numpy/typing/tests/test_typing.py::test_fail[array_constructors.py]'
 }
 
 python_install() {