Skip to content

Commit ebd547c

Browse files
committed
Merge branch 'vbraun' for eclib version handling
2 parents f883894 + 6a6beb1 commit ebd547c

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

sci-mathematics/sagemath-standard/Manifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ DIST sagemath_PR36641.patch 7044 BLAKE2B 1864ca4d0f1b2ae48b24a298e7aca327760857b
22
DIST sagemath_PR38250.patch 32944 BLAKE2B d7f61864066c168f18075a05e2bea9ab650d571c3ee64bf0751c31582610afcf47ecc534719d5cd3be8677163e55ad3fdcd4cd586ec33abf35467551db57c4d2 SHA512 bce008341646de8a8913a2cb49dad44b31f3ddd72edb6f6f6fd9a3e2e676f955afb1c4f5cd9b4605ee720c150afae24d27837590050c63c2a47c64612fdbef69
33
DIST sagemath_PR38500.patch 53717 BLAKE2B 291968de46c5ea8e82adae088e1759751a9057b42ee33319a1a275435e8d04fe3cfafe94303c36b9ec23b12f20dfa1542b5f9962e45f47093023ea0db14dde2a SHA512 153e6fba9cbbde1c051c1679d0af7f94121d417030e157bdf5da2a6f18cd6110b855a71ffd1594c8f3de58f742bef073c8ce68f0f889443737b37c24d5269ca1
44
DIST sagemath_PR38683.patch 2919 BLAKE2B dfb0067b0b7638744b22cde73f91f7887589d2df5a8dfb67d1bfa21285d6e9506cf701a0098518400eb3652bcb04fff3d37587dd54088021869836fe9273a159 SHA512 0c621cad508f40c9a7233873d93229bc6997e28bf2df0e74fcd6e56854f1aeec9c3df4f1031072054855f9b9557deaa3b205e5dcbfababe92aad37675b5b8ada
5+
DIST sagemath_PR38962.patch 4352 BLAKE2B 2ad58c9bfbdae53c2ab0035020e5ff2d23365701bb359d14771d559e33b4372bed9c2e571d333d8c5467a10c53bb5e92e51382b15cadf10005248cf98c4408f3 SHA512 0d7c10710d08c5bcd86136e5e23b9e6ba8b8660937ca0e489dc7b35766d0014d67d0c5d7e08ba76a9e780739dc8935c06390f377afee1b7e7242c71a4dae1a2e
56
DIST sagemath_standard-10.4.tar.gz 19897066 BLAKE2B 2933631bb43fda2fa85533808d13694693d4f9d490af5812118d7c9f3c7a0887daae31cc8a1f3f46a921ca0e88f241ea4afdafd55ba9c3907784abe3367a9022 SHA512 c8f0f12ecaebefde85ff488398bca72fb92df6cd5674419f4715f58e0a1560e73bf0dbaa5fac18628a6b05187fdf02361569a0021da77f51258e2ca58090b827

sci-mathematics/sagemath-standard/sagemath-standard-10.4-r3.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ DEPEND="
6363
media-libs/gd[jpeg,png]
6464
media-libs/libpng:0=
6565
sci-mathematics/cliquer
66-
sci-mathematics/eclib:=[flint]
66+
~sci-mathematics/eclib-20231212:=[flint]
6767
>=sci-mathematics/flint-3.1.3:=[ntl]
6868
>=sci-mathematics/gap-4.12.2
6969
>=sci-mathematics/giac-1.9.0

sci-mathematics/sagemath-standard/sagemath-standard-9999.ebuild

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ PYTHON_COMPAT=( python3_{10..12} )
77
PYTHON_REQ_USE="readline,sqlite"
88
DISTUTILS_USE_PEP517=setuptools
99
DISTUTILS_EXT=1
10+
GIT_PRS=(
11+
38962
12+
)
1013

1114
inherit desktop distutils-r1 multiprocessing sage-git-patch toolchain-funcs
1215

@@ -56,7 +59,7 @@ DEPEND="
5659
media-libs/gd[jpeg,png]
5760
media-libs/libpng:0=
5861
sci-mathematics/cliquer
59-
sci-mathematics/eclib:=[flint]
62+
>=sci-mathematics/eclib-20241112:=[flint]
6063
>=sci-mathematics/flint-3.1.3:=[ntl]
6164
>=sci-mathematics/gap-4.13.1
6265
>=sci-mathematics/giac-1.9.0
@@ -154,6 +157,8 @@ pkg_setup() {
154157
python_prepare_all() {
155158
distutils-r1_python_prepare_all
156159

160+
sage-git-patch_patch
161+
157162
# delete mpmath files. This saves a lot of patch space
158163
rm -r \
159164
sage/libs/mpmath/ext_impl.pxd \

tools/package.keywords/sage-9999

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ sci-libs/dsdp
1919
sci-mathematics/cu2
2020
sci-mathematics/cubex
2121
sci-mathematics/dikcube
22+
sci-mathematics/eclib
2223
>sci-mathematics/giac-1.9.0.0
2324
>=sci-mathematics/flint-3.1.3
2425
sci-mathematics/mcube

0 commit comments

Comments
 (0)