Update

3 files changed, 3 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 806da374aa9d..acc391e4a795 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 = 8.0.beta5.r0.g46a728ae82
+	pkgver = 8.0.beta8.r0.gc011cfada9
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = i686
@@ -102,7 +102,6 @@ pkgbase = sagemath-git
 	source = jupyter-path.patch
 	source = sagemath-python3-notebook.patch
 	source = test-optional.patch
-	source = ecm-7.patch
 	source = r-no-readline.patch
 	source = fes02.patch
 	source = create_extension.patch
@@ -116,7 +115,6 @@ pkgbase = sagemath-git
 	sha256sums = 889b65598d2a15e73eb482f543ec9b28d8992eeb57b07883c2e9627dfee15a9b
 	sha256sums = 27aa73d427d92aeb2c181a233aa3a574a4158cd7dee33832808f69edaec55ea2
 	sha256sums = 81d08c6a760f171f3381455b66a6c84789c9f0eefddbe6ca5794075514ad8c3a
-	sha256sums = 06bc1e5b409e21d49fc71ef03e96ec35b7a9b524bfd1f81a2dbf5c64a55e5acf
 	sha256sums = ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf
 	sha256sums = a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea
 	sha256sums = 362bd7603e14f729c87eebc9d3f56eb8a9ec94456038f0cb17591e81c459ef8e
diff --git a/PKGBUILD b/PKGBUILD
index f1b464c4409a..bb4ee7f0328a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=sagemath-git
 pkgname=(sagemath-git sagemath-jupyter-git)
-pkgver=8.0.beta5.r0.g46a728ae82
+pkgver=8.0.beta8.r0.gc011cfada9
 pkgrel=1
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(i686 x86_64)
@@ -35,7 +35,7 @@ makedepends=(cython2 boost ratpoints symmetrica python2-jinja coin-or-cbc libhom
   mcqd coxeter3 cryptominisat2 modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe libfes git)
 source=("git://git.sagemath.org/sage.git#branch=develop" 
         env.patch cython-sys-path.patch is-package-installed.patch package.patch latte-count.patch
-        jupyter-path.patch sagemath-python3-notebook.patch test-optional.patch ecm-7.patch r-no-readline.patch fes02.patch
+        jupyter-path.patch sagemath-python3-notebook.patch test-optional.patch r-no-readline.patch fes02.patch
         create_extension.patch include_dirs_from_externs.patch)
 sha256sums=('SKIP'
             'e0b5b8673300857fde823209a7e90faecf9e754ab812cc5e54297eddc0c79571'
@@ -46,7 +46,6 @@ sha256sums=('SKIP'
             '889b65598d2a15e73eb482f543ec9b28d8992eeb57b07883c2e9627dfee15a9b'
             '27aa73d427d92aeb2c181a233aa3a574a4158cd7dee33832808f69edaec55ea2'
             '81d08c6a760f171f3381455b66a6c84789c9f0eefddbe6ca5794075514ad8c3a'
-            '06bc1e5b409e21d49fc71ef03e96ec35b7a9b524bfd1f81a2dbf5c64a55e5acf'
             'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
             'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea'
             '362bd7603e14f729c87eebc9d3f56eb8a9ec94456038f0cb17591e81c459ef8e'
@@ -71,8 +70,6 @@ prepare(){
   patch -p0 -i ../jupyter-path.patch
 # search system paths for cython includes
   patch -p1 -i ../cython-sys-path.patch
-# fix regressions with ECM 7
-  patch -p1 -i ../ecm-7.patch
 # fix freezes in R interface with readline 7 (Debian)
   patch -p1 -i ../r-no-readline.patch
 # use correct latte-count binary name
diff --git a/ecm-7.patch b/ecm-7.patch
deleted file mode 100644
index 8003e065d655..000000000000
--- a/ecm-7.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/src/sage/interfaces/ecm.py.orig	2016-05-16 22:18:03.894827738 +0200
-+++ b/src/sage/interfaces/ecm.py	2016-05-16 22:19:14.674904932 +0200
-@@ -140,9 +140,6 @@
-         - ``ve`` -- integer `n`. Verbosely show short (`< n`
-           character) expressions on each loop
- 
--        - ``cofdec`` -- boolean. Force cofactor output in decimal
--          (even if expressions are used )
--
-         - ``B2scale`` -- integer. Multiplies the default B2 value
- 
-         - ``go`` -- integer. Preload with group order val, which can
-@@ -395,15 +392,15 @@
-             if m is not None:
-                 factor = m.group('factor')
-                 primality = m.group('primality')
--                assert primality in ['probable prime', 'composite']
--                result += [(ZZ(factor), primality == 'probable prime')]
-+                assert primality in ['prime', 'composite']
-+                result += [(ZZ(factor), primality == 'prime')]
-                 continue  # cofactor on the next line
-             m = self._found_cofactor_re.match(line)
-             if m is not None:
-                 cofactor = m.group('cofactor')
-                 primality = m.group('primality')
--                assert primality in ['Probable prime', 'Composite']
--                result += [(ZZ(cofactor), primality == 'Probable prime')]
-+                assert primality in ['Prime', 'Composite']
-+                result += [(ZZ(cofactor), primality == 'Prime')]
-                 # assert len(result) == 2
-                 return result
-         raise ValueError('failed to parse ECM output')
-@@ -500,7 +497,6 @@
-         if factor_digits is not None:
-             B1 = self.recommended_B1(factor_digits)
-         kwds['one'] = True
--        kwds['cofdec'] = True
-         cmd = self._make_cmd(B1, None, kwds)
-         out = self._run_ecm(cmd, n)
-         return self._parse_output(n, out)
-@@ -832,8 +828,8 @@
- Step 1 took 12ms
- Step 2 took 17ms
- ********** Factor found in step 2: 79792266297612017
--Found probable prime factor of 17 digits: 79792266297612017
--Probable prime cofactor 6366805760909027985741435139224233 has 34 digits
-+Found prime factor of 17 digits: 79792266297612017
-+Prime cofactor 6366805760909027985741435139224233 has 34 digits
- """
- 
- TEST_ECM_OUTPUT_2 = """
-@@ -843,8 +839,8 @@
- Step 1 took 2ms
- Step 2 took 3ms
- ********** Factor found in step 2: 179424673
--Found probable prime factor of  9 digits: 179424673
--Probable prime cofactor 179424673 has 9 digits
-+Found prime factor of  9 digits: 179424673
-+Prime cofactor 179424673 has 9 digits
- """
- 
- TEST_ECM_OUTPUT_3 = """
-@@ -862,7 +858,7 @@
- Step 1 took 5ms
- Step 2 took 4ms
- ********** Factor found in step 2: 197002597249
--Found probable prime factor of 12 digits: 197002597249
-+Found prime factor of 12 digits: 197002597249
- Composite cofactor 339872432034468861533158743041639097889948066859 has 48 digits
- """
- 
-@@ -874,5 +870,5 @@
- Step 2 took 2ms
- ********** Factor found in step 2: 265748496095531068869578877937
- Found composite factor of 30 digits: 265748496095531068869578877937
--Probable prime cofactor 251951573867253012259144010843 has 30 digits
-+Prime cofactor 251951573867253012259144010843 has 30 digits
- """
-