dev-python/nbconvert: Patch docs/Makefile, add pandoc dependency. Fixes bug #559594.

Package-Manager: portage-2.2.20.1

4 files changed, 32 insertions, 4 deletions

diff --git a/dev-python/nbconvert/ChangeLog b/dev-python/nbconvert/ChangeLog
index 796004b79..9867de63e 100644
--- a/dev-python/nbconvert/ChangeLog
+++ b/dev-python/nbconvert/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*nbconvert-4.0.0-r1 (05 Sep 2015)
+
+  05 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +files/nbconvert-4.0.0-docs-Makefile.patch, +nbconvert-4.0.0-r1.ebuild,
+  -nbconvert-4.0.0.ebuild, nbconvert-9999.ebuild:
+  dev-python/nbconvert: Patch docs/Makefile, add pandoc dependency. Fixes bug
+  #559594.
+
   02 Sep 2015; Sean Vig <sean.v.775@gmail.com>
   +files/nbconvert-4.0.0-pandoc-highlighting.patch nbconvert-9999.ebuild:
   dev-python/nbconvert: Use upstream patch for new pandoc versions
diff --git a/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch b/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch
new file mode 100644
index 000000000..130a4afc0
--- /dev/null
+++ b/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch
@@ -0,0 +1,16 @@
+nbconvert is not yet installed at time of doc generation.
+
+Patch by Marius Brehler
+--- docs/Makefile
++++ docs/Makefile
+@@ -61,8 +61,8 @@ source/config_options.rst:
+ 	@echo "Created docs for config options"
+ 
+ ipynb2rst:
+-	jupyter nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source
+-	jupyter nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source
++	../scripts/jupyter-nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source
++	../scripts/jupyter-nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source
+ 	@echo "Converted notebooks to rst"
+ 
+ dirhtml:
diff --git a/dev-python/nbconvert/nbconvert-4.0.0.ebuild b/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild
index ac4dd4146..ac4dd4146 120000
--- a/dev-python/nbconvert/nbconvert-4.0.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild
diff --git a/dev-python/nbconvert/nbconvert-9999.ebuild b/dev-python/nbconvert/nbconvert-9999.ebuild
index d775d3e7e..ab0314abe 100644
--- a/dev-python/nbconvert/nbconvert-9999.ebuild
+++ b/dev-python/nbconvert/nbconvert-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4} )
 
 inherit distutils-r1
 
@@ -12,13 +12,14 @@ MY_PN="nbconvert"
 DESCRIPTION="Converting Jupyter Notebooks"
 HOMEPAGE="http://jupyter.org"
 
+PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch )
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jupyter/${MY_PN}.git git://github.com/jupyter/${MY_PN}.git"
-else
+	else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64"
-	PATCHES=( "${FILESDIR}"/${P}-pandoc-highlighting.patch )
+	PATCHES+=( "${FILESDIR}"/${P}-pandoc-highlighting.patch )
 fi
 
 LICENSE="BSD"
@@ -34,7 +35,10 @@ RDEPEND="
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		app-text/pandoc
+	)
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]