Drop merged patch

4 files changed, 21 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 364a78a97c8a..97c15eb5b9e4 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.7.beta2.r0.ga6e696e91d2
+	pkgver = 9.7.beta5.r0.g625ac58151d
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -104,14 +104,12 @@ pkgbase = sagemath-git
 	source = sagemath-linbox-1.7.patch
 	source = sagemath-bliss-0.77.patch
 	source = sagemath-tachyon-0.99.patch
-	source = sage_docbuild.patch
 	sha256sums = SKIP
 	sha256sums = eee5fa15d8c7be7e009166dbde3ea24bb10d7793dc12880516f278f86b1a6694
 	sha256sums = bd188af45ce31579b82407adee8e9bf6033a996f7ea6e328fabca526f31c08ba
 	sha256sums = 9d042070df3dfd53a1248659677798da888f733548eda91a6d5169c7aa1907e1
 	sha256sums = eacea27b214d32cb886a75695153dfc36b5bad2fd2517e8e4eee18e74220e9e3
 	sha256sums = 3d461a21b9e66cf1884b7cfa20205709ce90f761b7bb2909b6520ad9677494bd
-	sha256sums = 4ee8071efd7b9ad66ac5bbfe081fe670cc58cfcac8fb783d5a40b6da3593cbf4
-	sha256sums = 7e1b9caa70e882356cd1c5e7fa69b68e5c60550b6bc8b3c9753441b1ad63da3d
+	sha256sums = 1c5029a4abef9edd23b7b8197dafd1066420f3323485786c31b4e66cdf7906bd
 
 pkgname = sagemath-git
diff --git a/PKGBUILD b/PKGBUILD
index e76fd05e8215..1862ca020b49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
 
 pkgname=sagemath-git
-pkgver=9.7.beta2.r0.ga6e696e91d2
+pkgver=9.7.beta5.r0.g625ac58151d
 pkgrel=1
 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
 arch=(x86_64)
@@ -58,16 +58,14 @@ source=(git://git.sagemath.org/sage.git#branch=develop
         test-optional.patch
         sagemath-linbox-1.7.patch
         sagemath-bliss-0.77.patch
-        sagemath-tachyon-0.99.patch
-        sage_docbuild.patch)
+        sagemath-tachyon-0.99.patch)
 sha256sums=('SKIP'
             'eee5fa15d8c7be7e009166dbde3ea24bb10d7793dc12880516f278f86b1a6694'
             'bd188af45ce31579b82407adee8e9bf6033a996f7ea6e328fabca526f31c08ba'
             '9d042070df3dfd53a1248659677798da888f733548eda91a6d5169c7aa1907e1'
             'eacea27b214d32cb886a75695153dfc36b5bad2fd2517e8e4eee18e74220e9e3'
             '3d461a21b9e66cf1884b7cfa20205709ce90f761b7bb2909b6520ad9677494bd'
-            '4ee8071efd7b9ad66ac5bbfe081fe670cc58cfcac8fb783d5a40b6da3593cbf4'
-            '7e1b9caa70e882356cd1c5e7fa69b68e5c60550b6bc8b3c9753441b1ad63da3d')
+            '1c5029a4abef9edd23b7b8197dafd1066420f3323485786c31b4e66cdf7906bd')
 
 pkgver() {
   cd sage
@@ -84,8 +82,6 @@ prepare(){
   patch -p1 -i ../sagemath-bliss-0.77.patch
 # Fix tests with tachyon 0.99 https://trac.sagemath.org/ticket/23712
   patch -p1 -i ../sagemath-tachyon-0.99.patch
-# Remove sage_docbuild runtime dependency
-  patch -p1 -i ../sage_docbuild.patch
 
 # Arch-specific patches
 # assume all optional packages are installed
diff --git a/sage_docbuild.patch b/sage_docbuild.patch
deleted file mode 100644
index 3d019d96ae2f..000000000000
--- a/sage_docbuild.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/sage/misc/sagedoc_conf.py b/src/sage/misc/sagedoc_conf.py
-new file mode 100644
-index 00000000..323628a
---- /dev/null
-+++ b/src/sage/misc/sagedoc_conf.py
-@@ -0,0 +1,6 @@
-+r"""
-+Sphinx configuration shared by sage.misc.sphinxify and sage_docbuild
-+"""
-+
-+# The reST default role (used for this markup: `text`) to use for all documents.
-+default_role = 'math'
-diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py
-index d196965..8cfa8af 100644
---- a/src/sage/misc/sphinxify.py
-+++ b/src/sage/misc/sphinxify.py
-@@ -87,7 +87,7 @@ def sphinxify(docstring, format='html'):
-     os.makedirs(confdir)
-     with open(os.path.join(confdir, 'conf.py'), 'w') as filed:
-         filed.write(r"""
--from sage_docbuild.conf import *
-+from sage.misc.sagedoc_conf import *
- extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinx.ext.extlinks']
- 
- templates_path = ['templates']
-diff --git a/src/sage_docbuild/conf.py b/src/sage_docbuild/conf.py
-index c0866c0..12a76ac 100644
---- a/src/sage_docbuild/conf.py
-+++ b/src/sage_docbuild/conf.py
-@@ -14,6 +14,8 @@ from sphinx import highlighting
- import sphinx.ext.intersphinx as intersphinx
- from IPython.lib.lexers import IPythonConsoleLexer, IPyLexer
- 
-+# Load configuration shared with sage.misc.sphinxify
-+from sage.misc.sagedoc_conf import *
- 
- # General configuration
- # ---------------------
-@@ -149,9 +151,6 @@ release = sage.version.version
- # separators on all platforms.
- exclude_patterns = ['.build']
- 
--# The reST default role (used for this markup: `text`) to use for all documents.
--default_role = 'math'
--
- # If true, '()' will be appended to :func: etc. cross-reference text.
- #add_function_parentheses = True
- 
diff --git a/sagemath-tachyon-0.99.patch b/sagemath-tachyon-0.99.patch
index e5a98ab5e87b..77f97c6fd54d 100644
--- a/sagemath-tachyon-0.99.patch
+++ b/sagemath-tachyon-0.99.patch
@@ -1,21 +1,22 @@
 --- a/src/sage/interfaces/tachyon.py
 +++ b/src/sage/interfaces/tachyon.py
-@@ -261,13 +261,13 @@ written in the sequence they are listed in the examples in this section.
-   The {\bf PROJECTION} keyword must be followed by one of the supported
- camera projection mode identifiers {\bf PERSPECTIVE}, {\bf PERSPECTIVE_DOF},
- {\bf ORTHOGRAPHIC}, or {\bf FISHEYE}.  The {\bf FISHEYE} projection mode
--requires two extra parameters {\bf FOCALLENGTH} and {\bf APERTURE}
-+requires two extra parameters {\bf FOCALDIST} and {\bf APERTURE}
- which precede the regular camera options.
+@@ -140,14 +140,14 @@ written in the sequence they are listed in the examples in this section.
+     The ``PROJECTION`` keyword must be followed by one of the supported
+     camera projection mode identifiers ``PERSPECTIVE``, ``PERSPECTIVE_DOF``,
+     ``ORTHOGRAPHIC``, or ``FISHEYE``. The ``FISHEYE`` projection mode
+-    requires two extra parameters ``FOCALLENGTH`` and ``APERTURE`` which
++    requires two extra parameters ``FOCALDIST`` and ``APERTURE`` which
+     precede the regular camera options.
  
- \begin{verbatim}
- Camera
-   projection perspective_dof
--  focallength 0.75
-+  FOCALDIST 0.75
-   aperture 0.02
-   Zoom 0.666667
-   Aspectratio 1.000000
+     ::
+ 
+        Camera
+          projection perspective_dof
+-         focallength 0.75
++         FOCALDIST 0.75
+          aperture 0.02
+          Zoom 0.666667
+          Aspectratio 1.000000
 --- a/src/sage/plot/plot3d/tachyon.py
 +++ b/src/sage/plot/plot3d/tachyon.py
 @@ -92,7 +92,7 @@ angle, right angle)::