4 files changed, 85 insertions, 45 deletions
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 08771294e355..3c40cedd2e84 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,5 +1,7 @@
+AUX gmpy-2.1.5-mpfr-4.2.1.patch 997 BLAKE2B 16788236152316e08b3ef8815dedc768288590cb7db9132b195a99a080a31740e25fe8eba2d23a053238a4b2f8d747b3868a52529d996e365564f2519d45805f SHA512 a05d3d774b3b7e73787614cbcaf3bdce5731a3f3b51ef764037293d76f1bbb42c441e6d942a059b6c4200fe56fcabf431d9533e44d148d57692c2d61fad930ff
+DIST gmpy-2.1.5-cache.patch 19769 BLAKE2B 72d61ea00fda608ae92c5319828cb5c0003a69cd4be4bf3cde62574a93987b2316df5334d290eca7d48e44e423227d0b5a22c142c4a95b42aebb4560c3bf7ea6 SHA512 f16dbd78a99f27c6f588b814bb9b307429927eae9828fcea04225f163c1cd28968c2994689c4802dc0b619cdfd7c50401d1ec06c220756268af17499613fda1b
 DIST gmpy-2.1.5-py3.12.patch.gz 1817 BLAKE2B cbea3a9c662d52c5bfddb82ab5e920474a52c1dd715b3b9fecf55e5ee097297168ddb7961b6156e4c1f902e911890c77252d119c3651f345f01cad144ed44127 SHA512 26195e8e9a87147a05fd07fa325f262c2004fcba2b8857dbc87ca7a1e9e5e64b4a47d35be77edc263829e5df1db6a0acda6904307d01529eba832feb4f0f3f71
 DIST gmpy2-2.1.5.tar.gz 261709 BLAKE2B 50958868866fadc49c97534780fa491fadfaaea902f3fd4bd51f4e76a94602a6d030a1ee6685aac742e25b5fbe4865e1419307f7215c8fb553b166761d63607a SHA512 92e16359ee1df63faaeae4a3cbefe8cdbbc576d8eda377f08d59f12b70dfe9337a299686e85d1efee6c2f5b41fc4583643fecc68ea38a500c7f876c56fc169e7
-EBUILD gmpy-2.1.5-r1.ebuild 955 BLAKE2B 2ee6e65a600581eac7aa9a88c31dd2742eb1bba602a7b2f12deea37b18ad42d3bda28a4b6e2181508a95b5d36391b87a17022f3ea7d1788ab4e07132252e1f61 SHA512 84f83af3926957472ecf3d05cf542049e3c55e7ec62330d3a02594c275e8495714bde97b056bcb046ee14db30a0976794ff57880dc5d3ba23c0da4bcc0cce6f5
+EBUILD gmpy-2.1.5-r2.ebuild 1348 BLAKE2B f4b49ea7721b4901201c0df811a1f92be623bffbb4125cbf12a8f4ddbb53a9fd7c54ae63b58d57727186ae1d435077cf70722eb96a22adffb331f777d7c3948e SHA512 81d3fab5971fdae1761c95a5eab3fcd3b0f103e6c9140ff2335e84af98fad5eb09142b259b229b6322fa178ae6014dc6d4d12e6b8b1d115a029143b5846fa404
 EBUILD gmpy-2.1.5.ebuild 789 BLAKE2B 7ad22878e16aa85a5f842fedb77e4a41efaff0c51221fd1884b7832911fbadd808c3ee531af7c9f0f2e9fdf8cdd01123fe3c3fe90baa9087cac1865113e400f3 SHA512 943dfce246dd493dcbbe1f17b2a17f214dfb8717742bad2f6b75baf9d30431892c832e6a8ef4905f0839fc1cdbfe18bd1757552254358608990d1a651b1ceb8a
 MISC metadata.xml 687 BLAKE2B 9cf9e1c3dad11819000600a2ce28b5f140101cfa37553df7bf07edeb8513d7b8d80b15d561e37ca960a23d3470fc7f83608f9163d46b54fe7c41782302c53963 SHA512 eb1aacdf09d56ac73a1ce37d4562987c900f658bc517ccb6bd34cafefdf9a790d0e0d4318f70b57d68c5ec0c2832d0960b2bd619002fe690f484cd2702b77f79
diff --git a/dev-python/gmpy/files/gmpy-2.1.5-mpfr-4.2.1.patch b/dev-python/gmpy/files/gmpy-2.1.5-mpfr-4.2.1.patch
new file mode 100644
index 000000000000..4bbc9097824e
--- /dev/null
+++ b/dev-python/gmpy/files/gmpy-2.1.5-mpfr-4.2.1.patch
@@ -0,0 +1,31 @@
+From 68a6b489c3d8d95b2658a1ed884fb99f4bd955c1 Mon Sep 17 00:00:00 2001
+From: Sergey B Kirpichev <skirpichev@gmail.com>
+Date: Sun, 3 Sep 2023 02:35:19 +0300
+Subject: [PATCH] Exclude MPFR workaround for MPFR >= 4.2.1
+
+Co-authored-by: Vincent Lefevre <vincent@vinc17.net>
+
+Closes #418
+---
+ src/gmpy2_format.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gmpy2_format.c b/src/gmpy2_format.c
+index 3e450c96..303bb7bf 100644
+--- a/src/gmpy2_format.c
++++ b/src/gmpy2_format.c
+@@ -592,12 +592,14 @@ GMPy_MPC_Format(PyObject *self, PyObject *args)
+     if (mpcstyle)
+         strcat(tempbuf, " ");
+     else {
++#if MPFR_VERSION < MPFR_VERSION_NUM(4,2,1)
+         /* Need to insert + if imag is nan or +inf. */
+         if (mpfr_nan_p(mpc_imagref(MPC(self))) ||
+             (mpfr_inf_p(mpc_imagref(MPC(self))) &&
+              mpfr_sgn(mpc_imagref(MPC(self))) > 0)) {
+             strcat(tempbuf, "+");
+         }
++#endif
+     }
+     strcat(tempbuf, imagbuf);
+     if (strlen(imagbuf) < 50 &&
diff --git a/dev-python/gmpy/gmpy-2.1.5-r1.ebuild b/dev-python/gmpy/gmpy-2.1.5-r1.ebuild
deleted file mode 100644
index f399526d25e1..000000000000
--- a/dev-python/gmpy/gmpy-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN="gmpy2"
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="
-	https://github.com/aleaxit/gmpy/
-	https://pypi.org/project/gmpy2/
-"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~grozin/${P}-py3.12.patch.gz"
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	dev-libs/gmp:0=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_sphinx docs
-
-src_prepare() {
-	eapply "${WORKDIR}"/${P}-py3.12.patch
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/gmpy-2.1.5-r2.ebuild b/dev-python/gmpy/gmpy-2.1.5-r2.ebuild
new file mode 100644
index 000000000000..2993e4aa5a8e
--- /dev/null
+++ b/dev-python/gmpy/gmpy-2.1.5-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN="gmpy2"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
+HOMEPAGE="
+	https://github.com/aleaxit/gmpy/
+	https://pypi.org/project/gmpy2/
+"
+SRC_URI+="
+	https://dev.gentoo.org/~grozin/${P}-py3.12.patch.gz
+	https://github.com/tornaria/void-packages/raw/722b32aa405804b79a74256708de6a511e255b4b/srcpkgs/python3-gmpy2/patches/cleanup-object-caching.patch
+		-> ${P}-cache.patch
+"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DEPEND="
+	>=dev-libs/mpc-1.0.2:=
+	>=dev-libs/mpfr-3.1.2:=
+	dev-libs/gmp:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_sphinx docs
+
+PATCHES=(
+	"${WORKDIR}/${P}-py3.12.patch"
+	# https://github.com/aleaxit/gmpy/commit/7351e2eb1abf4b37a47a822eb3f3f29f90c7f854
+	# rebased by Void; needed for mpfr 4.2.1
+	"${DISTDIR}/${P}-cache.patch"
+	# https://github.com/aleaxit/gmpy/commit/68a6b489c3d8d95b2658a1ed884fb99f4bd955c1
+	"${FILESDIR}/${P}-mpfr-4.2.1.patch"
+)
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}