Merge branch 'vbraun' mpmath 1.4.0_alpha1 is forbidden

cschwan · Sep 5, 2024 · 3e185c1 · 3e185c1
2 parents 1d9347b + be7279c
commit 3e185c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/sci-mathematics/sagemath-standard/Manifest b/sci-mathematics/sagemath-standard/Manifest
@@ -1,5 +1,4 @@
 DIST sagemath_PR36641.patch 7044 BLAKE2B 1864ca4d0f1b2ae48b24a298e7aca327760857b809fc25d582869202b154b7068727cb97154ca641ac62e58018d05866284c2a6cfdc991b61aecc90a197cea07 SHA512 a2ba2bf745e43336a9f0ad6fa15a1837b472bbe38d5f1182edff728b11c506fbac50facf190429f16c82c81af0de0fca41937f762a9cb186941e244245ce6cb0
-DIST sagemath_PR38113.patch 179301 BLAKE2B e8458c2101c0bc25ffcbf0e6df1ef1f35f367fdcf716c541b605f154ec69f4ea748f878dcf7718eff19d1e54275bdf7c8b24ea0bf1b3e00e474f10c36f95045f SHA512 92e447c542d9a96a5dfd7257ca95bc7b9ba2c01aa07fc41577c2c75a9856d81cbd4e88d01b4ea2e3a1f972c69ab4c27acf9cf1cf6fe7083b7c30a13f208de648
 DIST sagemath_PR38250.patch 32944 BLAKE2B d7f61864066c168f18075a05e2bea9ab650d571c3ee64bf0751c31582610afcf47ecc534719d5cd3be8677163e55ad3fdcd4cd586ec33abf35467551db57c4d2 SHA512 bce008341646de8a8913a2cb49dad44b31f3ddd72edb6f6f6fd9a3e2e676f955afb1c4f5cd9b4605ee720c150afae24d27837590050c63c2a47c64612fdbef69
 DIST sagemath_PR38500.patch 53717 BLAKE2B 291968de46c5ea8e82adae088e1759751a9057b42ee33319a1a275435e8d04fe3cfafe94303c36b9ec23b12f20dfa1542b5f9962e45f47093023ea0db14dde2a SHA512 153e6fba9cbbde1c051c1679d0af7f94121d417030e157bdf5da2a6f18cd6110b855a71ffd1594c8f3de58f742bef073c8ce68f0f889443737b37c24d5269ca1
 DIST sagemath_standard-10.4.tar.gz 19897066 BLAKE2B 2933631bb43fda2fa85533808d13694693d4f9d490af5812118d7c9f3c7a0887daae31cc8a1f3f46a921ca0e88f241ea4afdafd55ba9c3907784abe3367a9022 SHA512 c8f0f12ecaebefde85ff488398bca72fb92df6cd5674419f4715f58e0a1560e73bf0dbaa5fac18628a6b05187fdf02361569a0021da77f51258e2ca58090b827
diff --git a/sci-mathematics/sagemath-standard/sagemath-standard-10.4-r2.ebuild b/sci-mathematics/sagemath-standard/sagemath-standard-10.4-r2.ebuild
@@ -100,7 +100,7 @@ RDEPEND="
 	dev-python/conway-polynomials[${PYTHON_USEDEP}]
 	>=dev-python/cvxopt-1.2.6[glpk,${PYTHON_USEDEP}]
 	>=dev-python/fpylll-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/mpmath-1.2.1[${PYTHON_USEDEP}]
+	<dev-python/mpmath-1.4.0_alpha1[${PYTHON_USEDEP}]
 	>=dev-python/networkx-2.6[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.2.1[${PYTHON_USEDEP}]
 	>=dev-python/rpy-3.5.7[${PYTHON_USEDEP}]

diff --git a/sci-mathematics/sagemath-standard/sagemath-standard-9999.ebuild b/sci-mathematics/sagemath-standard/sagemath-standard-9999.ebuild
@@ -7,9 +7,10 @@ PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="readline,sqlite"
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
-GIT_PRS=(
-	38113
-)
+# 38113 mpmath 1.4 support
+# GIT_PRS=(
+# 	38113
+# )
 
 inherit desktop distutils-r1 multiprocessing sage-git-patch toolchain-funcs
 
@@ -97,7 +98,7 @@ RDEPEND="
 	dev-python/conway-polynomials[${PYTHON_USEDEP}]
 	>=dev-python/cvxopt-1.2.6[glpk,${PYTHON_USEDEP}]
 	>=dev-python/fpylll-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/mpmath-1.2.1[${PYTHON_USEDEP}]
+	<dev-python/mpmath-1.4.0_alpha1[${PYTHON_USEDEP}]
 	>=dev-python/networkx-2.6[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.2.1[${PYTHON_USEDEP}]
 	>=dev-python/rpy-3.5.7[${PYTHON_USEDEP}]
@@ -157,14 +158,6 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	sage-git-patch_patch
-	# Files to delete for mpmath 1.4 support
-	rm -f \
-		sage/libs/mpmath/ext_libmp.pyx \
-		sage/libs/mpmath/ext_impl.pxd \
-		sage/libs/mpmath/ext_impl.pyx \
-		sage/libs/mpmath/ext_main.pxd \
-		sage/libs/mpmath/ext_main.pyx
 	# use installed copy, not the vendored one.
 	rm -rf sage_setup