cschwan / sage-on-gentoo

(Unofficial) Gentoo Overlay for Sage- and Sage-related ebuilds
79 stars 26 forks source link

eclib upgrade in 9.7.beta5 #703

Closed strogdon closed 2 years ago

strogdon commented 2 years ago

The eclib upgrade was reverted in going from commit https://github.com/cschwan/sage-on-gentoo/commit/bd315a61bf16439b7c22539040491a256e88f145 to commit https://github.com/cschwan/sage-on-gentoo/commit/a2c6107d35213a443e6cdfbddac0599f99f72198

Perhaps intended but perhaps not


git diff bd315a61bf16439b7c22539040491a256e88f145

diff --git a/package.keywords/sage-9999 b/package.keywords/sage-9999
index aae67f2c..01933797 100644
--- a/package.keywords/sage-9999
+++ b/package.keywords/sage-9999
@@ -20,7 +20,6 @@ sci-libs/zn_poly
 sci-mathematics/cu2
 sci-mathematics/cubex
 sci-mathematics/dikcube
-~sci-mathematics/eclib-20220621
 <sci-mathematics/giac-1.7.0.13
 ~sci-mathematics/gmp-ecm-7.0.5
 ~sci-mathematics/lcalc-1.23

diff --git a/sci-mathematics/sage/sage-9999.ebuild b/sci-mathematics/sage/sage-9999.ebuild
index 0acf8e70..5f535638 100644
--- a/sci-mathematics/sage/sage-9999.ebuild
+++ b/sci-mathematics/sage/sage-9999.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools

 inherit desktop distutils-r1 multiprocessing prefix toolchain-funcs git-r3

-EGIT_REPO_URI="https://github.com/vbraun/sage.git"
+EGIT_REPO_URI="https://github.com/sagemath/sage.git"
 EGIT_BRANCH=develop
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 KEYWORDS=""
@@ -60,7 +60,7 @@ DEPEND="
        media-libs/libpng:0=
        >=sci-mathematics/arb-2.19.0
        sci-mathematics/cliquer
-       ~sci-mathematics/eclib-20220621[flint]
+       ~sci-mathematics/eclib-20210625[flint]
        >=sci-mathematics/flint-2.7.1:=[ntl]
        ~sci-mathematics/gap-4.11.1
        >=sci-mathematics/giac-1.7.0
kiwifb commented 2 years ago

It was super messy because of some flip-flopping between commits and possibly errors on my part. I'll fix it.

kiwifb commented 2 years ago

The merge somehow didn't include puting the new eclib back in. Even so the commit history has them. Bit of a git mystery there.

strogdon commented 2 years ago

I thought this was strange too.