gentoo resync : 25.11.2020

6 files changed, 3 insertions, 297 deletions

diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 78ea0b470791..13617ada1f41 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,14 +1,7 @@
 AUX nbconvert-5.6.1-inkscape-1.patch 6526 BLAKE2B f3baf2b80321e63a261ad281c81818d95bde8f719382cb8a4b2a2d4511e7c102658fcfec9f86067bb0c296caf9b164842986bb664ca7dc9184206e2a76b20221 SHA512 880385a0c42e185f01521ee26fe9d859c99c6ba3477e5b71d292cc0f6b4998a2b9c4ec0dcff5a30ca3fce261769c3481ec320b6c0ca0e0f46dd493e72b7267b3
 AUX nbconvert-5.6.1-py39.patch 1199 BLAKE2B 7ddcc42c81e9d86007142f3f5c6ce9a88b1ead4400c1e65f3c816e97fbc707eea3bd71a5bf64e6266678c1935a678321230a30d92522f6188f19d3273028647a SHA512 f9590d808cadea8a2c95079dbfe4aac4339ecddcb204e7b57a8c62f4cfd0545d17961b01599ec3f4ce52d772175be43ad441a0ebc56d52e6332fda11110f5463
 DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
-DIST nbconvert-6.0.3.tar.gz 848214 BLAKE2B 4265486536cfe0cf220b8080374726cc68be4f15033c8248806579b1ea1f759caa667ae11738acce1ecc812c65b954be1c21db0abe69db7bfdf67533ea052c3c SHA512 55e6fc1f136f8bc3b4b662011172ac3f61354ee1afa6904b5df34a382ae96f46e13f097f6067ca5e42d3fd0049f81a8a27d7b7faf605fa948e22d6067bc971ef
-DIST nbconvert-6.0.4.tar.gz 841651 BLAKE2B 080f60103709bd6ddb8258750a51e7bf8891adb1eb2921619cfbb0e774a585f3d3722758d8895f67a76e2705a15a0b35ffcb7c59842ec986a13315e5b10f4eca SHA512 46c2d250e25ad0e2fee0be0fefacc198687acd7ffcb4205bb8cf0ed263e90878cf659f352d551911b0025cb150302ea9ffd67b9453ec23fc5821908f7b56dd75
-DIST nbconvert-6.0.5.tar.gz 841650 BLAKE2B 7f8bb3849374284c90bd7b17c27a313c69694e42d4fd7b5913d3b210a15f17b89ffca8436ce31fa5bfc2b586feb536522106522f3d1741ad0fb6c2995a2e562e SHA512 79164546164eada6998bd6898833dfbada0a1476af8796bea40794f6caf121d0b9560f0f50e3d477357e977222a3b75f3de85ccfa03c4aec93be75801cf6f97c
-DIST nbconvert-6.0.6.tar.gz 888348 BLAKE2B 7662437e1436a4ee9694bc05b8472b64d0773c38cc5fda3372ce9009f5d6d20e2ffb28c4baf3442cbc88414ce97870cf15a102ee609f4aae2c951d3f7ac5202f SHA512 2be6a65ed86dd10fc4fd08536db304dc359da1af66c4f907753a419b8d9caec08274c07d110a060bdae5626bb48a4f6d209e423b8eacee420d3a4c6ef0f6bbf5
-EBUILD nbconvert-5.6.1-r1.ebuild 1774 BLAKE2B cf6aa9eb1227a7d9dedf168a661d88d922695bd9ee4ff5b45a835698d578994138ec910e8e0310dd6074ca04847b439c2f66e8b81c7d68a3663de37d7b3096ac SHA512 de02167b73df31f010047b24d886cee5f9aa05d7c907c523316cbaded195d31c4a0ddab2f1b1ed21f4a5291c2b9e7198844ebaef14d800cd8e6c76c752737b0f
+DIST nbconvert-6.0.7.tar.gz 896833 BLAKE2B 1b5b39144509aa9f61dc1e9675b112d69ed2e2f9859f3ce7ccfac517d89fff0010062c03ded1c3db571c84dd8d4f8ba12e4851245f370d2e671d24921dd50ab6 SHA512 3c78fa4d777a79a08606a39bb31f6b329dc9d28c1ef2ea9f3253746dce853a295e8fe85b14c65b04762aa5acd5facc879232a375875a2ca6dc9477cc1ab88786
 EBUILD nbconvert-5.6.1.ebuild 1774 BLAKE2B e63b986fd418ce6d54ee612cc2add3ec95c29608c158c07684fdfea0d068c7920039c8a557c28027c7e038cac93a50f47ac5f2ed9b2b5134c24411c47541f00e SHA512 769089b76c9c9d8c1ef6f982198a7e3cf309aca6417f9eae1424beac9d9e97f17fd6e0c00aca7c87df75e2aed1495750a66fd584d6994b98cd2e8d15b76a9473
-EBUILD nbconvert-6.0.3.ebuild 1976 BLAKE2B e3ff10bf3b11f3a0282c17ebfb71fdc45986565398f66948e12ee99ac90b130ea5967f00354013b1bb6b6e2f3c36d75046694611e7818e7292afd576d7debff6 SHA512 b2f4a879ad9ffa2c2d461a8aeea662a9a2d19a4ba626b48e04c1c0764de0b28f828ae24a1f02b07593c2d19f3e7ae13c4bcbd4cd5cae8649735e25e7bb831230
-EBUILD nbconvert-6.0.4.ebuild 1976 BLAKE2B e3ff10bf3b11f3a0282c17ebfb71fdc45986565398f66948e12ee99ac90b130ea5967f00354013b1bb6b6e2f3c36d75046694611e7818e7292afd576d7debff6 SHA512 b2f4a879ad9ffa2c2d461a8aeea662a9a2d19a4ba626b48e04c1c0764de0b28f828ae24a1f02b07593c2d19f3e7ae13c4bcbd4cd5cae8649735e25e7bb831230
-EBUILD nbconvert-6.0.5.ebuild 2009 BLAKE2B 47d4f34b2434561d78bf51ba10d94831cdc0275b2775dca0d4096b6ceb279e529bff5662ebe5568f24830d2d271227c8e3b2b36dc58090f839a3cf2182605d18 SHA512 2aeaad26c007e875cf810a6a87e5967d4282592829084f02382013c84778efa2fd13c476908d643ed21e7bf551e9de0f3e9f9dc9336c51c202ce79c1b892e52c
-EBUILD nbconvert-6.0.6.ebuild 2009 BLAKE2B 47d4f34b2434561d78bf51ba10d94831cdc0275b2775dca0d4096b6ceb279e529bff5662ebe5568f24830d2d271227c8e3b2b36dc58090f839a3cf2182605d18 SHA512 2aeaad26c007e875cf810a6a87e5967d4282592829084f02382013c84778efa2fd13c476908d643ed21e7bf551e9de0f3e9f9dc9336c51c202ce79c1b892e52c
+EBUILD nbconvert-6.0.7.ebuild 2007 BLAKE2B 6b9724e63d42137b35cac765d57dbb9dd0adaac784935f1f468566213a9b893ffc96ea8a223750cc93c93d6ffe8c17c102d2b0765509786749bfe846b858f96e SHA512 86e8e6e793d169bd302f68211c2024dc979e67c3a02df147d43a41577029bbdc6b3cd1bba27ab0d561269e87c449d966824e52136e7ef03db4918a13cedf6c47
 MISC metadata.xml 526 BLAKE2B 8dc0ccbe9aabcdc429a5559dc79beecd4937384f3c4d84d610f04fcc347c3b5746bfba4d096ef5251003a4f81e1159663fbe338a7d5dd0dcd19b9c97c43bc1f0 SHA512 ec7ec447bab3315501d428a1f3a1bcd6e512b028982985af9862334397d4d06c837f9e40628a6b750dc4bdb9844d2ad3fd3b4b44c8f1066e5f0fbd4e8ce1cd96
diff --git a/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
deleted file mode 100644
index 177e1a67086d..000000000000
--- a/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-		media-gfx/inkscape
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-inkscape-1.patch
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-src_prepare() {
-	# assumes old inkscape output?
-	sed -i -e '/SVG\.ipynb/d' \
-		nbconvert/preprocessors/tests/test_execute.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing bdist_egg
-	cd "${TEST_DIR}"/lib || die
-	pytest -vv --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-6.0.3.ebuild b/dev-python/nbconvert/nbconvert-6.0.3.ebuild
deleted file mode 100644
index 78d048b77205..000000000000
--- a/dev-python/nbconvert/nbconvert-6.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
-	dev-python/nbclient[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-		media-gfx/inkscape
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	mkdir -p "${HOME}/.local" || die
-	cp -r share "${HOME}/.local/" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local deselect=(
-		# Missing pyppeteer for now
-		# TODO: Doesn't skip?
-		--deselect exporters/tests/test_webpdf.py
-		# Needs pyppeteer too
-		--deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
-	)
-
-	distutils_install_for_testing bdist_egg
-	cd "${TEST_DIR}"/lib || die
-	pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
-}
-
-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-6.0.4.ebuild b/dev-python/nbconvert/nbconvert-6.0.4.ebuild
deleted file mode 100644
index 78d048b77205..000000000000
--- a/dev-python/nbconvert/nbconvert-6.0.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
-	dev-python/nbclient[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-		media-gfx/inkscape
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	mkdir -p "${HOME}/.local" || die
-	cp -r share "${HOME}/.local/" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local deselect=(
-		# Missing pyppeteer for now
-		# TODO: Doesn't skip?
-		--deselect exporters/tests/test_webpdf.py
-		# Needs pyppeteer too
-		--deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
-	)
-
-	distutils_install_for_testing bdist_egg
-	cd "${TEST_DIR}"/lib || die
-	pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
-}
-
-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-6.0.5.ebuild b/dev-python/nbconvert/nbconvert-6.0.5.ebuild
deleted file mode 100644
index 58b0853ec91c..000000000000
--- a/dev-python/nbconvert/nbconvert-6.0.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
-	dev-python/nbclient[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-		media-gfx/inkscape
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	mkdir -p "${HOME}/.local" || die
-	cp -r share "${HOME}/.local/" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local deselect=(
-		# Missing pyppeteer for now
-		# TODO: Doesn't skip?
-		--deselect exporters/tests/test_webpdf.py
-		# Needs pyppeteer too
-		--deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
-	)
-
-	distutils_install_for_testing bdist_egg
-	cd "${TEST_DIR}"/lib || die
-	pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
-}
-
-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-6.0.6.ebuild b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
index 58b0853ec91c..b023b8b59843 100644
--- a/dev-python/nbconvert/nbconvert-6.0.6.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]