gentoo auto-resync : 21:03:2025 - 00:31:16

6 files changed, 16 insertions, 1176 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 0f7902805555..8cee92183881 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,16 +1,9 @@
 AUX matplotlib-3.10.0-test.patch 9677 BLAKE2B d4c4f6611dba8eff0395d1c820cbfa256773b6f3b17bfda9da50892a988a60dd2af4ebdbadf1e6a6334d1a3e99fedc0da9f4027a66161583cc3dc397ebf02b57 SHA512 8cdb1f2383329fd67fd936dcd8e396fcd0e965573bbf6460cab182249352cfd747d20d4e0333688426a548b8fccc6f737ea3b575361fc137b712b21c0990b524
 AUX matplotlib-3.10.1-test.patch 9626 BLAKE2B 4e7a2b056c122fbd89ce38417526b350bfae7fb41770e1f7e53b463840d48800619fe1fb35eb32279b8b80c7dbe88fe31a67ccadba6aad70c1efef8683d4ee29 SHA512 ca3cb17124d151ccda33cadca326462a3923271596d9f79ef021f243715e1d0bb03c3cb00f6c799b2a9d1fd106281730adb9e71679f0549aa43050089e7c4898
 AUX matplotlib-3.9.0-test.patch 10334 BLAKE2B bebd372120c38577ad3a21f99cfb6989fdda774975622e6b3699a73505fc1e350cb76188d0c173bbd0bf94bfc787916c1732cdc2a7998322d8d15aba85dc16f8 SHA512 c49f4f3c3c917a12887872373ea0f817c12ba780d1da6c65edfcf8b7ffdef45d35d1b3f186bd36d7684f8ba30fe034b512fcae42b5adc8c4e5dec2e9d8685a01
-AUX matplotlib-3.9.3-test.patch 10361 BLAKE2B b2ba41ee8ee05ec3a8d5cbf9e2805292475fd236736c1f47bca0dd4a437a4c3aff67ab2f394337f4056eb6db662517f1b697799463bd9f30da87b413590a7504 SHA512 a4b9be1f7f6cdad766d776eb0036b44952ba74ca5f7fab9676ece143f956f65e1f80cae3ae6c62fba51918f452673243213ae02aea53de28c18023cdd60ba1b4
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
-DIST matplotlib-3.10.0.tar.gz 36686418 BLAKE2B b154d4d2512a7989d967e7e257ef148e530b1bb030375fe0443f0feb3adea8b0cdc0287d292587832542f6263ccbbb89860fa0b827301fb9dbed34f6a197a475 SHA512 31a71640ef9cbc8cae928156c70119a0bdc1a8c44c8dc5af5333f5484525dd6a375e6f263d739ad3422b0e35d474f7742e08c71c40df0f1f71b526e21adc17e1
 DIST matplotlib-3.10.1.tar.gz 36743335 BLAKE2B e689dcaa314a6af8ce2934aac95208adf0f87822e4f84d6fb15ac1a17d162deea106636abf52b5332636ad8bb944301f16100b15d409b04ef2a8ecd287ea827c SHA512 1b52a421e61ca0a295d7b1d2bbe9bdcb1dd58f6c750b21d95e263547b20a17d58aadcc86f97ae0fdff9151d3c2f75a6c5419a35b258b698d777f42de7b598c4e
 DIST matplotlib-3.9.0.tar.gz 36069890 BLAKE2B 02ddb25901b5a93a8daf6f26c98b92d5e35abe2e98783b039928338abb1d628adbf3fd4786c08cb1610bf405cb558ca31fc12dbde77ec5f2a633143c7ea659a1 SHA512 135ee2f97c26cb60479cc10bf8a833384c393993d8a905ab869f4c73b91a50ffa596f84ce349af7f1a0b08a21e1906394cf6a702bb567a9c3999d40f54974326
-DIST matplotlib-3.9.2.tar.gz 36088381 BLAKE2B c84d08b7afa1f0460b5b57447481ef90f22380c02d20227c3a45b6f603032a11359b223397f18c8dc9111ad36fbd7510e2d5496502b3202e3074ddf8e8258bb7 SHA512 4b7437eeb085915a90db64600d0e6c59501ea1513d07b8298a159a763461ef6947a0cb332dcde1a5f0996840320ca7dd1d972d7514ff6f87b036fc631e79885f
-DIST matplotlib-3.9.4.tar.gz 36106529 BLAKE2B f95791bce82bf62d922e3db7ebe8e34e5759896c26cf952e2c67e92d5c4e5e190c556ba3ff4d7160d60de3c90ed5e1dc4d7ca2866647ded6b96dd35e16d4e259 SHA512 adfa875cba0b030ee0efaf11ed1be881858dc13391c966a2d9485ae2358fccf0b5356e16966a0c9da9f682e4a9d2f3960551756aca30ddc048632346548b1447
-EBUILD matplotlib-3.10.0.ebuild 10948 BLAKE2B 766293af9a4d46f9196e0d9dbe03a5c696b3e155a7a50e8429d7b56d3a8a7f404f02f63e915e07584306a23a4168ca8e056d58548b4aa6cf658fbcfb19fc3d74 SHA512 c5ed7779eff4937050aa45613679dda9ec7d2b30f4d813123898f0ba6facd39766f5d0c65039baae6ace71f24f9aa68ac8c0756c844a53d2a9f06e06cf1114fc
-EBUILD matplotlib-3.10.1.ebuild 10666 BLAKE2B 363141a81aab7e88e70d69e56f84627ccf720d86f9185f0ba89c94e091e2acbeca58b6defaafc6a3ec185c1fa32660dd12f5525b844906b86590eccae7e225ff SHA512 52ce6586152bce6265c31aff536f56a6586ba136b1f005893f710b21c2aeeecb3d723dd946fb8aa6f1eaea1382ab290f3b2f055df5b1cd4f5a00c9df38e2783c
+EBUILD matplotlib-3.10.1.ebuild 11001 BLAKE2B b0a141d368f8dca75a051205ede4987bfb5a5dfbe5e136b3a053ac823b6ce5b2d0052095b254b12257889c88a2569cc992ba7197c3d79f78250e427de138613c SHA512 6e48708586605c0e25332fc0790dd96f8fc1fdf744161e85e4165b240ae9f21833c6ce0eead3a93122cda0f2734492ad3a652efc97c2d853129b455adfde9263
 EBUILD matplotlib-3.9.0-r1.ebuild 9776 BLAKE2B 9f05ba95f89bb02c04d3338ca750b4b404a531e78c287208b7ecd9f04525adc23593c3b9f5e981d5e23357bf236d6487185cff354e7c80825d1342ff4720ec37 SHA512 120ae193b6b9b16dcd554cd818b52a80f529c6e72e7b67752707fc70407d6b7dc18908ab01ce81ee6d192063dd8bbd4165e17da76200310b74ff9df5ecced82e
-EBUILD matplotlib-3.9.2.ebuild 9808 BLAKE2B 852614b4db23c8eebbeece82fae15bd681a1cbe5ea637e2760fe399a87f0010d9c5c50524ee8f5dc3fccfd6de1f72ee5963798c6ec8ed6c2ddea27c37bb310ce SHA512 ff8dfb1e20bbd4b7fd2dffb880099c2e14b087229bd3fc7b1b0ca1c5108f72e52735f76808cc6408239e96d71c14801a534133ce60da61d25337eee09fdb255c
-EBUILD matplotlib-3.9.4.ebuild 9811 BLAKE2B 10a4c8972a6e8d60c11405b0a0a0f22050f520e0b142e261c824def7289fdeb30dd1e957fe92084b7224e4d72bfd67c68db7b6391301162b73c08d6853ed381d SHA512 5f46034244edecb756035e876e15e04ae9b017d46e1b1cdb0d41f79826246c643a1d71c35ee418c5eb457bfd54d7a2de7d19c994d2bc249b55b4fdaf71578c86
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/files/matplotlib-3.9.3-test.patch b/dev-python/matplotlib/files/matplotlib-3.9.3-test.patch
deleted file mode 100644
index 62461c655d88..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.9.3-test.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
-index 254b86cb54..1f93b1a476 100644
---- a/lib/matplotlib/tests/test_arrow_patches.py
-+++ b/lib/matplotlib/tests/test_arrow_patches.py
-@@ -68,7 +68,7 @@ def __prepare_fancyarrow_dpi_cor_test():
- 
- 
- @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02,
-+                  tol=0.015 if platform.machine() == 'x86_64' else 0.02,
-                   savefig_kwarg=dict(dpi=100))
- def test_fancyarrow_dpi_cor_100dpi():
-     """
-@@ -83,7 +83,7 @@ def test_fancyarrow_dpi_cor_100dpi():
- 
- 
- @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02,
-+                  tol=0.018 if platform.machine() == 'x86_64' else 0.02,
-                   savefig_kwarg=dict(dpi=200))
- def test_fancyarrow_dpi_cor_200dpi():
-     """
-@@ -116,7 +116,7 @@ def test_fancyarrow_dash():
- 
- 
- @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02)
-+                  tol=0.005 if platform.machine() == 'x86_64' else 0.02)
- def test_arrow_styles():
-     styles = mpatches.ArrowStyle.get_styles()
- 
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index e99ef129eb..73ed9bd974 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -1186,7 +1186,7 @@ def test_imshow():
- 
- @image_comparison(
-     ['imshow_clip'], style='mpl20',
--    tol=1.24 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x') else 0)
-+    tol=1.24)
- def test_imshow_clip():
-     # As originally reported by Gellule Xg <gellule.xg@free.fr>
-     # use former defaults to match existing baseline image
-@@ -2570,7 +2570,7 @@ def test_contour_hatching():
- 
- @image_comparison(
-     ['contour_colorbar'], style='mpl20',
--    tol=0.54 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x') else 0)
-+    tol=0.54)
- def test_contour_colorbar():
-     x, y, z = contour_dat()
- 
-@@ -4931,7 +4931,7 @@ def test_vertex_markers():
- 
- 
- @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.026)
-+                  tol=0.015 if platform.machine() == 'x86_64' else 0.026)
- def test_eb_line_zorder():
-     x = list(range(10))
- 
-@@ -8861,7 +8861,7 @@ def test_zorder_and_explicit_rasterization():
- 
- 
- @image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20",
--                  tol=0.027 if platform.machine() == "arm64" else 0)
-+                  tol=0.027 if platform.machine() == "arm64" else 0.02)
- def test_preset_clip_paths():
-     fig, ax = plt.subplots()
- 
-diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
-index 35911afc79..852075c78d 100644
---- a/lib/matplotlib/tests/test_colorbar.py
-+++ b/lib/matplotlib/tests/test_colorbar.py
-@@ -235,7 +235,7 @@ def test_colorbar_single_ax_panchor_east(constrained):
- 
- 
- @image_comparison(['contour_colorbar.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.054)
-+                  tol=0.01 if platform.machine() == 'x86_64' else 0.054)
- def test_contour_colorbar():
-     fig, ax = plt.subplots(figsize=(4, 2))
-     data = np.arange(1200).reshape(30, 40) - 500
-diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index 4dc4d9501e..015e46cbe4 100644
---- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -655,11 +655,11 @@ def test_compressed1():
-     fig.draw_without_rendering()
- 
-     pos = axs[0, 0].get_position()
--    np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
--    np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3)
-+    np.testing.assert_allclose(pos.x0, 0.06195, atol=2e-3)
-+    np.testing.assert_allclose(pos.y1, 0.8537, atol=2e-3)
-     pos = axs[1, 2].get_position()
--    np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3)
--    np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3)
-+    np.testing.assert_allclose(pos.x1, 0.8618, atol=2e-3)
-+    np.testing.assert_allclose(pos.y0, 0.1934, atol=2e-3)
- 
- 
- @pytest.mark.parametrize('arg, state', [
-diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index a3e00c30ce..7366dc8b39 100644
---- a/lib/matplotlib/tests/test_contour.py
-+++ b/lib/matplotlib/tests/test_contour.py
-@@ -450,8 +450,7 @@ def test_contourf_log_extension(split_collections):
- @pytest.mark.parametrize("split_collections", [False, True])
- @image_comparison(
-     ['contour_addlines.png'], remove_text=True, style='mpl20',
--    tol=0.15 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x')
--        else 0.03)
-+    tol=0.15)
- # tolerance is because image changed minutely when tick finding on
- # colorbars was cleaned up...
- def test_contour_addlines(split_collections):
-diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 6e6daa7706..7492fded94 100644
---- a/lib/matplotlib/tests/test_figure.py
-+++ b/lib/matplotlib/tests/test_figure.py
-@@ -26,7 +26,7 @@ import matplotlib.dates as mdates
- 
- 
- @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_align_labels():
-     fig = plt.figure(layout='tight')
-     gs = gridspec.GridSpec(3, 3)
-@@ -68,7 +68,7 @@ def test_align_labels():
- 
- @image_comparison(['figure_align_titles_tight.png',
-                    'figure_align_titles_constrained.png'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.022,
-+                  tol=0.01 if platform.machine() == 'x86_64' else 0.022,
-                   style='mpl20')
- def test_align_titles():
-     for layout in ['tight', 'constrained']:
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index 0c032fa536..5e417881e9 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -1417,7 +1417,7 @@ def test_nonuniform_and_pcolor():
- 
- @image_comparison(
-     ['rgba_antialias.png'], style='mpl20', remove_text=True,
--    tol=0 if platform.machine() == 'x86_64' else 0.007)
-+    tol=0.007)
- def test_rgba_antialias():
-     fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False,
-                             sharey=False, constrained_layout=True)
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index 3c2af27564..c65887b5e4 100644
---- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -177,7 +177,7 @@ def test_multiple_keys():
- 
- 
- @image_comparison(['rgba_alpha.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.03)
-+                  tol=0.02 if platform.machine() == 'x86_64' else 0.03)
- def test_alpha_rgba():
-     fig, ax = plt.subplots()
-     ax.plot(range(10), lw=5)
-@@ -186,7 +186,7 @@ def test_alpha_rgba():
- 
- 
- @image_comparison(['rcparam_alpha.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.03)
-+                  tol=0.02 if platform.machine() == 'x86_64' else 0.03)
- def test_alpha_rcparam():
-     fig, ax = plt.subplots()
-     ax.plot(range(10), lw=5)
-@@ -214,7 +214,7 @@ def test_fancy():
- 
- 
- @image_comparison(['framealpha'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.024)
-+                  tol=0.02 if platform.machine() == 'x86_64' else 0.024)
- def test_framealpha():
-     x = np.linspace(1, 100, 100)
-     y = x
-diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
-index 902b7aa2c0..d5145a38f0 100644
---- a/lib/matplotlib/tests/test_lines.py
-+++ b/lib/matplotlib/tests/test_lines.py
-@@ -185,7 +185,7 @@ def test_set_drawstyle():
- 
- @image_comparison(
-     ['line_collection_dashes'], remove_text=True, style='mpl20',
--    tol=0 if platform.machine() == 'x86_64' else 0.65)
-+    tol=0.65)
- def test_set_line_coll_dash_image():
-     fig, ax = plt.subplots()
-     np.random.seed(0)
-diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index ae6372fea1..4f0dc25732 100644
---- a/lib/matplotlib/tests/test_units.py
-+++ b/lib/matplotlib/tests/test_units.py
-@@ -79,7 +79,7 @@ def quantity_converter():
- # Tests that the conversion machinery works properly for classes that
- # work as a facade over numpy arrays (like pint)
- @image_comparison(['plot_pint.png'], style='mpl20',
--                  tol=0 if platform.machine() == 'x86_64' else 0.03)
-+                  tol=0.002 if platform.machine() == 'x86_64' else 0.03)
- def test_numpy_facade(quantity_converter):
-     # use former defaults to match existing baseline image
-     plt.rcParams['axes.formatter.limits'] = -7, 7
-@@ -106,7 +106,7 @@ def test_numpy_facade(quantity_converter):
- 
- # Tests gh-8908
- @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
--                  tol=0 if platform.machine() == 'x86_64' else 0.02)
-+                  tol=0.02)
- def test_plot_masked_units():
-     data = np.linspace(-5, 5)
-     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
-diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
-index 342face450..c7256586bc 100644
---- a/lib/matplotlib/tests/test_usetex.py
-+++ b/lib/matplotlib/tests/test_usetex.py
-@@ -15,6 +15,7 @@ import matplotlib.pyplot as plt
- pytestmark = needs_usetex
- 
- 
-+@pytest.mark.skip(reason="TODO: broken")
- @image_comparison(
-     baseline_images=['test_usetex'],
-     extensions=['pdf', 'png'],
-@@ -65,7 +66,7 @@ def test_mathdefault():
-     fig.canvas.draw()
- 
- 
--@image_comparison(['eqnarray.png'])
-+@image_comparison(['eqnarray.png'], tol=23)
- def test_multiline_eqnarray():
-     text = (
-         r'\begin{eqnarray*}'
-@@ -163,7 +164,7 @@ except mpl.ExecutableNotFoundError:
- 
- 
- @image_comparison(baseline_images=['rotation'], extensions=['eps', 'pdf', 'png', 'svg'],
--                  style='mpl20', tol=3.91 if _old_gs_version else 0)
-+                  style='mpl20', tol=30)
- def test_rotation():
-     mpl.rcParams['text.usetex'] = True
- 
diff --git a/dev-python/matplotlib/matplotlib-3.10.0.ebuild b/dev-python/matplotlib/matplotlib-3.10.0.ebuild
deleted file mode 100644
index f0614aabd4ed..000000000000
--- a/dev-python/matplotlib/matplotlib-3.10.0.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 pypi virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI+="
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets"
-
-DEPEND="
-	media-libs/freetype:2
-	>=media-libs/qhull-2013:=
-	>=dev-python/numpy-1.25:=[${PYTHON_USEDEP}]
-"
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	${DEPEND}
-	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8[jpeg,webp,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/libpng:0
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt6? (
-		$(python_gen_cond_dep '
-			|| (
-				dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}]
-				dev-python/pyside:6[gui,widgets,${PYTHON_USEDEP}]
-			)
-		' 'python3*')
-	)
-	webagg? (
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{10..12})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		$(python_gen_impl_dep 'tk')
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-		!hppa? ( !s390? (
-			|| (
-				media-video/ffmpeg[openh264]
-				media-video/ffmpeg[x264]
-			)
-		) )
-		gtk3? (
-			>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3[introspection]
-		)
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	# do not unpack freetype
-	unpack "${P//_/}.tar.gz"
-}
-
-python_prepare_all() {
-	# Affects installed _version.py, bug #854600
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.10.0-test.patch
-	)
-
-	# increase lock timeout to 30 s
-	sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	unset DISPLAY # bug #278524
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	DISTUTILS_ARGS=(
-		-Dsystem-freetype=true
-		-Dsystem-qhull=true
-		-Dmacosx=false
-	)
-}
-
-src_test() {
-	mkdir subprojects/packagecache || die
-	cp "${DISTDIR}/freetype-${FT_PV}.tar.gz" subprojects/packagecache/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-		tests/test_legend.py::test_legend_nolabels_warning
-		# TODO?
-		tests/test_backend_qt.py::test_fig_sigint_override
-		tests/test_backend_qt.py::test_ipython
-		tests/test_backend_nbagg.py::test_ipynb
-		# leak tests are fragile
-		tests/test_backends_interactive.py::test_figure_leak_20490
-		# major "images not close", new texlive perhaps
-		tests/test_contour.py::test_all_algorithms
-		# "no warnings"
-		tests/test_backend_pdf.py::test_invalid_metadata
-		tests/test_figure.py::test_too_many_figures
-		# Requires qt5
-		tests/test_backends_interactive.py::test_qt5backends_uses_qt5
-		'tests/test_backends_interactive.py::test_interactive_backend[toolbar2-MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
-		'tests/test_backends_interactive.py::test_interactive_backend[toolbar2-MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]'
-		'tests/test_backends_interactive.py::test_interactive_backend[toolmanager-MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
-		'tests/test_backends_interactive.py::test_blitting_events[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
-		'tests/test_backends_interactive.py::test_blitting_events[MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]'
-		'tests/test_backends_interactive.py::test_interactive_thread_safety[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
-		'tests/test_backends_interactive.py::test_interactive_timers[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
-		'tests/test_backends_interactive.py::test_interactive_timers[MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]'
-		# Tests mixing qt5 and qt6, requires installing all Qt4Py impl.
-		tests/test_backends_interactive.py::test_cross_Qt_imports
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# TODO: warning isn't passed through
-				tests/test_image.py::test_large_image
-				# TODO
-				tests/test_pickle.py::test_complete
-				tests/test_pickle.py::test_no_pyplot
-				tests/test_pickle.py::test_pickle_load_from_subprocess
-				tests/test_pickle.py::test_simple
-				tests/test_texmanager.py::test_openin_any_paranoid
-				tests/test_widgets.py::test_check_buttons
-				tests/test_widgets.py::test_check_buttons_lines
-				tests/test_widgets.py::test_check_radio_buttons_image
-				tests/test_widgets.py::test_radio_buttons
-			)
-			;;
-		pypy3.11)
-			EPYTEST_DESELECT+=(
-				# TODO: warning isn't passed through
-				tests/test_image.py::test_large_image
-				# TODO
-				tests/test_axes.py::test_axes_clear_reference_cycle
-				tests/test_pickle.py::test_complete
-				tests/test_pickle.py::test_no_pyplot
-				tests/test_pickle.py::test_pickle_load_from_subprocess
-				tests/test_pickle.py::test_simple
-				tests/test_texmanager.py::test_openin_any_paranoid
-			)
-			;;
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# https://github.com/matplotlib/matplotlib/issues/23384
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/test_constrainedlayout.py::test_compressed1
-			)
-			;;
-	esac
-
-	case ${ABI} in
-		hppa)
-			EPYTEST_DESELECT+=(
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace without value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[function without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[accent without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline with empty parameter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[left with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[right with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses with sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses without sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[underset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unknown symbol]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double superscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double subscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[super on sub without braces]'
-				'tests/test_quiver.py::test_barbs[png]'
-				'tests/test_quiver.py::test_barbs_pivot[png]'
-				'tests/test_quiver.py::test_barbs_flip[png]'
-				'tests/test_text.py::test_parse_math'
-				'tests/test_text.py::test_parse_math_rcparams'
-			)
-			;&
-		alpha|arm|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				'tests/test_axes.py::test_psd_csd[png]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	local DISTUTILS_ARGS=(
-		"${DISTUTILS_ARGS[@]}"
-		-Dsystem-freetype=false
-	)
-	distutils_pep517_install "${BUILD_DIR}"/test
-	cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/bin" || die
-	local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH}
-
-	pushd lib >/dev/null || die
-	local path
-	local sitedir=${BUILD_DIR}/test$(python_get_sitedir)
-	# sigh, upstream doesn't install these
-	while IFS= read -d '' path; do
-		cp -r "${path}" "${sitedir}/${path}" || die
-	done < <(
-		find \( \
-				-name baseline_images -o \
-				-name '*.ipynb' -o \
-				-name '*.pfb' -o \
-				-name '*.ttf' -o \
-				-name tinypages \
-			\) -print0
-	)
-	popd >/dev/null || die
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# pretend we're on CI to increase timeouts
-	local -x CI=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p rerunfailures --reruns=3 \
-		-o tmp_path_retention_policy=all || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.10.1.ebuild b/dev-python/matplotlib/matplotlib-3.10.1.ebuild
index ed48cf77762a..0a100958d2a9 100644
--- a/dev-python/matplotlib/matplotlib-3.10.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.10.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets"
 
 DEPEND="
@@ -261,7 +261,20 @@ python_test() {
 				'tests/test_text.py::test_parse_math'
 				'tests/test_text.py::test_parse_math_rcparams'
 			)
-			;&
+			;;
+		arm)
+			EPYTEST_DESELECT+=(
+				tests/test_backend_ps.py::test_savefig_to_stringio
+				# too large for 32-bit platforms
+				'tests/test_axes.py::test_psd_csd[png]'
+			)
+			;;
+		sparc64)
+			EPYTEST_DESELECT+=(
+				tests/test_backend_pgf.py::test_pdf_pages_metadata_check
+				tests/test_backend_pgf.py::test_minus_signs_with_tex
+			)
+			;;
 		alpha|arm|m68k|o32|ppc|s390|sh|sparc|x86)
 			EPYTEST_DESELECT+=(
 				# too large for 32-bit platforms
diff --git a/dev-python/matplotlib/matplotlib-3.9.2.ebuild b/dev-python/matplotlib/matplotlib-3.9.2.ebuild
deleted file mode 100644
index 7dc415b309da..000000000000
--- a/dev-python/matplotlib/matplotlib-3.9.2.ebuild
+++ /dev/null
@@ -1,301 +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=meson-python
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 pypi virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI+="
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
-IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets"
-
-DEPEND="
-	media-libs/freetype:2
-	>=media-libs/qhull-2013:=
-	>=dev-python/numpy-1.25:=[${PYTHON_USEDEP}]
-"
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	${DEPEND}
-	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8[jpeg,webp,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/libpng:0
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}]
-		' 'python3*')
-	)
-	webagg? (
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{10..12})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		$(python_gen_impl_dep 'tk')
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-		!hppa? ( !s390? (
-			|| (
-				media-video/ffmpeg[openh264]
-				media-video/ffmpeg[x264]
-			)
-		) )
-		gtk3? (
-			>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3[introspection]
-		)
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	# do not unpack freetype
-	unpack "${P}.tar.gz"
-}
-
-python_prepare_all() {
-	# Affects installed _version.py, bug #854600
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.9.0-test.patch
-	)
-
-	# increase lock timeout to 30 s
-	sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	unset DISPLAY # bug #278524
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	DISTUTILS_ARGS=(
-		-Dsystem-freetype=true
-		-Dsystem-qhull=true
-		-Dmacosx=false
-	)
-}
-
-src_test() {
-	mkdir subprojects/packagecache || die
-	cp "${DISTDIR}/freetype-${FT_PV}.tar.gz" subprojects/packagecache/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-		tests/test_legend.py::test_legend_nolabels_warning
-		# TODO?
-		tests/test_backend_qt.py::test_fig_sigint_override
-		tests/test_backend_qt.py::test_ipython
-		tests/test_backend_nbagg.py::test_ipynb
-		# leak tests are fragile
-		tests/test_backends_interactive.py::test_figure_leak_20490
-		# major "images not close", new texlive perhaps
-		tests/test_contour.py::test_all_algorithms
-		# "no warnings"
-		tests/test_backend_pdf.py::test_invalid_metadata
-		tests/test_figure.py::test_too_many_figures
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# TODO: warning isn't passed through
-				tests/test_image.py::test_large_image
-				# TODO
-				tests/test_pickle.py::test_complete
-				tests/test_pickle.py::test_no_pyplot
-				tests/test_pickle.py::test_pickle_load_from_subprocess
-				tests/test_pickle.py::test_simple
-				tests/test_texmanager.py::test_openin_any_paranoid
-				tests/test_widgets.py::test_check_buttons
-				tests/test_widgets.py::test_check_buttons_lines
-				tests/test_widgets.py::test_check_radio_buttons_image
-				tests/test_widgets.py::test_radio_buttons
-			)
-			if 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+=(
-					# TypeError is raised when exception is raised in a starred
-					# expression referencing a generator that uses "yield from"
-					# and raises -- non-critical, since some exception is raised
-					# after all
-					# https://foss.heptapod.net/pypy/pypy/-/issues/4032
-					tests/test_axes.py::test_bad_plot_args
-					tests/test_axes.py::test_plot_errors
-					tests/test_axes.py::test_plot_format_errors
-				)
-			fi
-			;;
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# https://github.com/matplotlib/matplotlib/issues/23384
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/test_constrainedlayout.py::test_compressed1
-			)
-			;;
-	esac
-
-	case ${ABI} in
-		hppa)
-			EPYTEST_DESELECT+=(
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace without value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[function without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[accent without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline with empty parameter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[left with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[right with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses with sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses without sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[underset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unknown symbol]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double superscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double subscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[super on sub without braces]'
-				'tests/test_quiver.py::test_barbs[png]'
-				'tests/test_quiver.py::test_barbs_pivot[png]'
-				'tests/test_quiver.py::test_barbs_flip[png]'
-				'tests/test_text.py::test_parse_math'
-				'tests/test_text.py::test_parse_math_rcparams'
-			)
-			;&
-		alpha|arm|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				'tests/test_axes.py::test_psd_csd[png]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	local DISTUTILS_ARGS=(
-		"${DISTUTILS_ARGS[@]}"
-		-Dsystem-freetype=false
-	)
-	distutils_pep517_install "${BUILD_DIR}"/test
-	cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/bin" || die
-	local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH}
-
-	pushd lib >/dev/null || die
-	local path
-	local sitedir=${BUILD_DIR}/test$(python_get_sitedir)
-	# sigh, upstream doesn't install these
-	while IFS= read -d '' path; do
-		cp -r "${path}" "${sitedir}/${path}" || die
-	done < <(
-		find \( \
-				-name baseline_images -o \
-				-name '*.ipynb' -o \
-				-name '*.pfb' -o \
-				-name '*.ttf' -o \
-				-name tinypages \
-			\) -print0
-	)
-	popd >/dev/null || die
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# pretend we're on CI to increase timeouts
-	local -x CI=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p rerunfailures --reruns=3 \
-		-o tmp_path_retention_policy=all || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.9.4.ebuild b/dev-python/matplotlib/matplotlib-3.9.4.ebuild
deleted file mode 100644
index 85d683b9e7ee..000000000000
--- a/dev-python/matplotlib/matplotlib-3.9.4.ebuild
+++ /dev/null
@@ -1,301 +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=meson-python
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 pypi virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI+="
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
-IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets"
-
-DEPEND="
-	media-libs/freetype:2
-	>=media-libs/qhull-2013:=
-	>=dev-python/numpy-1.25:=[${PYTHON_USEDEP}]
-"
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	${DEPEND}
-	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8[jpeg,webp,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/libpng:0
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}]
-		' 'python3*')
-	)
-	webagg? (
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{10..12})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		$(python_gen_impl_dep 'tk')
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-		!hppa? ( !s390? (
-			|| (
-				media-video/ffmpeg[openh264]
-				media-video/ffmpeg[x264]
-			)
-		) )
-		gtk3? (
-			>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3[introspection]
-		)
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	# do not unpack freetype
-	unpack "${P}.tar.gz"
-}
-
-python_prepare_all() {
-	# Affects installed _version.py, bug #854600
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.9.3-test.patch
-	)
-
-	# increase lock timeout to 30 s
-	sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	unset DISPLAY # bug #278524
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	DISTUTILS_ARGS=(
-		-Dsystem-freetype=true
-		-Dsystem-qhull=true
-		-Dmacosx=false
-	)
-}
-
-src_test() {
-	mkdir subprojects/packagecache || die
-	cp "${DISTDIR}/freetype-${FT_PV}.tar.gz" subprojects/packagecache/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-		tests/test_legend.py::test_legend_nolabels_warning
-		# TODO?
-		tests/test_backend_qt.py::test_fig_sigint_override
-		tests/test_backend_qt.py::test_ipython
-		tests/test_backend_nbagg.py::test_ipynb
-		# leak tests are fragile
-		tests/test_backends_interactive.py::test_figure_leak_20490
-		# major "images not close", new texlive perhaps
-		tests/test_contour.py::test_all_algorithms
-		# "no warnings"
-		tests/test_backend_pdf.py::test_invalid_metadata
-		tests/test_figure.py::test_too_many_figures
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# TODO: warning isn't passed through
-				tests/test_image.py::test_large_image
-				# TODO
-				tests/test_pickle.py::test_complete
-				tests/test_pickle.py::test_no_pyplot
-				tests/test_pickle.py::test_pickle_load_from_subprocess
-				tests/test_pickle.py::test_simple
-				tests/test_texmanager.py::test_openin_any_paranoid
-				tests/test_widgets.py::test_check_buttons
-				tests/test_widgets.py::test_check_buttons_lines
-				tests/test_widgets.py::test_check_radio_buttons_image
-				tests/test_widgets.py::test_radio_buttons
-			)
-			if 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+=(
-					# TypeError is raised when exception is raised in a starred
-					# expression referencing a generator that uses "yield from"
-					# and raises -- non-critical, since some exception is raised
-					# after all
-					# https://foss.heptapod.net/pypy/pypy/-/issues/4032
-					tests/test_axes.py::test_bad_plot_args
-					tests/test_axes.py::test_plot_errors
-					tests/test_axes.py::test_plot_format_errors
-				)
-			fi
-			;;
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# https://github.com/matplotlib/matplotlib/issues/23384
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
-				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/test_constrainedlayout.py::test_compressed1
-			)
-			;;
-	esac
-
-	case ${ABI} in
-		hppa)
-			EPYTEST_DESELECT+=(
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace without value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[hspace with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[function without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[accent without space]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[frac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[binom with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[genfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[sqrt with invalid value]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overline with empty parameter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[left with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[right with invalid delimiter]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses with sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses without sizing]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[dfrac with empty parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[overset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[underset without parameters]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[unknown symbol]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double superscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[double subscript]'
-				'tests/test_mathtext.py::test_mathtext_exceptions[super on sub without braces]'
-				'tests/test_quiver.py::test_barbs[png]'
-				'tests/test_quiver.py::test_barbs_pivot[png]'
-				'tests/test_quiver.py::test_barbs_flip[png]'
-				'tests/test_text.py::test_parse_math'
-				'tests/test_text.py::test_parse_math_rcparams'
-			)
-			;&
-		alpha|arm|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				'tests/test_axes.py::test_psd_csd[png]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	local DISTUTILS_ARGS=(
-		"${DISTUTILS_ARGS[@]}"
-		-Dsystem-freetype=false
-	)
-	distutils_pep517_install "${BUILD_DIR}"/test
-	cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/bin" || die
-	local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH}
-
-	pushd lib >/dev/null || die
-	local path
-	local sitedir=${BUILD_DIR}/test$(python_get_sitedir)
-	# sigh, upstream doesn't install these
-	while IFS= read -d '' path; do
-		cp -r "${path}" "${sitedir}/${path}" || die
-	done < <(
-		find \( \
-				-name baseline_images -o \
-				-name '*.ipynb' -o \
-				-name '*.pfb' -o \
-				-name '*.ttf' -o \
-				-name tinypages \
-			\) -print0
-	)
-	popd >/dev/null || die
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# pretend we're on CI to increase timeouts
-	local -x CI=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p rerunfailures --reruns=3 \
-		-o tmp_path_retention_policy=all || die
-}