Adding metadata

5 files changed, 54 insertions, 72 deletions

diff --git a/dev-python/fastbencode/Manifest b/dev-python/fastbencode/Manifest
index 2f185790e38c..79f105f66814 100644
--- a/dev-python/fastbencode/Manifest
+++ b/dev-python/fastbencode/Manifest
@@ -1,2 +1 @@
-DIST fastbencode-0.2.tar.gz 22580 BLAKE2B 87e14260cf7174ee1b40372879efed7b8fef3302ec0783cf9ebd103e9730c0f415ccd96c2ada944849b7cf63bf2998d2ddc644307619449b29177c680730233b SHA512 4cc62d8ed54fcf1d989e026ad2b4d0c1f4a2fa762d9c2f7da182501af7454f802202c47763b714072009357858a3f93ea6ad9b3e9f80742b749f5014f84e1598
 DIST fastbencode-0.3.1.tar.gz 20881 BLAKE2B e962e07ebc75402d63c9b4bbae303bafc1cf4a66f76884b756c9604b5fad5dc0165c1500fad4226785e030571bff1a2f26b5e5185880b076ebdb54cac4474da1 SHA512 153501ecbfcff76a55faec4c65924a4e4b171a91e05092ecaba61a8561f84d2abce0ac7b7d51aee44b39e6b706c38b5ea7a23f92a4650545b4526a0ae1ac086d
diff --git a/dev-python/fastbencode/fastbencode-0.2.ebuild b/dev-python/fastbencode/fastbencode-0.2.ebuild
deleted file mode 100644
index 7d76bbb4438c..000000000000
--- a/dev-python/fastbencode/fastbencode-0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2023 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_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Implementation of bencode with optional fast C extensions"
-HOMEPAGE="
-	https://github.com/breezy-team/fastbencode/
-	https://pypi.org/project/fastbencode/
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	# https://github.com/breezy-team/fastbencode/commit/23e8cadcc81c6649d96742f235a98bd3047e5d8a
-	"${FILESDIR}"/${P}-py312.patch
-)
-
-python_test() {
-	cd fastbencode/tests || die
-	eunittest
-}
diff --git a/dev-python/fastbencode/fastbencode-0.3.1.ebuild b/dev-python/fastbencode/fastbencode-0.3.1.ebuild
index 67c3247f47af..a644bd6d077e 100644
--- a/dev-python/fastbencode/fastbencode-0.3.1.ebuild
+++ b/dev-python/fastbencode/fastbencode-0.3.1.ebuild
@@ -24,3 +24,8 @@ BDEPEND="
 "
 
 distutils_enable_tests unittest
+
+PATCHES=(
+	# https://github.com/breezy-team/fastbencode/pull/97
+	"${FILESDIR}/${P}-cython-3.1.patch"
+)
diff --git a/dev-python/fastbencode/files/fastbencode-0.2-py312.patch b/dev-python/fastbencode/files/fastbencode-0.2-py312.patch
deleted file mode 100644
index 78c42c7b2fa7..000000000000
--- a/dev-python/fastbencode/files/fastbencode-0.2-py312.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 23e8cadcc81c6649d96742f235a98bd3047e5d8a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
-Date: Tue, 11 Jul 2023 11:45:47 +0000
-Subject: [PATCH] Fix compatibility with python 3.12
-
-Fixes #23
----
- fastbencode/tests/test_bencode.py | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/fastbencode/tests/test_bencode.py b/fastbencode/tests/test_bencode.py
-index 50e8e06..61cd8b5 100644
---- a/fastbencode/tests/test_bencode.py
-+++ b/fastbencode/tests/test_bencode.py
-@@ -287,10 +287,16 @@ def test_list(self):
- 
-     def test_list_deepnested(self):
-         import platform
--        if platform.python_implementation() == 'PyPy':
--            self.skipTest('recursion not an issue on pypy')
--        with RecursionLimit():
--            self._run_check_error(RuntimeError, (b"l" * 100) + (b"e" * 100))
-+        if (platform.python_implementation() == 'PyPy'
-+                or sys.version_info[:2] >= (3, 12)):
-+            expected = []
-+            for i in range(99):
-+                expected = [expected]
-+            self._check(expected, (b"l" * 100) + (b"e" * 100))
-+        else:
-+            with RecursionLimit():
-+                self._run_check_error(
-+                    RuntimeError, (b"l" * 100) + (b"e" * 100))
- 
-     def test_malformed_list(self):
-         self._run_check_error(ValueError, b'l')
diff --git a/dev-python/fastbencode/files/fastbencode-0.3.1-cython-3.1.patch b/dev-python/fastbencode/files/fastbencode-0.3.1-cython-3.1.patch
new file mode 100644
index 000000000000..7c65e47dfee8
--- /dev/null
+++ b/dev-python/fastbencode/files/fastbencode-0.3.1-cython-3.1.patch
@@ -0,0 +1,49 @@
+From 287a8ae762fd3e6d532cda7b899d08ec9859f84a Mon Sep 17 00:00:00 2001
+From: Jelmer Vernooij <jelmer@jelmer.uk>
+Date: Mon, 21 Apr 2025 12:33:50 +0000
+Subject: [PATCH] Fix compatibility with Cython 3.1. Fixes #96
+
+---
+ fastbencode/_bencode_pyx.pyx | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/fastbencode/_bencode_pyx.pyx b/fastbencode/_bencode_pyx.pyx
+index 651f09f..c526b19 100644
+--- a/fastbencode/_bencode_pyx.pyx
++++ b/fastbencode/_bencode_pyx.pyx
+@@ -31,16 +31,13 @@ from cpython.bytes cimport (
+ from cpython.dict cimport (
+     PyDict_CheckExact,
+     )
+-from cpython.int cimport (
+-    PyInt_CheckExact,
+-    PyInt_FromString,
+-    )
+ from cpython.list cimport (
+     PyList_CheckExact,
+     PyList_Append,
+     )
+ from cpython.long cimport (
+     PyLong_CheckExact,
++    PyLong_FromString,
+     )
+ from cpython.mem cimport (
+     PyMem_Free,
+@@ -165,7 +162,7 @@ cdef class Decoder:
+         i = self._read_digits(c'e')
+         self.tail[i] = 0
+         try:
+-            ret = PyInt_FromString(self.tail, NULL, 10)
++            ret = PyLong_FromString(self.tail, NULL, 10)
+         finally:
+             self.tail[i] = c'e'
+         D_UPDATE_TAIL(self, i+1)
+@@ -414,7 +411,7 @@ cdef class Encoder:
+         try:
+             if PyBytes_CheckExact(x):
+                 self._encode_bytes(x)
+-            elif PyInt_CheckExact(x) and x.bit_length() < 32:
++            elif PyLong_CheckExact(x) and x.bit_length() < 32:
+                 self._encode_int(x)
+             elif PyLong_CheckExact(x):
+                 self._encode_long(x)