Merge branch 'vbraun' for 10.4.beta0

sci-mathematics/sage-doc/files/sage-doc-10.4-makefile.patch

@@ -0,0 +1,32 @@
+diff --git a/src/doc/Makefile b/src/doc/Makefile
+index 2d433b3727..0a5c115380 100644
+--- a/src/doc/Makefile
++++ b/src/doc/Makefile
+@@ -32,10 +32,6 @@ doc-html--%:
+ 	sage --docbuild --no-pdf-links $(subst -,/,$(subst doc-html--,,$@)) html $(SAGE_DOCBUILD_OPTS)
+
+ # reference manual, inventory
+-ifndef SAGE_ROOT
+-doc-inventory-reference:
+-	$(error SAGE_ROOT undefined. This Makefile needs to be invoked by build/make/install)
+-else
+ doc-inventory-reference: doc-src
+ 	$(eval DOCS = $(shell sage --docbuild --all-documents reference))
+ 	@if [ -z "$(DOCS)" ]; then echo "Error: 'sage --docbuild --all-documents' failed"; exit 1; fi
+@@ -44,7 +40,6 @@ doc-inventory-reference: doc-src
+ 	$(MAKE) doc-inventory--$(subst /,-,$(BIBLIO))
+ 	$(MAKE) SAGE_DOCBUILD_OPTS="$(SAGE_DOCBUILD_OPTS) --no-prune-empty-dirs" $(foreach doc, $(OTHER_DOCS), doc-inventory--$(subst /,-,$(doc)))
+ 	$(MAKE) SAGE_DOCBUILD_OPTS="$(SAGE_DOCBUILD_OPTS) --no-prune-empty-dirs" doc-inventory--reference_top
+-endif
+
+ # sub docs of reference manual, html
+ doc-html-reference-sub: doc-inventory-reference
+@@ -69,7 +64,7 @@ doc-html: doc-html-reference doc-html-other
+
+ # Matches doc-pdf--developer, doc-pdf--reference-manifolds etc.
+ doc-pdf--%:
+-	LATEXOPTS="--file-line-error --interaction=batchmode" sage --docbuild $(subst -,/,$(subst doc-pdf--,,$@)) pdf $(SAGE_DOCBUILD_OPTS)
++	LATEXOPTS="--file-line-error --interaction=batchmode" MAKE=$(MAKE) sage --docbuild $(subst -,/,$(subst doc-pdf--,,$@)) pdf $(SAGE_DOCBUILD_OPTS)
+
+ # reference manual, pdf
+ doc-pdf-reference: doc-inventory-reference

sci-mathematics/sage-doc/sage-doc-9999.ebuild

@@ -58,7 +58,7 @@ DEPEND="dev-libs/mathjax"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.5-neutering.patch
-	"${FILESDIR}"/${PN}-10.2-makefile.patch
+	"${FILESDIR}"/${PN}-10.4-makefile.patch
 )
 
 HTML_DOCS="${WORKDIR}/build_doc/html/*"