From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CACBA1384C3 for ; Mon, 7 Sep 2015 06:49:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A61E1E0818; Mon, 7 Sep 2015 06:49:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB8A214088 for ; Mon, 7 Sep 2015 06:49:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA2543408A2 for ; Mon, 7 Sep 2015 06:49:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64A3C18E for ; Mon, 7 Sep 2015 06:49:34 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1441446944.aebbd4d8cf833cd96c58b62010795ec21a8d6ff9.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/files/, dev-python/nbconvert/ X-VCS-Repository: proj/sci X-VCS-Files: dev-python/nbconvert/ChangeLog dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild dev-python/nbconvert/nbconvert-4.0.0.ebuild dev-python/nbconvert/nbconvert-9999.ebuild X-VCS-Directories: dev-python/nbconvert/ dev-python/nbconvert/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: aebbd4d8cf833cd96c58b62010795ec21a8d6ff9 X-VCS-Branch: master Date: Mon, 7 Sep 2015 06:49:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1f2feffa-03c8-49e9-a69d-de586a20632f X-Archives-Hash: 8d59c7b292fde01fcf9c8d02ed96d08b commit: aebbd4d8cf833cd96c58b62010795ec21a8d6ff9 Author: Marius Brehler linux sungazer de> AuthorDate: Sat Sep 5 09:55:44 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Sep 5 09:55:44 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=aebbd4d8 dev-python/nbconvert: Patch docs/Makefile, add pandoc dependency. Fixes bug #559594. Package-Manager: portage-2.2.20.1 dev-python/nbconvert/ChangeLog | 8 ++++++++ .../nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch | 16 ++++++++++++++++ ...{nbconvert-4.0.0.ebuild => nbconvert-4.0.0-r1.ebuild} | 0 dev-python/nbconvert/nbconvert-9999.ebuild | 12 ++++++++---- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dev-python/nbconvert/ChangeLog b/dev-python/nbconvert/ChangeLog index 796004b..9867de6 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 + +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 +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 0000000..130a4af --- /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 similarity index 100% rename from dev-python/nbconvert/nbconvert-4.0.0.ebuild rename to 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 d775d3e..ab0314a 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}]