6 files changed, 3 insertions, 243 deletions
diff --git a/dev-python/cysignals/Manifest b/dev-python/cysignals/Manifest
index 9963549d2146..65b7f1f48b75 100644
--- a/dev-python/cysignals/Manifest
+++ b/dev-python/cysignals/Manifest
@@ -1,9 +1,3 @@
-AUX cysignals-1.11.4-helper.patch 3049 BLAKE2B 26ea0fb57e855d2fbc302d8ba84200ae541f4e28015ed447531a814ffbfa4a967be98ea94c0c77333f1b4adf80a58afbc73812676d56db0d9832a79e8c5ff104 SHA512 282714ef674177af58b53db9541106fac0bd54238b7e55c2754bcd553928fbc189413304471a92288139d83297b4b70330b50d5b23fa8ea078f4f1bdddaa8535
-AUX cysignals-1.12.0-fix-building-against-me.patch 2519 BLAKE2B b103b4c22d1de1dc64dec968901e22a665be11d7330eee2c6b0bcb0f3cf08c9da82903197593f7e59c26a1979ed81321a3f665852177e027a46c9e7d815c8456 SHA512 cb4951adf9a51b2977cd70371276b0f44ae16d58d4dda6da87653684aceaeb08a2db685bfa9102bef5389de22d10fea813059be3749bd5c0d174dfa94b2ef8b8
-DIST cysignals-1.11.4.tar.gz 105100 BLAKE2B c21c5cae69332885dd4b9f13d0fbe9ab836466dd699f0d51908d129107ce4922f4076fafa8dce3650983fd69d25182464f9831545a8da3535699d36d198ec6a7 SHA512 b083a62bcca71634cdd21ca6c8d1363e7754ed97d6f2ad0280b0ae97fdf1264be3dc202acf67added4c12a0815420d9641269da1212b83472ea304883d3b85ab
-DIST cysignals-1.12.0.tar.gz 65857 BLAKE2B 4a9bb56c8491814480a9deae053eb13574b480245418c743b1a99cc4fbe4c784c35e8518707cd6ced22174f032444e38daee16ab933b044f8942da2d1c47cfab SHA512 c4575f9d07f4d4c1c27a2e953b12693758babe79000fe62e2423ae484695f0ee813ebc2868ec74aa6c2c4e85d074c3a0db1524ad4ca58e1250fd1d4ca8386692
 DIST cysignals-1.12.2.tar.gz 65828 BLAKE2B dff532fb0c95abe53331082c88f79edd3a7136501c2015272d83e0a5d29b51e26c007b06f3e4ead42eaa306c1219ccc207827dc58ff954514ebd7fdc47dd2d02 SHA512 9cbf3eb4a11724949f513b4409d136b0890f987f9a5d3c3324b12bddd85eb7226dd793a5b2ec383e9ee46fa59e55f9ca19b0fb4c02e0b6eab46e01607668a8cb
-EBUILD cysignals-1.11.4-r1.ebuild 782 BLAKE2B 97d3178eae47abda676386e6450e181412c827de3ce0e4a2f06694763726e2933c210f19b6d19bdb4a7868d6b28f26afd7490f2fd747335f699534446945c50d SHA512 d0041db24f25adae35fe82b58386c6257b32830e6e8934bab1b9ed07f34d017dc4d35262c6e70643ce13e019e1f8fd363cc3b415819641d2350e28dca69ffb38
-EBUILD cysignals-1.12.0-r1.ebuild 672 BLAKE2B 915acdbe62e82ea12424240249323c45df8c0fa9f4fd435a3946c6fe0052f6f3ab189990f4f2dd62981bf6bcc5cdf43e1e200fdc299b39c1b066866f8bd709e3 SHA512 20ee288b2bf2d0ab18cf13882206b60a5690cb2861a2b30744a130e30e2603112a8f64fd9c7e9b168dd44e7e205a409b4f5ac7f916f7c918d9cf6fe315520527
-EBUILD cysignals-1.12.2.ebuild 610 BLAKE2B 77c954d728f7ab9df33a086cf2bac80a7b548b0d1355cee7f783b649d2d21740537360a136b1e1ababdb5b2a6592f9fa578926bc6a8ad5d90de127c4fa87c1fc SHA512 79e13fadce3fb735599459ed476b0ec8f4ae7640252905dfe17cdf4a99c70dc0aaa6ea606d91edbde20f7d37c7a977592dba950edec85542a581ed4ae394bc85
+EBUILD cysignals-1.12.2.ebuild 609 BLAKE2B 81b61e98b0f87ec9a7fd47def318ee83b7c6710c5ccd122a7a4e1380f8992a64e0c0180fb03d6bce77ac066d5e55ec28cc18a8d586ef90c335938f3f752674a5 SHA512 64d119dfa703055ba0be282136368177a93c70f6a57788cc5eefb7ef85e7caa591af5153c1dbdc56d7bed8c861b7819959ba65cf4d65e76dbf8956530b835793
 MISC metadata.xml 1243 BLAKE2B 468b28828e1fa906f91a23ed5e2825a77e3bad500f71e58732074abedbb11bacd1dbd6d60e49531ba2d84efa43b49ce1665158a410d5ffdd079203c294588929 SHA512 7533b618a2b050df3122aae90cb0c1dded97b82c28baca8ab7c295e7d37bcbfd0e4a762233190651e8bbadd91d901b673716aa04cf2d61b1969b2bb7a9e3be3e
diff --git a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild b/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
deleted file mode 100644
index 7940ad35c445..000000000000
--- a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Interrupt and signal handling for Cython"
-HOMEPAGE="
-	https://github.com/sagemath/cysignals/
-	https://pypi.org/project/cysignals/
-"
-
-# setup.py has "or later"
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-DEPEND="
-	sci-mathematics/pari:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# https://github.com/sagemath/cysignals/pull/204
-	"${FILESDIR}/${P}-helper.patch"
-)
-
-python_test(){
-	local -x PATH="${BUILD_DIR}/scripts:${PATH}"
-	"${EPYTHON}" -B rundoctests.py src/cysignals/*.pyx || die
-}
diff --git a/dev-python/cysignals/cysignals-1.12.0-r1.ebuild b/dev-python/cysignals/cysignals-1.12.0-r1.ebuild
deleted file mode 100644
index fe0f2f6b4ac6..000000000000
--- a/dev-python/cysignals/cysignals-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Interrupt and signal handling for Cython"
-HOMEPAGE="
-	https://github.com/sagemath/cysignals/
-	https://pypi.org/project/cysignals/
-"
-
-# setup.py has "or later"
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-BDEPEND="
-	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-building-against-me.patch" )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cysignals/cysignals-1.12.2.ebuild b/dev-python/cysignals/cysignals-1.12.2.ebuild
index 85da267f5797..468d639fef67 100644
--- a/dev-python/cysignals/cysignals-1.12.2.ebuild
+++ b/dev-python/cysignals/cysignals-1.12.2.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
@@ -18,7 +18,7 @@ HOMEPAGE="
 # setup.py has "or later"
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 BDEPEND="
 	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cysignals/files/cysignals-1.11.4-helper.patch b/dev-python/cysignals/files/cysignals-1.11.4-helper.patch
deleted file mode 100644
index 0c09f236eccb..000000000000
--- a/dev-python/cysignals/files/cysignals-1.11.4-helper.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 2abd7ef94775b3320b6f1954b55168e06da0e6b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 6 Jul 2024 13:06:49 +0200
-Subject: [PATCH] Install cysignals-CSI-helper as package data for better
- portability
-
-Rather than installing `cysignals-CSI-helper.py` into a `share`
-directory and then trying to figure out the correct path to it, install
-it as Python package data and use the standard `importlib.resources`
-API to access it.  For Python versions older than 3.9,
-the `importlib_resources` backport is used instead.
-
-Fixes #200
----
- setup.py                                      |  4 +++-
- .../cysignals-CSI-helper.py                   |  0
- src/scripts/cysignals-CSI                     | 20 ++++++++++---------
- 3 files changed, 14 insertions(+), 10 deletions(-)
- rename src/{scripts => cysignals}/cysignals-CSI-helper.py (100%)
-
-diff --git a/setup.py b/setup.py
-index 7953170..7154a4a 100755
---- a/setup.py
-+++ b/setup.py
-@@ -215,7 +215,6 @@ setup(
-     packages=["cysignals"],
-     package_dir={"": "src"},
-     package_data={"cysignals": ["*.pxd", "*.h"]},
--    data_files=[(opj("share", "cysignals"), [opj("src", "scripts", "cysignals-CSI-helper.py")])],
-     scripts=glob(opj("src", "scripts", "cysignals-CSI")),
-     cmdclass=dict(
-         configure=configure,
-@@ -223,4 +222,7 @@ setup(
-         build_ext=build_ext,
-         bdist_egg=no_egg
-     ),
-+    install_requires=[
-+        "importlib_resources; python_version < '3.9'",
-+    ],
- )
-diff --git a/src/scripts/cysignals-CSI-helper.py b/src/cysignals/cysignals-CSI-helper.py
-similarity index 100%
-rename from src/scripts/cysignals-CSI-helper.py
-rename to src/cysignals/cysignals-CSI-helper.py
-diff --git a/src/scripts/cysignals-CSI b/src/scripts/cysignals-CSI
-index dd8b4e6..3896dca 100755
---- a/src/scripts/cysignals-CSI
-+++ b/src/scripts/cysignals-CSI
-@@ -41,6 +41,11 @@ from argparse import ArgumentParser
- from datetime import datetime
- from distutils.spawn import find_executable
- 
-+if sys.version_info >= (3, 9):
-+    import importlib.resources as importlib_resources
-+else:
-+    import importlib_resources
-+
- 
- def pid_exists(pid):
-     """
-@@ -65,15 +70,12 @@ def gdb_commands(pid, color):
-     cmds += b'import sys; sys.stdout.flush()\n'
-     cmds += b'end\n'
-     cmds += b'bt full\n'
--    cysignals_share = os.path.join(os.path.dirname(sys.argv[0]), '..',
--                                   'share', 'cysignals')
--    script = os.path.join(cysignals_share, 'cysignals-CSI-helper.py')
--    with open(script, 'rb') as f:
--        cmds += b'python\n'
--        cmds += b'color = %r; ' % color
--        cmds += b'sys_path = %r; ' % sys.path
--        cmds += f.read()
--        cmds += b'end\n'
-+    script = importlib_resources.files('cysignals') / 'cysignals-CSI-helper.py'
-+    cmds += b'python\n'
-+    cmds += b'color = %r; ' % color
-+    cmds += b'sys_path = %r; ' % sys.path
-+    cmds += script.read_bytes()
-+    cmds += b'end\n'
-     cmds += b'detach inferior 1\n'
-     cmds += b'quit\n'
-     return cmds
--- 
-2.45.2
-
diff --git a/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch b/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch
deleted file mode 100644
index a305936838d0..000000000000
--- a/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 7c05d63f87e6f7b9c3366939a6494aa3335381e8 Mon Sep 17 00:00:00 2001
-From: Ludo Pulles <ludo.pulles@gmail.com>
-Date: Fri, 6 Dec 2024 13:18:28 +0100
-Subject: [PATCH] Fix build issues
-
----
- example/meson.build       | 7 -------
- meson.build               | 5 -----
- src/cysignals/signals.pxd | 1 +
- src/cysignals/signals.pyx | 1 +
- src/cysignals/tests.pyx   | 1 +
- 5 files changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/example/meson.build b/example/meson.build
-index e40c614..ae3e120 100644
---- a/example/meson.build
-+++ b/example/meson.build
-@@ -15,13 +15,6 @@ print(cysignals.__file__.replace('__init__.py', ''))
- ).stdout().strip()
- cysignals = declare_dependency(include_directories: inc_cysignals)
- 
--# Make declarations in Cython code available to C include files
--add_project_arguments(
--  '-X preliminary_late_includes_cy28=True',
--  language: 'cython',
--)
--
--
- py.extension_module('cysignals_example',
-   sources: ['cysignals_example.pyx'],
-   install: true,
-diff --git a/meson.build b/meson.build
-index d66145b..5209bf2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -22,11 +22,6 @@ add_project_arguments('-DCYTHON_CLINE_IN_TRACEBACK=0', language: 'c')
- # Disable sanity checking in GNU libc
- # This is required because of false positives in the longjmp() check
- add_project_arguments('-U_FORTIFY_SOURCE', language: 'c')
--# Make declarations in Cython code available to C include files
--add_project_arguments(
--  '-X preliminary_late_includes_cy28=True',
--  language: 'cython',
--)
- 
- # Platform-specific settings
- if is_cygwin
-diff --git a/src/cysignals/signals.pxd b/src/cysignals/signals.pxd
-index 76320f7..531a9a8 100644
---- a/src/cysignals/signals.pxd
-+++ b/src/cysignals/signals.pxd
-@@ -1,3 +1,4 @@
-+# cython: preliminary_late_includes_cy28=True
- #*****************************************************************************
- #  cysignals is free software: you can redistribute it and/or modify it
- #  under the terms of the GNU Lesser General Public License as published
-diff --git a/src/cysignals/signals.pyx b/src/cysignals/signals.pyx
-index b988167..72f206e 100644
---- a/src/cysignals/signals.pyx
-+++ b/src/cysignals/signals.pyx
-@@ -1,3 +1,4 @@
-+# cython: preliminary_late_includes_cy28=True
- r"""
- Interrupt and signal handling
- 
-diff --git a/src/cysignals/tests.pyx b/src/cysignals/tests.pyx
-index 547095f..ffb04ca 100644
---- a/src/cysignals/tests.pyx
-+++ b/src/cysignals/tests.pyx
-@@ -1,3 +1,4 @@
-+# cython: preliminary_late_includes_cy28=True
- """
- Test interrupt and signal handling
-