gentoo resync : 17.05.2018

6 files changed, 2 insertions, 250 deletions

diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index b924438a899a..0d1b06427c55 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,10 +1,3 @@
-AUX nbconvert-4.1.0-docs-Makefile.patch 667 BLAKE2B 416963b0e972f05f22816643b1d743a2579aa1f243982308a45d3f0676608ae41146ba2439ac882b7dd818ccd2f6a7a5f2fae2dc57032bbae893f2f3de612d54 SHA512 22db6ba0f611c776710090e5abd66041a331a47c24170f711e19c658b43eb1030335f83b6bcc5cc71f38766cbbbc0347995992f7919ceabac69376929667d700
-DIST nbconvert-4.1.0.tar.gz 263948 BLAKE2B fa0ade4e6b6c22bfea05c114211c1ddeba8a80e2e7b932c1fa5de6a15f908c019f9ccdfa10698ca3570231e03d988f72892d837acf340994fd94f3fce5e4b1c2 SHA512 9761cf8cdf206bd8f27c666d7b520cbd7d805353cf46b212b46ee6053b47ec6728a5926dfe59acef109c8770580c41d51aa5b943a27e72bccecc68a7d7b68bfb
-DIST nbconvert-4.2.0.tar.gz 428726 BLAKE2B f7d691d1d2fc6fcfa0e7d838cd44f5be60bae9e2015a92fea0c4af53e70ceb6d736f329da4ecf25ad82a8b39f15d4c22fef807f24f09d62d717d5ed5d5ac9c57 SHA512 441d32e5bd63cb7d0b9a70b814ec6ea647a04542601461cb8b008f4f9ab894f5729687093400703b222435100384378653fbbb38427431d9da62992ef778906a
-DIST nbconvert-4.3.0.tar.gz 377486 BLAKE2B ff8e09070d1c4dc0febc2c43712442406708461aa1ecef1c5a85c6821b6a34d1a3571c3e24d12a8403757350b29302ca19c16bd36514b191f63552c67948ce0c SHA512 ae5ca7c08dc052a20019309301d0d0d396498fc367614480c24192cc7fd059c31856d59594da7823463e14b769e4775d41c7942aa13d90ad7186aaa08ab4cdfc
 DIST nbconvert-5.2.1.tar.gz 510937 BLAKE2B aade38372775b032287f420ea4d335ad949a80afc0df63859db5a4f520bbaa22fcd17bf4318b05fa042fe94c2f65890aa2ed2365206abe8cdfb357817b056ac7 SHA512 c71c95d6c7bda4b55afad792d108d48c27857e060531dc8ec262673971c258ff9480821bd78ee5cbdbb19f107d5f8d19a49eac88819f20a09b450c26681335fa
-EBUILD nbconvert-4.1.0.ebuild 1738 BLAKE2B c7c1c32cf991b21981ae62aad553615015d05779ae1af789c8b27c0dbdee2f4e081105a5ee04d68fcd13468fd4d55eed2dec0f5070aa6bf5a2bfce806807c211 SHA512 9d908374f0b40cf6c7faed026a14dd628e4548c0a61e50c488a6604831704a6b35655a03d801de07510522cb00d8a705a9c7a278b9a884c020a3e2a32bb439da
-EBUILD nbconvert-4.2.0.ebuild 1812 BLAKE2B f33f301dc8b4c940fd4dec7f5e3d43454bfff5657b1f357f790340b1edfba73cbdd7ebc4589c29a9042a85bf69d5c6d1d9a03824e19877e728abc34e94b1d58a SHA512 b770bcf72c33f8997e39e114b025f8fb3c8fb3c6c17def4a728746b7c8b13fb0b646400e3291418171f2f95f0fdf369d99db191d5c34e5b1c5e992d0423013ea
-EBUILD nbconvert-4.3.0.ebuild 1764 BLAKE2B 078dc1a5414ae5dafd1ceb4673952dd59702441a35b3e8ab379d367c97d37ea366ea51f2a7e94e34d7628fdf4507a41086dcc34757ca2bbbc7897f969be8f553 SHA512 dd140f30b8e12e4905a4dbb59a01860301d0d0861d5944bb3d72547cc2284ad6a969695cdbc87d0ac3adb983dade48be46cbc5693c488d55ce24a0c0a5354308
-EBUILD nbconvert-5.2.1.ebuild 2135 BLAKE2B 8a80f9c44a1e3fb537d1b10240e82cd1b50fe5ee386d9e488536209ac863997230f16539dc048d3d3b6be160009f1e26df50deaf7e9d872ab135acba44255379 SHA512 1425dc5a1dd6291f301497bf768dc6bc4079fa40f9175afcb82c8d7871204f42a5f2005b3607828c2d0d866e6a63ab091ece4952f841430f0d7a67ef47b6b592
+EBUILD nbconvert-5.2.1.ebuild 2134 BLAKE2B ec64b45f1b9845bb9bc027d272cfe80a591d721858176fdedf9ec5f06c950cbe6aa354b2444f0318c39972f5a92eade2878788523fcccf16d10213e7fc1ba14f SHA512 67987d21d08b79238f831593b08f00cb962fc6799af62a97ea9ad4beb5044b2876fce05f264b71719ceeda26f45f6f73762204cfe421ee3a158d338d3194ba82
 MISC metadata.xml 534 BLAKE2B 011d472737f4929968f44c9ab3beaaff8938a4550096b8abc2bc7dc72acfbde4eb745527a6f9ce3d1188bdc09f11607db2d9515a89b53793a88259513cf0056c SHA512 8a00c8bf80e0e9477a531b70d9f2fbba1fc8c8bc09246a6a2263d94170d294e65e6a20f8ab84974e97b346c96b22e2ca648ef5021fc9316a023532ca34bd07d8
diff --git a/dev-python/nbconvert/files/nbconvert-4.1.0-docs-Makefile.patch b/dev-python/nbconvert/files/nbconvert-4.1.0-docs-Makefile.patch
deleted file mode 100644
index 130a4afc06cc..000000000000
--- a/dev-python/nbconvert/files/nbconvert-4.1.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-4.1.0.ebuild b/dev-python/nbconvert/nbconvert-4.1.0.ebuild
deleted file mode 100644
index 3d32feec95e2..000000000000
--- a/dev-python/nbconvert/nbconvert-4.1.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-MY_PN="nbconvert"
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docs-Makefile.patch
-)
-
-RDEPEND="
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/mistune[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		app-text/pandoc
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	nosetests --with-coverage --cover-package=nbconvert nbconvert || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if ! has_version app-text/pandoc ; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-4.2.0.ebuild b/dev-python/nbconvert/nbconvert-4.2.0.ebuild
deleted file mode 100644
index 63fcc4d00117..000000000000
--- a/dev-python/nbconvert/nbconvert-4.2.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/mistune[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		app-text/pandoc
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test --cov nbconvert -v --pyargs nbconvert || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if ! has_version app-text/pandoc ; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-4.3.0.ebuild b/dev-python/nbconvert/nbconvert-4.3.0.ebuild
deleted file mode 100644
index 15db15fac529..000000000000
--- a/dev-python/nbconvert/nbconvert-4.3.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/mistune[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		app-text/pandoc
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test --cov nbconvert -v --pyargs nbconvert || die
-}
-
-pkg_postinst() {
-	if ! has_version app-text/pandoc ; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-5.2.1.ebuild b/dev-python/nbconvert/nbconvert-5.2.1.ebuild
index fed6953c5408..37409d046e73 100644
--- a/dev-python/nbconvert/nbconvert-5.2.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-5.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="