commit: 2bb4a12b07e2968b35921a2efad0b2e60ae995dc
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 21:42:57 2025 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu May 29 21:50:49 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb4a12b
dev-python/fpylll: add 0.6.4, drop 0.6.3-r1
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
dev-python/fpylll/Manifest | 1 +
dev-python/fpylll/files/cython-3.1.patch | 116 ---------------------
...{fpylll-0.6.3-r1.ebuild => fpylll-0.6.4.ebuild} | 2 -
3 files changed, 1 insertion(+), 118 deletions(-)
diff --git a/dev-python/fpylll/Manifest b/dev-python/fpylll/Manifest
index 52513e54985d..3ea47212000c 100644
--- a/dev-python/fpylll/Manifest
+++ b/dev-python/fpylll/Manifest
@@ -1 +1,2 @@
DIST fpylll-0.6.3.tar.gz 123868 BLAKE2B
aa9e0ed169a39e1b17fb559c8d840fb6132b8d54b139ecfe1a154e5b2a6265d9e7ebfaa97b9a84278952a4c1629ad37ec9a12e3c0a3ff77f7be14c78e071f819
SHA512
c5a857e81347c53ad9b4ee93078dc384274737c72049ee7745245a7c0861ec7670ec338e4e7dc7d2fc72a9d7e59e6d918715224b2d0286a7b3f53993bdb47409
+DIST fpylll-0.6.4.tar.gz 124097 BLAKE2B
39b0da895a5d66c274fb2260ab7d33e2a973395bfc5a2cb6b5ba03d235a0bb9650b257d7b3807d1fec10093e6fe24e7553bd63a04a2d975e9947737c2231de58
SHA512
3e9f6b0f9d7c2211ff2de629cfa4b1f61ec73207809e17165f9e0a948a9749b7dda2db9613ff676eca71348f781aa152dec8b30005df9b19209892ae55a552ac
diff --git a/dev-python/fpylll/files/cython-3.1.patch
b/dev-python/fpylll/files/cython-3.1.patch
deleted file mode 100644
index 63bfdabb0faa..000000000000
--- a/dev-python/fpylll/files/cython-3.1.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From fe2e6cb2f8b0d347c4920c707624d07516be02b6 Mon Sep 17 00:00:00 2001
-From: "Martin R. Albrecht" <[email protected]>
-Date: Sun, 18 May 2025 10:41:41 +0100
-Subject: [PATCH 1/4] declare types fully
-
----
- src/fpylll/fplll/fplll.pxd | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/fpylll/fplll/fplll.pxd b/src/fpylll/fplll/fplll.pxd
-index 907a4450..cb578d8f 100644
---- a/src/fpylll/fplll/fplll.pxd
-+++ b/src/fpylll/fplll/fplll.pxd
-@@ -952,17 +952,20 @@ cdef extern from "fplll/pruner/pruner.h" namespace
"fplll":
- FT gaussian_heuristic()
-
- void prune[FT](PruningParams &pruning, const double enumeration_radius,
-- const double preproc_cost, const vector[double] &gso_r)
-+ const double preproc_cost, const vector[vector[double]]
&gso_r,
-+ const double target, const PrunerMetric metric, const int
flags)
-
- void prune[FT](PruningParams &pruning, const double enumeration_radius,
-- const double preproc_cost, const vector[double] &gso_r,
-+ const double preproc_cost, const vector[vector[double]]
&gso_r,
- const double target, const PrunerMetric metric, const int
flags)
-
- void prune[FT](PruningParams &pruning, const double enumeration_radius,
-- const double preproc_cost, const vector[vector[double]]
&gso_r)
-+ const double preproc_cost, const vector[vector[double]]
&gso_r,
-+ const double target, const PrunerMetric metric, const int
flags)
-
- void prune[FT](PruningParams &pruning, const double enumeration_radius,
- const double preproc_cost, const vector[vector[double]]
&gso_r,
-+ const double target, const PrunerMetric metric, const int
flags,
- const double target, const PrunerMetric metric, const int
flags)
-
- FT svp_probability[FT](const PruningParams &pruning)
-
-From abe695cc76fa47035cd8749d0b4f20092d51f0fb Mon Sep 17 00:00:00 2001
-From: "Martin R. Albrecht" <[email protected]>
-Date: Sun, 18 May 2025 10:41:49 +0100
-Subject: [PATCH 2/4] this confuses Cython 3.1
-
----
- src/fpylll/fplll/fplll.pxd | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fpylll/fplll/fplll.pxd b/src/fpylll/fplll/fplll.pxd
-index cb578d8f..6e5bd61e 100644
---- a/src/fpylll/fplll/fplll.pxd
-+++ b/src/fpylll/fplll/fplll.pxd
-@@ -968,7 +968,7 @@ cdef extern from "fplll/pruner/pruner.h" namespace "fplll":
- const double target, const PrunerMetric metric, const int
flags,
- const double target, const PrunerMetric metric, const int
flags)
-
-- FT svp_probability[FT](const PruningParams &pruning)
-+ # FT svp_probability[FT](const PruningParams &pruning)
- FT svp_probability[FT](const vector[double] &pr)
-
-
-
-From 5bd159a60191b946465839e912de7f7339084e45 Mon Sep 17 00:00:00 2001
-From: "Martin R. Albrecht" <[email protected]>
-Date: Sun, 18 May 2025 10:42:08 +0100
-Subject: [PATCH 3/4] no more PyInt
-
----
- src/fpylll/gmp/pylong.pyx | 5 ++---
- src/fpylll/io.pyx | 4 ++--
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/fpylll/gmp/pylong.pyx b/src/fpylll/gmp/pylong.pyx
-index 885d4efe..57ced80b 100644
---- a/src/fpylll/gmp/pylong.pyx
-+++ b/src/fpylll/gmp/pylong.pyx
-@@ -26,8 +26,7 @@ AUTHORS:
- #*****************************************************************************
-
-
--from cpython.int cimport PyInt_FromLong
--from cpython.long cimport PyLong_CheckExact, PyLong_FromLong
-+from cpython.long cimport PyLong_CheckExact, PyLong_FromLong, PyLong_FromLong
- from cpython.longintrepr cimport _PyLong_New, digit, PyLong_SHIFT
- from .pycore_long cimport (ob_digit, _PyLong_IsZero, _PyLong_IsNegative,
- _PyLong_IsPositive, _PyLong_DigitCount, _PyLong_SetSignAndDigitCount)
-@@ -64,7 +63,7 @@ cdef mpz_get_pyintlong(mpz_srcptr z):
- if the value is too large.
- """
- if mpz_fits_slong_p(z):
-- return PyInt_FromLong(mpz_get_si(z))
-+ return PyLong_FromLong(mpz_get_si(z))
- return mpz_get_pylong_large(z)
-
-
-diff --git a/src/fpylll/io.pyx b/src/fpylll/io.pyx
-index 4c4d561f..b4717805 100644
---- a/src/fpylll/io.pyx
-+++ b/src/fpylll/io.pyx
-@@ -4,7 +4,7 @@ include "fpylll/config.pxi"
- import sys
- import os
-
--from cpython.int cimport PyInt_AS_LONG
-+from cpython.long cimport PyLong_AsLong
- from fpylll.gmp.mpz cimport mpz_init, mpz_clear, mpz_set
- from fpylll.gmp.pylong cimport mpz_get_pyintlong, mpz_set_pylong
- from .gmp.mpz cimport mpz_t, mpz_set_si, mpz_set
-@@ -46,7 +46,7 @@ cdef int assign_mpz(mpz_t& t, value) except -1:
- Assign Python integer to Z_NR[mpz_t]
- """
- if isinstance(value, int) and PY_MAJOR_VERSION == 2:
-- mpz_set_si(t, PyInt_AS_LONG(value))
-+ mpz_set_si(t, PyLong_AsLong(value))
- return 0
- if isinstance(value, int):
- mpz_set_pylong(t, value)
diff --git a/dev-python/fpylll/fpylll-0.6.3-r1.ebuild
b/dev-python/fpylll/fpylll-0.6.4.ebuild
similarity index 94%
rename from dev-python/fpylll/fpylll-0.6.3-r1.ebuild
rename to dev-python/fpylll/fpylll-0.6.4.ebuild
index a0ee9acce745..367951ad2a48 100644
--- a/dev-python/fpylll/fpylll-0.6.3-r1.ebuild
+++ b/dev-python/fpylll/fpylll-0.6.4.ebuild
@@ -33,8 +33,6 @@ BDEPEND="
>=dev-python/cython-3[${PYTHON_USEDEP}]
"
-PATCHES=( "${FILESDIR}/cython-3.1.patch" )
-
distutils_enable_tests pytest
python_test(){
