commit: e1e876fd7430f29c34a98ccb61d5ad8b6543121c Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Apr 16 08:11:55 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Apr 16 10:56:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e876fd
games-simulation/singularity: backport numpy2 fix Closes: https://bugs.gentoo.org/936525 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../singularity/files/singularity-1.00-numpy2.patch | 10 ++++++++++ .../{singularity-1.00-r2.ebuild => singularity-1.00-r3.ebuild} | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/games-simulation/singularity/files/singularity-1.00-numpy2.patch b/games-simulation/singularity/files/singularity-1.00-numpy2.patch new file mode 100644 index 000000000000..d3133f161e5f --- /dev/null +++ b/games-simulation/singularity/files/singularity-1.00-numpy2.patch @@ -0,0 +1,10 @@ +https://bugs.gentoo.org/936525 +https://github.com/singularity/singularity/issues/346 +https://github.com/singularity/singularity/commit/57013b621d641ae9b0b2554918807a88b7727b87 +--- a/singularity/code/buyable.py ++++ b/singularity/code/buyable.py +@@ -185,3 +185,3 @@ + was_complete = self.cost_paid +- cost_paid = numpy.maximum(numpy.cast[int64](numpy.round(raw_paid)), ++ cost_paid = numpy.maximum(numpy.asarray(numpy.round(raw_paid), dtype=int64), + was_complete) diff --git a/games-simulation/singularity/singularity-1.00-r2.ebuild b/games-simulation/singularity/singularity-1.00-r3.ebuild similarity index 94% rename from games-simulation/singularity/singularity-1.00-r2.ebuild rename to games-simulation/singularity/singularity-1.00-r3.ebuild index 25d4ba471216..f20e05282bdc 100644 --- a/games-simulation/singularity/singularity-1.00-r2.ebuild +++ b/games-simulation/singularity/singularity-1.00-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -37,6 +37,10 @@ BDEPEND="app-arch/unzip" distutils_enable_sphinx docs distutils_enable_tests pytest +PATCHES=( + "${FILESDIR}"/${P}-numpy2.patch +) + python_install() { distutils-r1_python_install
