From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/singularity/files/, games-simulation/singularity/
Date: Wed, 16 Apr 2025 10:59:54 +0000 (UTC) [thread overview]
Message-ID: <1744801000.e1e876fd7430f29c34a98ccb61d5ad8b6543121c.ionen@gentoo> (raw)
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
reply other threads:[~2025-04-16 11:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1744801000.e1e876fd7430f29c34a98ccb61d5ad8b6543121c.ionen@gentoo \
--to=ionen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox