gentoo resync : 16.04.2022

4 files changed, 6 insertions, 78 deletions

diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index a77b989c5690..a889581c8711 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,7 +1,5 @@
-DIST nbconvert-6.4.2.tar.gz 902691 BLAKE2B ee61836ac423db0803d90b92f5cfce7e53e311637dfff7e31e5506fc1588a41515e984860bc56f617b0e0add033c41e6d2099f2abfdda7f31015f6e751110639 SHA512 325637844044ff4a118ca7803e9803fd6909667e017dae04859f58a02e1aadc8b8c699f9b9612bd47991a4c06a23acd526abdcbf1a219e29d985001ae01237bb
-DIST nbconvert-6.4.4.tar.gz 906988 BLAKE2B 84ea6726804ccb738995df1e2e961a9816d3bf9c77034d464afbfa2ba0cf3ce19c1f6af1775fa027795ba3faeaacac765decce2d309f8a60a27e76934cdb356a SHA512 2b319fcc13c6b2addc7e1ca319f36e8a37e8390eb0d8d8df9f9456e7ae816b93ec30ab00a1003894c92091030658920729f0e31fdb5031dccb3f36b38b5d8f99
 DIST nbconvert-6.4.5.tar.gz 906309 BLAKE2B 5aee22eb9ce6bb36e04cc3b3db5460041b0a2dfb4afeb1e4787e941d6815f22b7621104ca6d14cb0977c5d09f9a0fade8a5787416b5f55ca1b09149730560bf7 SHA512 9a32eceaff065016baea9fc79478aeb8981f55a2cd47889e640815f2bf924df201d9ce72a4b615d533bcadbd681900678d30de61f777ae4f12bd9fce62d73622
-EBUILD nbconvert-6.4.2.ebuild 1950 BLAKE2B 57c46c9cb91a9184828662f72e1ff8829c4300dd261d7880c8474f111aad9118e91008e43796460b868400189f4d7f1038dff09f33388d1fe628b30d5d9dc4b0 SHA512 cf15a34a5eab40af2ac832a52d599cd3ae45588975730c0fe30436ebb1cf9242c8596512724ec8bf9d26d829f6312c03114c3e8fe19b5131cfb62994f990ab3e
-EBUILD nbconvert-6.4.4.ebuild 2001 BLAKE2B 52386a9cbcadce8335a3c690b78911381d3146945897583b320c727ca5a0e49a552ccda1585c4d1ffde6ef233148267701244faf032870c0876f74fdf997d5d8 SHA512 64a2adb2595bc9a99473df2f8111fafb95e1d7b9d8a313930c582453e2bc6f35de280daa2196708ad81d2394ac489b290b176c368e74cd3651105e1480185032
-EBUILD nbconvert-6.4.5.ebuild 2048 BLAKE2B 284e671a8d0aa7bd34c14ef3fdaa3c746576126ecf7f0bd1a285dd3cc625146f8c7b8832434c8ff8727bee6fed82602ceed0734dfb5ac486902e0349052290f3 SHA512 c206b09549758c34e3940ce0c9fa846e1127b9e4eab924c6748589653df4acfd5ec99b63b1113e17c676ac52917bdf0069b79c964c295564c6d49dca2e191082
+DIST nbconvert-6.5.0.tar.gz 908377 BLAKE2B a91c6c93e9e33f90c5c7f19743e20aa6cf88e5dd29be4ee777744d96037dddd15294858776c8391d79f5436e929fb1b623a3f11f6c4cbcf60728dba2204b6e2e SHA512 4e0d26d581435525f819c05207890cc7cbeaff786a16c354f0356c9bc50111a724a92b7e15445a0cf0ebf1e1c2f0ff064a2c8722267f66dd8677ad82b5e61714
+EBUILD nbconvert-6.4.5.ebuild 2041 BLAKE2B 0da6d5f0c013a847375c55d6f5ce05bc3769b4c0b81a1b93acf92c75ae784ccb0b5736c9604ad02d118225816172cd94422ea53cf75b99710b36574dbf038c33 SHA512 a4d2fd0847a2911dc925581d0faa57cf823caf559f980c499f8d850ac2125817e52efd7ae17db1ba9521212b902870acc269b9cb0dfa9c937357d12e6f9a8015
+EBUILD nbconvert-6.5.0.ebuild 2046 BLAKE2B dffc6c2a59ed5e8f475c18a46b3e28b459a14f9ee555b6332790d5da2979837b1c698a1583affab565d3cc0d57485e535989b3340a91f579bbda99e74bd6255f SHA512 0a0e3173e426b3d27e2384f6a682e1ff618bde07fa0f905848fe3801f72ce5d96b1c39564b22afc4ac7b1d825e596f67e1b33964d32325ea2e946107e28152ac
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.4.2.ebuild b/dev-python/nbconvert/nbconvert-6.4.2.ebuild
deleted file mode 100644
index 1bd34c3eaef3..000000000000
--- a/dev-python/nbconvert/nbconvert-6.4.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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.8.1[${PYTHON_USEDEP}]
-	<dev-python/mistune-2[${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}]
-"
-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}]
-	)
-"
-
-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'
-	)
-
-	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.5.ebuild b/dev-python/nbconvert/nbconvert-6.4.5.ebuild
index ed66dc80cf13..da5877b38a2e 100644
--- a/dev-python/nbconvert/nbconvert-6.4.5.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.4.5.ebuild
@@ -14,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/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-6.4.4.ebuild b/dev-python/nbconvert/nbconvert-6.5.0.ebuild
index e67490b889a2..89f78c3cd38a 100644
--- a/dev-python/nbconvert/nbconvert-6.4.4.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.0.ebuild
@@ -14,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/beautifulsoup4[${PYTHON_USEDEP}]
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
 	>=dev-python/mistune-0.8.1[${PYTHON_USEDEP}]
 	<dev-python/mistune-2[${PYTHON_USEDEP}]
 	dev-python/nbclient[${PYTHON_USEDEP}]