7 files changed, 68 insertions, 107 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8e8f422c2ff8..89ebe94b4c47 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/editorconfig/Manifest b/dev-python/editorconfig/Manifest
index 2cd34de33be4..3a560975ef26 100644
--- a/dev-python/editorconfig/Manifest
+++ b/dev-python/editorconfig/Manifest
@@ -3,5 +3,5 @@ DIST editorconfig-core-py-0.12.4.gh.tar.gz 19411 BLAKE2B f1cbcce704efb9a185ff25e
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.gh.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
 EBUILD editorconfig-0.12.3-r1.ebuild 1196 BLAKE2B 4a9cb2c3725af2dd0937d7ecc892272fb3df9a9e9e5cc9915d220fbddd41cdcea042392c6b8e374f097ac8b8dcd9b0f6301bfddec104da933e3673fcde4b72c7 SHA512 870b92f303d2875b6c62b57aafa8d7f8de5248cc0fcba6856997f3d489d21e76f61400087e60e897a7f8bdf2c7fb939e53d1a4952d875b74e725078ada533062
-EBUILD editorconfig-0.12.4.ebuild 1235 BLAKE2B 2d2bebcdd6a130d157dd59d697f7f89937a38c5ba16b910ea35d169d2907cd1608c6a511f0452192ef23833e3c1895dcb1b2ad4dd03c25dbcedc8c444c1b1741 SHA512 33a243f35e2533323ce5745d913c2a311e3d90637773d666afe29b4df655a60b3b8b1fb6077373b6d2c94c4a4eec26d0529c5cd7689e0cd65174d0008637b215
+EBUILD editorconfig-0.12.4.ebuild 1139 BLAKE2B 1040161d37abf31ce579e4f7bb6acefacef7599bd832233b3620a81dfa058d765c3e01a47fc41eb57d95a04a50eeb27c8ca6b4fd65bd03482e48d83ac6382330 SHA512 69283f9a87d6f1d152ccd8513566abb14135fdda4c483e1ff7c4b4a0c05c9d998bdaa27778914c2c8e66c1648f0cf8a2c78e2bc755920231fdba48985260cbc6
 MISC metadata.xml 831 BLAKE2B 3eef9346c8fc78e09a5538c3dc7332edf53914bbf042bdb84b4173a3a6c7d00ec1e05054eb32e5641880e65957e1794a15dbcc748caf78e5d648c21b6deecffe SHA512 6de6c0a54227b593460da5c2e77ba739e854eaaf4576df55596d33f18417771d8f911d976fd7605c9ebf2bb332a934a89ef99e01da7940dc1b9603802c2bd949
diff --git a/dev-python/editorconfig/editorconfig-0.12.4.ebuild b/dev-python/editorconfig/editorconfig-0.12.4.ebuild
index 849c3cf6df6b..411fe28f0b88 100644
--- a/dev-python/editorconfig/editorconfig-0.12.4.ebuild
+++ b/dev-python/editorconfig/editorconfig-0.12.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake distutils-r1
 
@@ -29,7 +29,6 @@ IUSE="cli test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	!<app-vim/editorconfig-vim-0.3.3-r1
 	cli? ( !app-text/editorconfig-core-c[cli] )
 "
 
@@ -46,10 +45,6 @@ src_prepare() {
 }
 
 python_test() {
-	local mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-
 	cmake_src_configure
 	cmake_src_compile
 	cmake_src_test
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index c16caa6ecffe..f82d7e704466 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,5 @@
-DIST fonttools-4.47.0.gh.tar.gz 3810582 BLAKE2B a7821bca4507ba5638db537ba141bf7d1e2d5d23522f55766db0bc384ae366071e0848276285cff4056ffda513d94622f9b1154a43c2d8b341728790813b8124 SHA512 4a9a39b53248814dc2fcf648af5d7c8c79124a547d259571addb97c1e7181df7f20767baf5d2bb90f6c30790dd05c93c6bfac3281cedb91c73c45ad49039ee9b
 DIST fonttools-4.47.2.gh.tar.gz 3813471 BLAKE2B 7c478395e1c0cad52a29bc504bac235c4e198284a7f1f4b32e9db0704d3eeb56ea69d563a862239396fd1e67f47f168ae2f42676fe5ba3f9e1c356de8c5039f2 SHA512 03b6411c72ce38eeaa6401440d9612a37cd2ff6a686d7c6dbe7328a876f9e4369c06edea184ea72c1002b26b956d0196c241e40fe28b0ccf42f616ce9a700a07
 DIST fonttools-4.48.1.gh.tar.gz 3815962 BLAKE2B 86f93ddfbff0d3e5e165adc73908176ec3eee1d35d7009faa9827bc992d6bb5a11b95823596ae40ea739b117af7933fea0b768cf3a44d4cb770daa7db42048c9 SHA512 1f8336880575038f904873f6359b9c0a5885f14358c5560592b274db7aa2b96433770f5195e93ac04552f2580aadf0efc9268dcce9f0d178b78e75f5507dad67
-EBUILD fonttools-4.47.0.ebuild 2464 BLAKE2B 29ca95c136616778810dafcebe6fc0b39b81bae3f858129cdc49e4710355d725b4a50616c4ab6ff237c5cc54b4abe244a3ac1383382a1a91c6c8296a42566ad9 SHA512 c305e19e347b2caa371b313f5569caaabe63b453c5a41cfcc98f437784e19622b50a947c1be1e96664a9a9ff2668c58fee63915beec5d16bc59b53caa2dbea3e
 EBUILD fonttools-4.47.2.ebuild 2464 BLAKE2B 29ca95c136616778810dafcebe6fc0b39b81bae3f858129cdc49e4710355d725b4a50616c4ab6ff237c5cc54b4abe244a3ac1383382a1a91c6c8296a42566ad9 SHA512 c305e19e347b2caa371b313f5569caaabe63b453c5a41cfcc98f437784e19622b50a947c1be1e96664a9a9ff2668c58fee63915beec5d16bc59b53caa2dbea3e
 EBUILD fonttools-4.48.1.ebuild 2472 BLAKE2B c83e1dd9f98c2e7bc4e487c74d0cf1e5764dcaf41f447ac6b1f6b5b587bb8816a7ae0cb286248b09eec08ddac9369810210714c69813d4f836e4f175e86c5b65 SHA512 87a73844eb5f3e40fbc4f97d825b637e2916640cc7c526bff033f7b95b4a22826d287c0e2d3f3edd72f5a2cba4cf63220fc868fc651907349b35e7e63d473007
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.47.0.ebuild b/dev-python/fonttools/fonttools-4.47.0.ebuild
deleted file mode 100644
index b2122f7e18d7..000000000000
--- a/dev-python/fonttools/fonttools-4.47.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="
-	https://github.com/fonttools/fonttools/
-	https://pypi.org/project/fonttools/
-"
-SRC_URI="
-	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x FONTTOOLS_WITH_CYTHON=$(usex native-extensions)
-	[[ ${EPYTHON} == pypy3 ]] && FONTTOOLS_WITH_CYTHON=0
-	distutils-r1_python_compile
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# flaky test
-		Tests/ttLib/woff2_test.py::WOFF2ReaderTest::test_get_normal_tables
-	)
-
-	if [[ ${EPYTHON} == pypy3 ]] &&
-		has_version "dev-python/pyxattr[${PYTHON_USEDEP}]" &&
-		{
-			has_version "<dev-python/pypy3_10-exe-7.3.13_p2" ||
-			has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2"
-		}
-	then
-		EPYTEST_DESELECT+=(
-			# affected by a bug in PyPy/pyxattr
-			# https://github.com/iustin/pyxattr/issues/41
-			Tests/t1Lib/t1Lib_test.py::ReadWriteTest::test_read_with_path
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest \
-		-p rerunfailures --reruns=5 \
-		Tests fontTools || die -n "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 922db813dbc5..5b1ff170bb13 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,5 +1,7 @@
 DIST notebook-7.0.7.tar.gz 3936954 BLAKE2B 9171ae3974bd4eb36c804858224c386292a3772633017a8bf0c0ef408526278234b022087faad7930aa975c66762690e24a5a368bf9290937bdc8dff63757575 SHA512 05725f6bae2d916c9393f483a05696f6eb0e38a1b15a8427cbd61f508a06d78ead8a70c8764a00403c323b25a1278ea3a8daaf1ff5b5eeb0b35f6ed5e64ea638
 DIST notebook-7.0.8.tar.gz 3937092 BLAKE2B eb0276f42018e6c577a67ebbfc3c1bc7d81a9b1fd0ba039d1e6a7f3973edb35f3000a6720cf6af136a90c6268e711507155a872e02f91eeb39633e2faa55ae93 SHA512 d5616efcdf5863b5bb0b5d3be92654835773b49aa47660f2cd593240f9695ff2797233545be6215a5d0098501e8fa39f4123bf4348e1113b3be5ea29d51662f5
+DIST notebook-7.1.0.tar.gz 4896581 BLAKE2B 441aaa42f7fac8840c81fefbf1f43f8789a39c4294a1cfa7aa772bf803bde8de2635a5fdc5e4688254d0c280bc7f17ad144009ae1857054852347c52b73f4cdd SHA512 d456dcc6c4b40c646bb7eb77e6a59cd5a947148b05e3930e992a00d2a285c8867e42bf04a3c0cb45d2b5491f9da10a8e12727dc0de84728a6cdf91184c083aca
 EBUILD notebook-7.0.7.ebuild 1541 BLAKE2B e5a6b879fe317ac615ad141c5f2272b9ebc7fff473ec28dff29f8199e4b1cc8c5848ca3a6bc13138cdd66aede7c30cbfb9094f5a579c9c108650c6a0f780abbc SHA512 72aebc9998459beb5e65b8bb81fe0277e1ccaa2c46650b4b50604d8740b62619bb06053833b380880ad9800f857eb0204510afd8f9546226c6629f61382fa2e2
 EBUILD notebook-7.0.8.ebuild 1548 BLAKE2B b330efc3bf3e25c070e659d1d655a6e2149f045c63e28f199a5ebad34c1b06b46ba9e97af9cb9bb065aea6390a3a239f5fe4f71ed79b67cc3662810569b090a5 SHA512 ef49b13469bb2ab1f97547ab1bbef708fdbf19ed8e135335a0f5634358080a403dc352627a08c9032610acc3372bf2653cd3442b2e65953430aef262aa827d85
+EBUILD notebook-7.1.0.ebuild 1656 BLAKE2B ae6459fbe449eaaee529d387770c69371a049c4a961ff461bc5ca66059b63853a9e8ab06a01ce5f38cc0577468128c4f315ffce51a1a285cd8f2abd318795aeb SHA512 89c32d7bbb909a8f4ce5a44142cba4ace59f0980b456819d1bec310d30b6dcd891203d71426a0d3271d65f894f7b9c4432c9ad8b2b651c351a008b0043271675
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-7.1.0.ebuild b/dev-python/notebook/notebook-7.1.0.ebuild
new file mode 100644
index 000000000000..31ad57353c3d
--- /dev/null
+++ b/dev-python/notebook/notebook-7.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/notebook/
+	https://pypi.org/project/notebook/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-4.1.1[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.2[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.22.1[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/nbval[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}