From 25e5a6599437664a3eff8d9f8a966adc896e09e8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 11 Dec 2023 17:14:47 +0000 Subject: gentoo auto-resync : 11:12:2023 - 17:14:47 --- dev-python/Manifest.gz | Bin 270978 -> 270983 bytes dev-python/numpy/Manifest | 6 ++--- dev-python/numpy/files/numpy-1.26.1-alpha.patch | 25 --------------------- .../numpy/files/numpy-1.26.1-more-arches.patch | 16 +++++++++++++ dev-python/numpy/numpy-1.26.1.ebuild | 5 ++++- dev-python/numpy/numpy-1.26.2.ebuild | 5 ++++- 6 files changed, 27 insertions(+), 30 deletions(-) delete mode 100644 dev-python/numpy/files/numpy-1.26.1-alpha.patch create mode 100644 dev-python/numpy/files/numpy-1.26.1-more-arches.patch (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index fb98b28b3b97..9107cf97aaf5 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 3d61bd6e1116..d84c099ea265 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,6 +1,6 @@ -AUX numpy-1.26.1-alpha.patch 973 BLAKE2B 5ee4565f83c37f5f1c9f3ad26b8616c93c5d047ad8094753b3ed1309699ea4802d2269ebcf0f74525d934c594fb84d3c52f0eed0bcfa3a44f8b5009bffd535e2 SHA512 f8b0faf3b3e40eccbc1656c6969d7b6e665acd7f6f339c96cbf7edb7ad66f4e52a946599dde09d4f8effb6e9f4e66e94f6e59dead9c2bb837ec61037edc6c179 +AUX numpy-1.26.1-more-arches.patch 683 BLAKE2B dcf9cd87747981a010be254a49569108ddca41c9ccfebaa04694e832aced6f717bd5edd7a9e5853d6c89eea02fb46c48a534a13d9021d655fc82cc2bda40e7be SHA512 4ca8fafbe15d8f68090283ca1e60d23ccdc3a4ba6f607d9f83533dff44a229a8c92ef9acf886673a57438c6bb6b0e0e21b86de8ae9eba31be5599a9807ab24be DIST numpy-1.26.1.tar.gz 15651806 BLAKE2B 2b7fe13675b6f11b8f19c2dc671c84418fa959f403ff32c15ae6da37ae8137d062bb47db0180031c90f54451d69d640ec4ebfad0a4eefb32afc55df45c6824ab SHA512 abe5919029fc66961e8f44fdd503b54c291ce75b0d95e3f8bb61ee39a25d62142fbece5734fd7e9cbf65511f9d746fa61796f0d68e6dc2816c0e7747e286e505 DIST numpy-1.26.2.tar.gz 15664248 BLAKE2B 006e511e27c009f27bf4bf6c8c30c84a4bf0e8b1ff53f4e031089f28c1cfd168ec0d037952fe8f377f9a1d6e1ab642a84c095edeee5696b18053fd5cb7550586 SHA512 9986cd34dda921fbc152c3be0e39f003035787ea1e055452b9259d02c423d413080a0c7e4e19fd38d9e28f66d428719d6ebe784c24ae17249ff56494950daf4b -EBUILD numpy-1.26.1.ebuild 4484 BLAKE2B 2669fe60fbef0eaf4477a1fe96e3f214217a2be6e10b86efd1deec8bc9476af713343327d376cb6a116eeaf9f44f97813caa1c78ef6f7a58bb1c09c8258d059d SHA512 bb4165d0aeb16796a1abd874a6506560d9b5ad225ee5dcacdb500c0fdf51f95d86dfb5ebce10d7f8e86193bb68d2091daa6afc22046089a762313651f2842994 -EBUILD numpy-1.26.2.ebuild 4755 BLAKE2B a01738d7bfa0522b84f34de661784f304cf6b9ece29c46fabf68fad4b478ecf6ed7560ada0839c24e61061c46aaf8a4db02e1e52e9d83acb041eb2f29d71aadf SHA512 06b15be0b89ee29ae412926d4aec5f2591e34d5c590789a0e69f57727c271a480cc0183282b3fbeab65fedaa94fb12ff1ecac18297c2c45dd075c49ce2942db0 +EBUILD numpy-1.26.1.ebuild 4492 BLAKE2B 7ac29b9adf17c2529b2f0ad62c2a96d7c87d51d1ca7dc467b143ad64f477783ed9b3103f7dcc87d5a2d235e3d6ed97cac56cdfc5e809aa5331ae282fd058f335 SHA512 0fc32e2aea726a1d914b5db9fc8dee3f12030eba943529f71fdc84b070fe8fb81fa93f641aca9990642ec10b2ab45a32372a65527110ff31bafc913c5e243771 +EBUILD numpy-1.26.2.ebuild 4763 BLAKE2B 162d46dac6bb27b8881119df77e57a8ce028ab3f8678676bb1bf9de6e128d1fdbd1a7fda93c266ca8022f0e3f03ffa9655ab0baf238bd7f92f5700b44576178c SHA512 178e2b18afdeaa94b33aa97d8856dd62ac1c637e5611804556052ec1a5558875d2f549920f20eb4d48ad7cc440b8ce0099f8b6f35f9788221ba925ef14995e6d MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06 diff --git a/dev-python/numpy/files/numpy-1.26.1-alpha.patch b/dev-python/numpy/files/numpy-1.26.1-alpha.patch deleted file mode 100644 index a0b2ca2eda91..000000000000 --- a/dev-python/numpy/files/numpy-1.26.1-alpha.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/909738 -https://github.com/numpy/numpy/pull/25078 - -commit 43aaf2093d8dfb3c1fea5d409ea4aa1d0f77816f -Author: matoro -Date: Mon Nov 6 10:21:32 2023 -0500 - - BUG: alpha doesn't use REAL(10) - - Same as e.g. loongarch per gh-24904. At this point seems like it should - be more of an exclude list than an include one... - -diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py -index f352bbaa2..d17b052f9 100755 ---- a/numpy/f2py/crackfortran.py -+++ b/numpy/f2py/crackfortran.py -@@ -2452,7 +2452,7 @@ def _selected_real_kind_func(p, r=0, radix=0): - if p < 16: - return 8 - machine = platform.machine().lower() -- if machine.startswith(('aarch64', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')): -+ if machine.startswith(('aarch64', 'alpha', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')): - if p <= 33: - return 16 - else: diff --git a/dev-python/numpy/files/numpy-1.26.1-more-arches.patch b/dev-python/numpy/files/numpy-1.26.1-more-arches.patch new file mode 100644 index 000000000000..a6f622517521 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.26.1-more-arches.patch @@ -0,0 +1,16 @@ +https://github.com/numpy/numpy/pull/25078 +https://github.com/numpy/numpy/pull/25254 + +diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py +index f352bbaa2..d17b052f9 100755 +--- a/numpy/f2py/crackfortran.py ++++ b/numpy/f2py/crackfortran.py +@@ -2452,7 +2452,7 @@ def _selected_real_kind_func(p, r=0, radix=0): + if p < 16: + return 8 + machine = platform.machine().lower() +- if machine.startswith(('aarch64', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')): ++ if machine.startswith(('aarch64', 'alpha', 'arm64', 'loongarch', 'mips', 'power', 'ppc', 'riscv', 's390x', 'sparc')): + if p <= 33: + return 16 + else: diff --git a/dev-python/numpy/numpy-1.26.1.ebuild b/dev-python/numpy/numpy-1.26.1.ebuild index 25c71df50516..f31fdfc7dce1 100644 --- a/dev-python/numpy/numpy-1.26.1.ebuild +++ b/dev-python/numpy/numpy-1.26.1.ebuild @@ -49,7 +49,10 @@ BDEPEND=" >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/${PN}-1.26.1-alpha.patch" ) + +PATCHES=( + "${FILESDIR}/${PN}-1.26.1-more-arches.patch" +) EPYTEST_XDIST=1 distutils_enable_tests pytest diff --git a/dev-python/numpy/numpy-1.26.2.ebuild b/dev-python/numpy/numpy-1.26.2.ebuild index 845d598fd604..9af7c8427708 100644 --- a/dev-python/numpy/numpy-1.26.2.ebuild +++ b/dev-python/numpy/numpy-1.26.2.ebuild @@ -49,7 +49,10 @@ BDEPEND=" >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/${PN}-1.26.1-alpha.patch" ) + +PATCHES=( + "${FILESDIR}/${PN}-1.26.1-more-arches.patch" +) EPYTEST_XDIST=1 distutils_enable_tests pytest -- cgit v1.2.3