From 31bd8a03c025633f2b16fd1d9f1911e2e291735f Mon Sep 17 00:00:00 2001 From: Laszlo Valko Date: Tue, 15 Jun 2021 03:13:29 +0200 Subject: [PATCH] Fixed numpy. --- dev-python/numpy/Manifest | 2 +- dev-python/numpy/numpy-1.16.5-r1.ebuild | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 3c0f715..3c23540 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -4,5 +4,5 @@ DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b 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 4352 BLAKE2B a875c2357f5459296e09c33df4a0e5a83deaa2a26bb7340890692fae4df966b3f75022896d54b473cb4a790c04d0494a82ee7d6e72a6e2f241c0ef053ae86894 SHA512 762de229d5900ee63d5cc90178917185c4029f8636243ac43398f20c468b8e3f974dddd3b62358922095aabc4d8348df532ebdce9ec2c2f50602cc4911423e7b +EBUILD numpy-1.16.5-r1.ebuild 4452 BLAKE2B 28979efd08dcf36234cd17d443f2314e0b78c8cf8f700bf4613bc7eb21460c69dc0a95d3c462e2828d4e9fb1699b739adc6e507a48fd27972372547a420ab77e SHA512 17672cde0f70d2460d6c108b7df59ccaa971815d1ee9339b4eb47cc814fbd0dd0dda449725f7892755ae7251ee17f1082673496045ecc3eedda84add18bb7eea MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 diff --git a/dev-python/numpy/numpy-1.16.5-r1.ebuild b/dev-python/numpy/numpy-1.16.5-r1.ebuild index 2b4ae3d..c0f8c05 100644 --- a/dev-python/numpy/numpy-1.16.5-r1.ebuild +++ b/dev-python/numpy/numpy-1.16.5-r1.ebuild @@ -27,13 +27,13 @@ IUSE="doc lapack test" RESTRICT="!test? ( test )" RDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] lapack? ( virtual/cblas virtual/lapack )" DEPEND="${RDEPEND}" BDEPEND="app-arch/unzip - dev-python/setuptools[${PYTHON_USEDEP}] lapack? ( virtual/pkgconfig ) test? ( dev-python/pytest[${PYTHON_USEDEP}] @@ -107,8 +107,12 @@ python_prepare_all() { [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" fi + # remove f2py + cp setup.py setup.py.orig || die + grep -v 'f2py = ' setup.py.orig > setup.py || die + # don't version f2py, we will handle it. - #sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die + sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die # disable fuzzed tests find numpy/*/tests -name '*.py' -exec sed -i \