Rebase

3 files changed, 6 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 569f5dff8deb..7cc7916998a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sagemath-git
 	pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab
-	pkgver = 9.1.beta7.r0.g6db1a26f5e
+	pkgver = 9.1.beta8.r0.gbe1e22c441
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -111,9 +111,9 @@ pkgbase = sagemath-git
 	sha256sums = 6a5470d7044a50a35a6478f57c19adf72fe54aefebeea8a095915b63f9e219ac
 	sha256sums = 876fd1c0fc3471b56e54d960d79e5ce1d5fc49cebf6eed27043a7380854c792c
 	sha256sums = 937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5
-	sha256sums = f83a9ef2fffd0c59516720d09d65045ecde7fddbb75044fd3867ddd552ac1349
+	sha256sums = 454de1f9021230a4dda7ab52af3136f95708454d477e46209e39237530649ea9
 	sha256sums = e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0
-	sha256sums = c53fea4a915140159deb2ff1efe0ea28d4e2602ecd32e73fa6e44f7e59ae5024
+	sha256sums = 42beceb0d5fc8580b55ccaf5229cd43d237897139d01b1b9e9d5b0dee135c2bb
 	sha256sums = f812e32718eab0292d726bed386217524dcdae3d4078ce82c66c20d00b9806f7
 	sha256sums = 5e6d1aa34959bd4369bd08a80648a5c7bc2d38e72c97e9a5f986e91f8a7aca07
 	sha256sums = d75f551fd942963b0158f5b25cefbecb213c37549375dd2e0f88e1856555fa1e
diff --git a/PKGBUILD b/PKGBUILD
index 6effaa7d9827..7e78aa15027c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=sagemath-git
 pkgname=(sagemath-git sagemath-jupyter-git)
-pkgver=9.1.beta7.r0.g6db1a26f5e
+pkgver=9.1.beta8.r0.gbe1e22c441
 pkgrel=1
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(x86_64)
@@ -52,9 +52,9 @@ sha256sums=('SKIP'
             '6a5470d7044a50a35a6478f57c19adf72fe54aefebeea8a095915b63f9e219ac'
             '876fd1c0fc3471b56e54d960d79e5ce1d5fc49cebf6eed27043a7380854c792c'
             '937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5'
-            'f83a9ef2fffd0c59516720d09d65045ecde7fddbb75044fd3867ddd552ac1349'
+            '454de1f9021230a4dda7ab52af3136f95708454d477e46209e39237530649ea9'
             'e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0'
-            'c53fea4a915140159deb2ff1efe0ea28d4e2602ecd32e73fa6e44f7e59ae5024'
+            '42beceb0d5fc8580b55ccaf5229cd43d237897139d01b1b9e9d5b0dee135c2bb'
             'f812e32718eab0292d726bed386217524dcdae3d4078ce82c66c20d00b9806f7'
             '5e6d1aa34959bd4369bd08a80648a5c7bc2d38e72c97e9a5f986e91f8a7aca07'
             'd75f551fd942963b0158f5b25cefbecb213c37549375dd2e0f88e1856555fa1e'
diff --git a/sagemath-singular-4.1.2.patch b/sagemath-singular-4.1.2.patch
index f3a0dc7092cf..88f55b14f14b 100644
--- a/sagemath-singular-4.1.2.patch
+++ b/sagemath-singular-4.1.2.patch
@@ -1,42 +1,3 @@
-diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx
-index d2dec78..42001d4 100644
---- a/src/sage/rings/polynomial/plural.pyx
-+++ b/src/sage/rings/polynomial/plural.pyx
-@@ -126,7 +126,7 @@ from sage.rings.finite_rings.finite_field_prime_modn import FiniteField_prime_mo
- from sage.rings.integer cimport Integer
- from sage.rings.integer_ring import is_IntegerRing
- 
--from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomialRing_libsingular
-+from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomialRing_libsingular, MPolynomial_libsingular, new_MP
- from sage.rings.polynomial.multi_polynomial_ideal import NCPolynomialIdeal
- 
- from sage.rings.polynomial.polydict import ETuple
-@@ -2860,6 +2860,15 @@ cpdef MPolynomialRing_libsingular new_CRing(RingWrap rw, base_ring):
-         sage: curcnt = ring_refcount_dict[currRing_wrapper()]
-         sage: newR = new_CRing(W, H.base_ring())
-         sage: ring_refcount_dict[currRing_wrapper()] - curcnt
-+        2
-+
-+    Check that :trac:`29311` is fixed::
-+
-+        sage: R.<x,y,z> = QQ[]
-+        sage: from sage.libs.singular.function_factory import ff
-+        sage: W = ff.ring(ff.ringlist(R), ring=R)
-+        sage: C = sage.rings.polynomial.plural.new_CRing(W, R.base_ring())
-+        sage: C.one()
-         1
-     """
-     assert( rw.is_commutative() )
-@@ -2867,6 +2876,9 @@ cpdef MPolynomialRing_libsingular new_CRing(RingWrap rw, base_ring):
-     cdef MPolynomialRing_libsingular self = <MPolynomialRing_libsingular>MPolynomialRing_libsingular.__new__(MPolynomialRing_libsingular)
- 
-     self._ring = rw._ring
-+    cdef MPolynomial_libsingular one = new_MP(self, p_ISet(1, self._ring))
-+    self._one_element = one
-+    self._one_element_poly = one._poly
- 
-     wrapped_ring = wrap_ring(self._ring)
-     sage.libs.singular.ring.ring_refcount_dict[wrapped_ring] += 1diff --git a/src/doc/en/constructions/algebraic_geometry.rst b/src/doc/en/constructions/algebraic_geometry.rst
 index a312548..d1c9c95 100644
 --- a/src/doc/en/constructions/algebraic_geometry.rst
 +++ b/src/doc/en/constructions/algebraic_geometry.rst