Update and sync patches with official package

1 files changed, 15 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 326d677ff77a..d855c70130d0 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.1.rc3.r0.g20007d522c
+	pkgver = 8.2.beta0.r0.g8d9c008a75
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -58,6 +58,7 @@ pkgbase = sagemath-git
 	depends = pari-seadata-small
 	depends = planarity
 	depends = rankwidth
+	depends = tachyon
 	depends = sage-data-combinatorial_designs
 	depends = sage-data-elliptic_curves
 	depends = sage-data-graphs
@@ -89,9 +90,8 @@ pkgbase = sagemath-git
 	optdepends = meataxe: faster matrix arithmetic over finite fields
 	optdepends = sirocco: for computing the fundamental group of the complement of a plane curve
 	optdepends = three.js: alternative 3D plots engine
-	optdepends = tachyon: alternative 3D plots engine
 	source = git://git.sagemath.org/sage.git#branch=develop
-	source = env.patch
+	source = sagemath-env.patch
 	source = package.patch
 	source = latte-count.patch
 	source = jupyter-path.patch
@@ -99,14 +99,18 @@ pkgbase = sagemath-git
 	source = test-optional.patch
 	source = r-no-readline.patch
 	source = fes02.patch
-	source = sagemath-ecl-no-sigfpe.patch
 	source = sagemath-threejs.patch
+	source = pari-stackwarn.patch
 	source = sagemath-detect-igraph.patch
 	source = sagemath-networkx2.patch
 	source = sagemath-linbox-1.5.patch
 	source = sagemath-pynac-0.7.14.patch
+	source = sagemath-matplotlib2.patch
+	source = sagemath-scipy-1.0.patch
+	source = sagemath-lrs.patch
+	source = sagemath-ipython-prompt.patch
 	sha256sums = SKIP
-	sha256sums = 8c4ed4c1f3bb79fb279efa5267a78d0d093c718377b5aa0457b642e50f60811a
+	sha256sums = 39b76a189365464998cab9355d177581bc2b15dff10858f316faa85f2efa0426
 	sha256sums = c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107
 	sha256sums = 0b680e674c11c47afa86162d8b49645620b8912722e08133d23357c29ca9310a
 	sha256sums = 2cad308f8adbb6c54e6603fa22b2f0eb60f6f09248d5d015000c3932ac14f646
@@ -114,12 +118,16 @@ pkgbase = sagemath-git
 	sha256sums = ef94908d4ab28d13af622e6e58ec191aa78817d17e4466c7bb6f64ee72a813b9
 	sha256sums = afd0952b9bb8f52fd428eae36cf719a58ff85a894baae88cbb2124e043768cc7
 	sha256sums = 7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94
-	sha256sums = c31809f887bf9acc45c5bd9dd30bb93e73601d3efbf3016594c3c1d241731c8a
 	sha256sums = 514135b920a43f999571a15e97b41e14f5bed59f65b19643864dc23555a7b830
+	sha256sums = bfd2a20a33ab19a8a8b216a77d07f62e809fe1e1879c4f171ce5dca62fd482e9
 	sha256sums = 28d7789b8d777922ab8871ca43b6afab751428cae875c0343d3962e6a2030b88
-	sha256sums = 37c5c1e694a2aca06c0f1c7d99622ff81fd2bc6a51e8745762294889fa4673f6
+	sha256sums = 1024f3a6a9a1a6ae96d9962bb7d1f5842f4a4a5ff5098afad81a60188b7d5160
 	sha256sums = a52d03e04c9d64bb957a1f8dcdae3280ebb9450a7fd76aaf5ae5de5c6f74774f
 	sha256sums = 538f7b279d72f4b67edb445d386d267f3f7022c1079031ca7ea06f6ce392c906
+	sha256sums = b9ab2bb5f381ea425e8763b81b8b3a108a3951c594fb1f37f7df921e7c77e26d
+	sha256sums = 17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a
+	sha256sums = c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c
+	sha256sums = 937a0081e7aea56bda645ef5f0d34b8e356acd62a7dd128a35163f46e7836131
 
 pkgname = sagemath-git
 	optdepends = cython2: to compile cython code
@@ -148,13 +156,9 @@ pkgname = sagemath-git
 	optdepends = meataxe: faster matrix arithmetic over finite fields
 	optdepends = sirocco: for computing the fundamental group of the complement of a plane curve
 	optdepends = three.js: alternative 3D plots engine
-	optdepends = tachyon: alternative 3D plots engine
 	optdepends = sagemath-jupyter: Jupyter kernel
-	provides = sage-mathematics
 	provides = sagemath
-	conflicts = sage-mathematics
 	conflicts = sagemath
-	replaces = sage-mathematics
 
 pkgname = sagemath-jupyter-git
 	pkgdesc = Jupyter kernel for SageMath