gentoo auto-resync : 09:12:2023 - 17:12:21

3 files changed, 2 insertions, 82 deletions

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 121b4cb1a489..5aabe36a26e4 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,5 +1,3 @@
-DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8 SHA512 6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60
 DIST nbdime-4.0.1.tar.gz 9414125 BLAKE2B bf2581cec0f71ef8949c9cf19e21aa47302b6c71bbb9861e8c6f3a4b1921e9f73460ee5059e5bc92c7789d8f0695329125725c10e10763dd6e4d388bfaee53d1 SHA512 df14dfe9df296d71eb4a98140fe15703ca277063a153c3159cc883c99ce98b76f5f4dae24d32b048a18d2530e52535e3d89523d7a1c54a8654d2d54c8812ded3
-EBUILD nbdime-3.2.1.ebuild 2342 BLAKE2B aa4bb7f8b2d577a9b831f5c89e95597459cadb2f9b5d48178b9085898a6cac62e88e9675b20cb9443f24a65c83793699cdf94399a83b602653e9d4a0b5c46a25 SHA512 98336c4213be5cbd5aa7a65f89095b6f3d4fce74084f89ac3d2816950bc8b14c45a69056e58c68079353bc418266f85e0379c91d755854b39446967469ff2b42
-EBUILD nbdime-4.0.1.ebuild 1429 BLAKE2B f67d905cd2975ba5c37847be5887321e6820272ec42b2b504dbc5ba13fa46e2fc524399f488eb3b50a95df65af02ab7df38ded2af5c140387f60aba994a4a6a3 SHA512 310690668d9a480925fb92254567d16bf4e46733603577fc8c5fe46dd2975f1e61cee5329b288d1f5b6465d998a6661fb5b0f858740b2afec9c8d58ac13bcfe1
+EBUILD nbdime-4.0.1.ebuild 1424 BLAKE2B b89b992aedbf40c23755a6811cd7188501092798a23d9e8799d4db6fa52f6c267408c06cccf90310d6024dc3af080465dd218e04604d00d7ac7abb3516b044c3 SHA512 c424f57b65ad80371e3745182130fc7d2aefe1c69b27e155d0c701a0acd5963be9ce4cc3a68179e829265d541cfc4cc6eddf40c6baf20ab26a392e4691b37f42
 MISC metadata.xml 414 BLAKE2B 9951da7227d2b6628d68aeef19d236a17e9011c62f6318ff274f7979b0db4e7e84be7dfcaecb32c82069a761a743efe6c8b27cfbac421274c39e417cdcaaebf7 SHA512 7fe4193e5844adc4d403c8673acf55bd9c7322c484374072239dbb266e0312bdd9e7b18e0f338e45e602003c89f1cbf50090ae9fca2e38833e17d41dfe4e131e
diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild b/dev-python/nbdime/nbdime-3.2.1.ebuild
deleted file mode 100644
index 4f4655f22ce1..000000000000
--- a/dev-python/nbdime/nbdime-3.2.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbdime/
-	https://pypi.org/project/nbdime/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/recommonmark \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
-	nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
-	nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
-	nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
-	nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
-	nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
-	nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
-	nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
-	nbdime/tests/test_web.py::test_api_diff
-	nbdime/tests/test_web.py::test_api_merge
-	nbdime/tests/test_web.py::test_fetch_diff
-	nbdime/tests/test_web.py::test_fetch_merge
-	nbdime/tests/test_web.py::test_offline_mathjax
-)
-
-python_configure_all() {
-	DISTUTILS_ARGS=( --skip-npm )
-}
-
-src_test() {
-	# user.email and user.name are not configured in the sandbox
-	git config --global user.email "larry@gentoo.org" || die
-	git config --global user.name "Larry the Cow" || die
-
-	distutils-r1_src_test
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}"{/usr,}/etc || die
-}
diff --git a/dev-python/nbdime/nbdime-4.0.1.ebuild b/dev-python/nbdime/nbdime-4.0.1.ebuild
index 9e50c7b8d3c0..032ecd6510a0 100644
--- a/dev-python/nbdime/nbdime-4.0.1.ebuild
+++ b/dev-python/nbdime/nbdime-4.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]