[gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/files/, dev-python/nbconvert/

["Marius Brehler" <marbre@linux.sungazer.de>]

commit:     ecf10062252a59dcd236530e65bf16688c363c0a
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue May 17 11:08:11 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue May 17 11:08:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ecf10062

dev-python/nbconvert: Version bump to 4.2.0; Drop patch

Package-Manager: portage-2.2.28

 .../nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch  | 16 ----------------
 .../{nbconvert-9999.ebuild => nbconvert-4.2.0.ebuild}    | 12 +++++-------
 dev-python/nbconvert/nbconvert-9999.ebuild               |  4 +---
 3 files changed, 6 insertions(+), 26 deletions(-)

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
deleted file mode 100644
index 130a4af..0000000
--- a/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-9999.ebuild b/dev-python/nbconvert/nbconvert-4.2.0.ebuild
similarity index 86%
copy from dev-python/nbconvert/nbconvert-9999.ebuild
copy to dev-python/nbconvert/nbconvert-4.2.0.ebuild
index 7c757e7..ead2495 100644
--- a/dev-python/nbconvert/nbconvert-9999.ebuild
+++ b/dev-python/nbconvert/nbconvert-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,20 +6,17 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
-inherit distutils-r1 git-r3
-
-MY_PN="nbconvert"
+inherit distutils-r1
 
 DESCRIPTION="Converting Jupyter Notebooks"
 HOMEPAGE="http://jupyter.org"
-EGIT_REPO_URI="https://github.com/jupyter/${MY_PN}.git git://github.com/jupyter/${MY_PN}.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch )
-
 RDEPEND="
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
@@ -27,6 +24,7 @@ RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
 	doc? (

diff --git a/dev-python/nbconvert/nbconvert-9999.ebuild b/dev-python/nbconvert/nbconvert-9999.ebuild
index 7c757e7..6c287b9 100644
--- a/dev-python/nbconvert/nbconvert-9999.ebuild
+++ b/dev-python/nbconvert/nbconvert-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,8 +18,6 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
 
-PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch )
-
 RDEPEND="
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]