gentoo resync : 20.03.2022

4 files changed, 9 insertions, 88 deletions

diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 6a5c806c6466..0ca62b5613c6 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,7 +1,5 @@
-DIST nbconvert-6.3.0.tar.gz 900850 BLAKE2B 8ef7d3bfcb914bf4be064ef440faab283fcc71e53579a681deb343d307a8b39cca2d0b83828b9df7c45ee7e9e06164ba6daa234b678197bc8a3202cd7e560c06 SHA512 efbe18c50e408fcb7d920c5ee070d19e19f0347f7073cf86b45046f3e30bd30ab8174115c539020fbf404faf5fc6e55dc7df1ad27accb45f1b2acf2db1d325e6
-DIST nbconvert-6.4.0.tar.gz 901586 BLAKE2B 85087046fe9a211c077165f47c03e7b025c770e2d409278703ddeef3c84b3d60e1ad28650f67fb9d68b72ad077db5bbd99af5c81ddf94fd7bf67471701dbdc4a SHA512 12662cca240a4c57a41e3bc7fedebd51c6fb83a0740afa7acfcc25424ca544a44b4dbfecfb9edb396360866de0b8fafad124fbb87c46c6f796661a7f40e96f68
-DIST nbconvert-6.4.1.tar.gz 900632 BLAKE2B 4946a5fd6e408951aad1d0015e3bc4aad812ca3d8f9d1ee8a45a9ffd12a23e25a5952a403082d78a488ac723e2540bc5e39f675de3c2ec5f7f2c67cdc00346de SHA512 9da691b404bb1fd052075bbc3d55adcce4fb6bcb822901c73d2d3d362555bc9794db98803563a2a61c5a1ce24d4f803c6135d0ea2a162933173d19c9c6ce4f48
-EBUILD nbconvert-6.3.0-r1.ebuild 2081 BLAKE2B d46b5917df34f5cf2b1eebc0e33de809f609f00dfd8b8f0226aa604599692904a966d2295c003dfc20a344ea8cddb05f15eab87635fecf67d62fa841f6bc18f5 SHA512 164265eee260d5f10b5eda9f69701ff771eb3c0f0b556f2226bfa01212f91d2410ef0b651ceeaf7eb3a8349f96a8b07ac92c950d8c77dce9f875ac27408991bf
-EBUILD nbconvert-6.4.0-r1.ebuild 2126 BLAKE2B 03efcd63b66a182997c1019d2201ec1be5c8e483bb7078cba0ef944936574fff47f89bd563c69100181a8a976843d84eb6c804b131a3cd1be0932dcf04918cc1 SHA512 be8b855e9085e0a7f7788b21b2e16fd962eae2e71ae3e3c9b73c9b1b9bb2d95c008912384bdbaa9f53be388e75c383b43f3f7ed1a67e4abf4356e1478ba885fa
-EBUILD nbconvert-6.4.1.ebuild 2088 BLAKE2B 41355a2782a8c51d7bf3adf2e1b410f9abaae60aad00c877e5c81b73dcf31cd2a1dcf446712d87a212242d7b0ed4b83f6b7d09bf3fcf867ce912e2dc052e46f1 SHA512 cfd9cc14a4a661868df1d5f675f2dc3a94ac6ce00d85f3a53aafa12fea227e570190f6656bdaacdd5d08561112b75c7869dd2814f70267425904a852c6545c7d
+DIST nbconvert-6.4.2.tar.gz 902691 BLAKE2B ee61836ac423db0803d90b92f5cfce7e53e311637dfff7e31e5506fc1588a41515e984860bc56f617b0e0add033c41e6d2099f2abfdda7f31015f6e751110639 SHA512 325637844044ff4a118ca7803e9803fd6909667e017dae04859f58a02e1aadc8b8c699f9b9612bd47991a4c06a23acd526abdcbf1a219e29d985001ae01237bb
+DIST nbconvert-6.4.4.tar.gz 906988 BLAKE2B 84ea6726804ccb738995df1e2e961a9816d3bf9c77034d464afbfa2ba0cf3ce19c1f6af1775fa027795ba3faeaacac765decce2d309f8a60a27e76934cdb356a SHA512 2b319fcc13c6b2addc7e1ca319f36e8a37e8390eb0d8d8df9f9456e7ae816b93ec30ab00a1003894c92091030658920729f0e31fdb5031dccb3f36b38b5d8f99
+EBUILD nbconvert-6.4.2.ebuild 1951 BLAKE2B 4b16d7f5fd67d498a9eddf4c83326888d34a1ef2e4887e78a6bc5cb3981a6966b0c6f03ab700550e74df6add290c0a60bfcce7e04e0f2792aa2bb457d0214bec SHA512 7d45586edc68357d71a74a84e0fa4f0398fccb3aa11f0b500d7c96a0f45d74cd9add874af6081246087cda435cc92446117199a9c9f53e7615874238342abb59
+EBUILD nbconvert-6.4.4.ebuild 2001 BLAKE2B 52386a9cbcadce8335a3c690b78911381d3146945897583b320c727ca5a0e49a552ccda1585c4d1ffde6ef233148267701244faf032870c0876f74fdf997d5d8 SHA512 64a2adb2595bc9a99473df2f8111fafb95e1d7b9d8a313930c582453e2bc6f35de280daa2196708ad81d2394ac489b290b176c368e74cd3651105e1480185032
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.3.0-r1.ebuild b/dev-python/nbconvert/nbconvert-6.3.0-r1.ebuild
deleted file mode 100644
index 80fa64db3799..000000000000
--- a/dev-python/nbconvert/nbconvert-6.3.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc 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-5.1.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-# Skip inkscape on hppa b/c tests should skip it gracefully if not around
-# It's a heavy dependency.
-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}]
-		!hppa? ( 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 EPYTEST_DESELECT=(
-		# Missing pyppeteer for now
-		# TODO: Doesn't skip?
-		nbconvert/exporters/tests/test_webpdf.py
-		# Needs pyppeteer too
-		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
-	)
-
-	distutils_install_for_testing bdist_egg
-	cd "${TEST_DIR}"/lib || die
-	epytest --pyargs nbconvert
-}
-
-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.4.0-r1.ebuild b/dev-python/nbconvert/nbconvert-6.4.2.ebuild
index f75e157ec267..6dbfc1b185b8 100644
--- a/dev-python/nbconvert/nbconvert-6.4.0-r1.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.4.2.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Converting Jupyter Notebooks"
@@ -12,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
@@ -31,15 +33,12 @@ RDEPEND="
 	dev-python/testpath[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 "
-# Skip inkscape on hppa b/c tests should skip it gracefully if not around
-# It's a heavy dependency.
 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}]
-		!hppa? ( media-gfx/inkscape )
 	)
 "
 
@@ -60,8 +59,6 @@ python_test() {
 		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
 	)
 
-	distutils_install_for_testing bdist_egg
-	cd "${TEST_DIR}"/lib || die
 	epytest --pyargs nbconvert
 }
 
diff --git a/dev-python/nbconvert/nbconvert-6.4.1.ebuild b/dev-python/nbconvert/nbconvert-6.4.4.ebuild
index 11a5f40b26cd..e67490b889a2 100644
--- a/dev-python/nbconvert/nbconvert-6.4.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.4.4.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Converting Jupyter Notebooks"
@@ -16,6 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
@@ -32,15 +34,12 @@ RDEPEND="
 	dev-python/testpath[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 "
-# Skip inkscape on hppa b/c tests should skip it gracefully if not around
-# It's a heavy dependency.
 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}]
-		!hppa? ( media-gfx/inkscape )
 	)
 "