gentoo resync : 13.06.2020

7 files changed, 517 insertions, 101 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 8923ce80e737..398f5f2332d1 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -3,12 +3,14 @@ AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe
 AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a
 AUX matplotlib-3.1.2-no-jqueryui-download.patch 544 BLAKE2B aa5e55ec734f3847579864d2d9133da9b4d483ce91b9418dd275ced1f7367e7ceee728f0f4a271743e50b554980005871982bfabd523d8b20d0bdb0f2966d3f8 SHA512 a5900df8735bc6956ce9ea79334d4eb22f8029b9c025e81ead16d41fb061fb94dfcd8d2e773b70bbb8912469b18e18ec194f5bfce0ec668a5be423f1b9de0d7b
 AUX matplotlib-3.1.2-qhull.patch 768 BLAKE2B 480f213014c4f50f7926679a826e282937f25043f530f01d38ac3c4b1672b37a0cd52466bd5f6c66957de5a871b30dfea58e42a6f389a005347220e4d73cb97d SHA512 d25b5888a03b82ddf8e8d415905663e4e77041ce17fb37ac3562ba126048373abc1203acfd0643c1544f1d0ac9f3232447c3f60295daa5528346e80142848420
+AUX matplotlib-3.2.1-test.patch 17670 BLAKE2B 7cd7b29ee7025fcdd21496ab0327ba3b78f608a32bac17a0cbdc720da0911cb9e3f2e16097a2e473c11841fe80ca5ebc94f312b54a6dcc27bacb1a2ebd384011 SHA512 113decad09a49c7f4dbd57deb49bf0e22f46f8953a86908bba936ae414254930755861db7e56242c8759e08637ece7d8821c27542a0503747caf3947eda41e93
+DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
 DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139
 DIST matplotlib-3.1.2.tar.gz 40909582 BLAKE2B 670907670335ca13ec01f3acf036fd502ce34abd12666b2e0d10867c6115a0fe80039326cee89099471aa6b3bbd25f1ca4aa837072dea624ee41984da9f647be SHA512 2eff3c0525d01824ed758a87f50a3f6094767b580fca1eae4e9dbc2cc972af3d0cc3ac9615e576c5685e8bfc1ec90754bc826635f4f2a919d0b26bbb686cccab
 DIST matplotlib-3.2.1.tar.gz 40325615 BLAKE2B 7fd299f7d3948987e341e4313ed82d15de286a05c9819893e099ccd6c1f861ce5548ec85588a382603011e7710d08d6fc9a4f168f0b5705b0873b97e40d2dd39 SHA512 d6497a3c47eaff9c0d981bc03de5894a3f4a5413cbe320924b1df6d68eb421e548cf4247c035fd636a4403cd2d50071633e6906e795b74ec7d9c4816193e42be
-EBUILD matplotlib-2.2.2-r1.ebuild 6370 BLAKE2B fab5c042e14172c077f62ed4ae9a44800e2d779fd8119a4bc16d343b6702976b8e3e94f9f5b2884e11cd0cf7cafe37cb11418c5c97e5c9be4b1c4e581b5b7972 SHA512 3a618bb2718901cdd4be90679fa248d20e595b32d631f414e3c63c35ff98c58897d0167a0fb11c150808fe44f6cd5641c7bfceb933ad4c09c2d92984fb7e8d28
-EBUILD matplotlib-2.2.4.ebuild 6444 BLAKE2B 5cd558b7df2f7972c37129967a0ed65a084b950be6b4859167c9bf2e23ea28963d441ec6144540c2635782282bd8036d3605a15134894b06b5b7e3424052834e SHA512 f9edb7250a6fb868a24609f107a07ecd8f2f27a8cb5637229dc5fe9e716b5fa6d9b33ae01e01877f31cd8d58251f7af893119fd2ab02be8aec5930d272309d20
-EBUILD matplotlib-3.1.2.ebuild 5828 BLAKE2B 0ab5bcb5ca71e16ef0df465f2028d384e35980a04d01e74f073e149d49170e0a0039e9767a5d5cb1d53c1d0e8428e4212957248427518ae86c8be4dfc013f447 SHA512 6a8a36c474ed647331fba9210d4520d7eac006ca456a75e576fec80272f6fec71634edf4f02c6a7f2508a6e61219e72e7f14cc0582bd4731e42b8e91c8136612
-EBUILD matplotlib-3.2.1.ebuild 6096 BLAKE2B 7beea58ef2b26ead7bb47c5dc03d18c5d68576a1630cc1a1b081ab08e97be45d44a0bc7bf364d0d3f0d35ccd7d7430a895b1bb8972ff5f402b590937a14ef79d SHA512 9e34432f14c80ba365df32894919e32f2db40adacf2f6a282debc865c3e2c070231f5e0644be6e9be5119cbc63c2566f8581ad789c4831781feb637d40b64fe0
-MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
+EBUILD matplotlib-2.2.2-r1.ebuild 6227 BLAKE2B 32c5311bd4ee746cb0a6df097c9a2a2b34725031cbfcde1273b22929b20cf197597502be6722923ccade763e8a690dde0683f50fdaff313465b4bbfd6f5a52de SHA512 dc4c2387720aff34780d625022ee0a0f5806e4313e27cf1885450e6b2564f923d5a73b99534721c455d777bea2d43637a5b61d45b028aa5a22ee2ef2e5642b48
+EBUILD matplotlib-2.2.4.ebuild 6299 BLAKE2B a4513d93def3dd7fe01ef4e237a1ffa7e5e1d49ebb4a4fa04c4de14d02ac28bcb2017102d44002bfe4e0cdbca8e8a8563b862fafe3d06e01de4ac58d6c154619 SHA512 bd4a7941b7807552078f05c7bcce15dc18e8df1e93291c598a5d96d25a901556c69d31a7130406b7192903e5b1f81eca001af23675a03369c5fc42cfaa2110f1
+EBUILD matplotlib-3.1.2.ebuild 5648 BLAKE2B bf5914e115a11e59aba62294131618a33db85780102def607bd794ebab07ad32b3ecdb7ea1192134bc71f0038d777498ab49c9c9040f3ecfc79d0af050e7374c SHA512 6123cd120e844b89a771dad446af7bf5496a5fa7dd24d441de6a459aefa0f49bc1346a41f44ec84552e0eb62cb89543294eecf82f3e74d6c7f22956798a664d6
+EBUILD matplotlib-3.2.1.ebuild 6534 BLAKE2B c537979c12904c6dc88f491b9e4266f1a23b26a044a00f9348c683c03afd2f6b9f6ce791b3b221772c267faef400c683dd6995b3ad42f90593797e1a311a7623 SHA512 c4d946e95769e97e40619cf6044edf27dd5a043bf2fd1cfc6b564b72d7f3eae380f426753687ee53fd545860c67cdf285d2c09698994803501908f6076a97eab
+MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch b/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch
new file mode 100644
index 000000000000..281f15405c9b
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch
@@ -0,0 +1,432 @@
+From 36e8d90d8065aa5fd1cd83554e6d2e7d031e5b3d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 7 Jun 2020 20:02:48 +0200
+Subject: [PATCH 1/2] Increase image comparison limits
+
+Most of the tests require exact match which apparently doesn't always
+happen in non-pristine environments.  Some of them have very big
+differences due to texlive font rendering changes.
+---
+ lib/matplotlib/tests/test_arrow_patches.py                 | 4 ++--
+ lib/matplotlib/tests/test_axes.py                          | 2 +-
+ lib/matplotlib/tests/test_backend_pgf.py                   | 7 ++++---
+ lib/matplotlib/tests/test_figure.py                        | 2 +-
+ lib/matplotlib/tests/test_legend.py                        | 6 +++---
+ lib/matplotlib/tests/test_pickle.py                        | 2 +-
+ lib/matplotlib/tests/test_units.py                         | 4 ++--
+ lib/matplotlib/tests/test_usetex.py                        | 2 +-
+ lib/mpl_toolkits/tests/test_axes_grid1.py                  | 2 +-
+ .../tests/test_axisartist_grid_helper_curvelinear.py       | 2 +-
+ 10 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
+index a9409e2c1..0e356e921 100644
+--- a/lib/matplotlib/tests/test_arrow_patches.py
++++ b/lib/matplotlib/tests/test_arrow_patches.py
+@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol={'aarch64': 0.02}.get(platform.machine(), 0.015),
+                   savefig_kwarg=dict(dpi=100))
+ def test_fancyarrow_dpi_cor_100dpi():
+     """
+@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol={'aarch64': 0.02}.get(platform.machine(), 0.018),
+                   savefig_kwarg=dict(dpi=200))
+ def test_fancyarrow_dpi_cor_200dpi():
+     """
+diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
+index 93548b279..9910e63c3 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -3653,7 +3653,7 @@ def test_vertex_markers():
+ 
+ 
+ @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol={'aarch64': 0.02}.get(platform.machine(), 0.015))
+ def test_eb_line_zorder():
+     x = list(range(10))
+ 
+diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
+index 7843b4101..ddb2991c1 100644
+--- a/lib/matplotlib/tests/test_backend_pgf.py
++++ b/lib/matplotlib/tests/test_backend_pgf.py
+@@ -97,7 +97,8 @@ def test_xelatex():
+ # test compiling a figure to pdf with pdflatex
+ @needs_pdflatex
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_pdflatex.pdf'], style='default')
++@image_comparison(['pgf_pdflatex.pdf'], style='default',
++                  tol=11.669)
+ def test_pdflatex():
+     if os.environ.get('APPVEYOR', False):
+         pytest.xfail("pdflatex test does not work on appveyor due to missing "
+@@ -133,7 +134,7 @@ def test_rcupdate():
+                 'pgf.preamble': ['\\usepackage[utf8x]{inputenc}',
+                                  '\\usepackage[T1]{fontenc}',
+                                  '\\usepackage{sfmath}']}]
+-    tol = [6, 0]
++    tol = [6, 14]
+     for i, rc_set in enumerate(rc_sets):
+         with mpl.rc_context(rc_set):
+             create_figure()
+@@ -161,7 +162,7 @@ def test_pathclip():
+ @needs_xelatex
+ @pytest.mark.backend('pgf')
+ @image_comparison(['pgf_mixedmode.pdf'], style='default',
+-                  tol={'aarch64': 1.086}.get(platform.machine(), 0.0))
++                  tol=1.086)
+ def test_mixedmode():
+     rc_xelatex = {'font.family': 'serif',
+                   'pgf.rcfonts': False}
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index a9e8dfade..7e33bcb3b 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -14,7 +14,7 @@ import pytest
+ 
+ 
+ @image_comparison(['figure_align_labels'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_align_labels():
+     # Check the figure.align_labels() command
+     fig = plt.figure(tight_layout=True)
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index 71499da44..a8bda6e84 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -106,7 +106,7 @@ def test_multiple_keys():
+ 
+ 
+ @image_comparison(['rgba_alpha.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_alpha_rgba():
+     import matplotlib.pyplot as plt
+ 
+@@ -117,7 +117,7 @@ def test_alpha_rgba():
+ 
+ 
+ @image_comparison(['rcparam_alpha.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_alpha_rcparam():
+     import matplotlib.pyplot as plt
+ 
+@@ -145,7 +145,7 @@ def test_fancy():
+ 
+ 
+ @image_comparison(['framealpha'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_framealpha():
+     x = np.linspace(1, 100, 100)
+     y = x
+diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
+index 0fad3cdf2..4d2599607 100644
+--- a/lib/matplotlib/tests/test_pickle.py
++++ b/lib/matplotlib/tests/test_pickle.py
+@@ -41,7 +41,7 @@ def test_simple():
+ 
+ 
+ @image_comparison(['multi_pickle.png'], remove_text=True, style='mpl20',
+-                  tol={'aarch64': 0.082}.get(platform.machine(), 0.0))
++                  tol=0.082)
+ def test_complete():
+     fig = plt.figure('Figure with a label?', figsize=(10, 6))
+ 
+diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index f14425144..7f744da47 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -74,7 +74,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'], remove_text=False, style='mpl20',
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol={'aarch64': 0.02}.get(platform.machine(), 0.002))
+ def test_numpy_facade(quantity_converter):
+     # use former defaults to match existing baseline image
+     plt.rcParams['axes.formatter.limits'] = -7, 7
+@@ -101,7 +101,7 @@ def test_numpy_facade(quantity_converter):
+ 
+ # Tests gh-8908
+ @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  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 8d8cf29d0..4cdfe1aaf 100644
+--- a/lib/matplotlib/tests/test_usetex.py
++++ b/lib/matplotlib/tests/test_usetex.py
+@@ -16,7 +16,7 @@ def usetex():
+ 
+ @image_comparison(baseline_images=['test_usetex'],
+                   extensions=['pdf', 'png'],
+-                  tol={'aarch64': 2.868}.get(platform.machine(), 0.3))
++                  tol=3)
+ def test_usetex():
+     fig = plt.figure()
+     ax = fig.add_subplot(111)
+diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
+index 9ed9a9280..56a3bd14a 100644
+--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
++++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
+@@ -343,7 +343,7 @@ def test_zooming_with_inverted_axes():
+ 
+ 
+ @image_comparison(['anchored_direction_arrows.png'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_anchored_direction_arrows():
+     fig, ax = plt.subplots()
+     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
+diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+index 611908063..dc294aef5 100644
+--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
++++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
+ 
+ 
+ @image_comparison(['custom_transform.png'], style='default',
+-                  tol={'aarch64': 0.034}.get(platform.machine(), 0.03))
++                  tol=0.034)
+ def test_custom_transform():
+     class MyTransform(Transform):
+         input_dims = 2
+-- 
+2.27.0
+
+From c1d6cce894de12bd32095c73d15d4f4f6ff5f2bb Mon Sep 17 00:00:00 2001
+From: Antony Lee <anntzer.lee@gmail.com>
+Date: Tue, 10 Dec 2019 11:18:24 +0100
+Subject: [PATCH 2/2] Rewrite test_cycles to avoid image comparison tests.
+
+They can all be reasonably written by checking the artist properties.
+---
+ .../test_cycles/color_cycle_basic.png         | Bin 33044 -> 0 bytes
+ .../test_cycles/fill_cycle_basic.png          | Bin 70692 -> 0 bytes
+ .../test_cycles/fill_cycle_ignore.png         | Bin 65439 -> 0 bytes
+ .../test_cycles/lineprop_cycle_basic.png      | Bin 41852 -> 0 bytes
+ .../test_cycles/marker_cycle.png              | Bin 44979 -> 0 bytes
+ .../test_cycles/property_collision_fill.png   | Bin 24923 -> 0 bytes
+ .../test_cycles/property_collision_plot.png   | Bin 37723 -> 0 bytes
+ lib/matplotlib/tests/test_cycles.py           | 141 +++++++-----------
+ 8 files changed, 51 insertions(+), 90 deletions(-)
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/color_cycle_basic.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/fill_cycle_basic.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/fill_cycle_ignore.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/lineprop_cycle_basic.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/marker_cycle.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/property_collision_fill.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/property_collision_plot.png
+
+diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
+index ee67b4e41..a340b6166 100644
+--- a/lib/matplotlib/tests/test_cycles.py
++++ b/lib/matplotlib/tests/test_cycles.py
+@@ -1,6 +1,4 @@
+-import platform
+-
+-from matplotlib.testing.decorators import image_comparison
++import matplotlib as mpl
+ import matplotlib.pyplot as plt
+ import numpy as np
+ import pytest
+@@ -8,133 +6,96 @@ import pytest
+ from cycler import cycler
+ 
+ 
+-@image_comparison(['color_cycle_basic.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
+ def test_colorcycle_basic():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs + 2
+-    ax.plot(xs, ys, label='red', lw=4)
+-    ys = 0.45 * xs + 3
+-    ax.plot(xs, ys, label='green', lw=4)
+-    ys = 0.65 * xs + 4
+-    ax.plot(xs, ys, label='yellow', lw=4)
+-    ys = 0.85 * xs + 5
+-    ax.plot(xs, ys, label='red2', lw=4)
+-    ax.legend(loc='upper left')
+-
+-
+-@image_comparison(['marker_cycle.png', 'marker_cycle.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++    for _ in range(4):
++        ax.plot(range(10), range(10))
++    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
++
++
+ def test_marker_cycle():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) +
+                       cycler('marker', ['.', '*', 'x']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs + 2
+-    ax.plot(xs, ys, label='red dot', lw=4, ms=16)
+-    ys = 0.45 * xs + 3
+-    ax.plot(xs, ys, label='green star', lw=4, ms=16)
+-    ys = 0.65 * xs + 4
+-    ax.plot(xs, ys, label='yellow x', lw=4, ms=16)
+-    ys = 0.85 * xs + 5
+-    ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
+-    ax.legend(loc='upper left')
++    for _ in range(4):
++        ax.plot(range(10), range(10))
++    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
++    assert [l.get_marker() for l in ax.lines] == ['.', '*', 'x', '.']
+ 
++
++def test_marker_cycle_kwargs_arrays_iterators():
+     fig, ax = plt.subplots()
+-    # Test keyword arguments, numpy arrays, and generic iterators
+     ax.set_prop_cycle(c=np.array(['r', 'g', 'y']),
+                       marker=iter(['.', '*', 'x']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs + 2
+-    ax.plot(xs, ys, label='red dot', lw=4, ms=16)
+-    ys = 0.45 * xs + 3
+-    ax.plot(xs, ys, label='green star', lw=4, ms=16)
+-    ys = 0.65 * xs + 4
+-    ax.plot(xs, ys, label='yellow x', lw=4, ms=16)
+-    ys = 0.85 * xs + 5
+-    ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
+-    ax.legend(loc='upper left')
+-
+-
+-@image_comparison(['lineprop_cycle_basic.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++    for _ in range(4):
++        ax.plot(range(10), range(10))
++    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
++    assert [l.get_marker() for l in ax.lines] == ['.', '*', 'x', '.']
++
++
+ def test_linestylecycle_basic():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('ls', ['-', '--', ':']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs + 2
+-    ax.plot(xs, ys, label='solid', lw=4, color='k')
+-    ys = 0.45 * xs + 3
+-    ax.plot(xs, ys, label='dashed', lw=4, color='k')
+-    ys = 0.65 * xs + 4
+-    ax.plot(xs, ys, label='dotted', lw=4, color='k')
+-    ys = 0.85 * xs + 5
+-    ax.plot(xs, ys, label='solid2', lw=4, color='k')
+-    ax.legend(loc='upper left')
+-
+-
+-@image_comparison(['fill_cycle_basic.png'], remove_text=True)
++    for _ in range(4):
++        ax.plot(range(10), range(10))
++    assert [l.get_linestyle() for l in ax.lines] == ['-', '--', ':', '-']
++
++
+ def test_fillcycle_basic():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('c',  ['r', 'g', 'y']) +
+                       cycler('hatch', ['xx', 'O', '|-']) +
+                       cycler('linestyle', ['-', '--', ':']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs**.5 + 2
+-    ax.fill(xs, ys, label='red, xx', linewidth=3)
+-    ys = 0.45 * xs**.5 + 3
+-    ax.fill(xs, ys, label='green, circle', linewidth=3)
+-    ys = 0.65 * xs**.5 + 4
+-    ax.fill(xs, ys, label='yellow, cross', linewidth=3)
+-    ys = 0.85 * xs**.5 + 5
+-    ax.fill(xs, ys, label='red2, xx', linewidth=3)
+-    ax.legend(loc='upper left')
+-
+-
+-@image_comparison(['fill_cycle_ignore.png'], remove_text=True)
++    for _ in range(4):
++        ax.fill(range(10), range(10))
++    assert ([p.get_facecolor() for p in ax.patches]
++            == [mpl.colors.to_rgba(c) for c in ['r', 'g', 'y', 'r']])
++    assert [p.get_hatch() for p in ax.patches] == ['xx', 'O', '|-', 'xx']
++    assert [p.get_linestyle() for p in ax.patches] == ['-', '--', ':', '-']
++
++
+ def test_fillcycle_ignore():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('color',  ['r', 'g', 'y']) +
+                       cycler('hatch', ['xx', 'O', '|-']) +
+                       cycler('marker', ['.', '*', 'D']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs**.5 + 2
++    t = range(10)
+     # Should not advance the cycler, even though there is an
+     # unspecified property in the cycler "marker".
+     # "marker" is not a Polygon property, and should be ignored.
+-    ax.fill(xs, ys, 'r', hatch='xx', label='red, xx')
+-    ys = 0.45 * xs**.5 + 3
++    ax.fill(t, t, 'r', hatch='xx')
+     # Allow the cycler to advance, but specify some properties
+-    ax.fill(xs, ys, hatch='O', label='red, circle')
+-    ys = 0.65 * xs**.5 + 4
+-    ax.fill(xs, ys, label='green, circle')
+-    ys = 0.85 * xs**.5 + 5
+-    ax.fill(xs, ys, label='yellow, cross')
+-    ax.legend(loc='upper left')
++    ax.fill(t, t, hatch='O')
++    ax.fill(t, t)
++    ax.fill(t, t)
++    assert ([p.get_facecolor() for p in ax.patches]
++            == [mpl.colors.to_rgba(c) for c in ['r', 'r', 'g', 'y']])
++    assert [p.get_hatch() for p in ax.patches] == ['xx', 'O', 'O', '|-']
+ 
+ 
+-@image_comparison(['property_collision_plot.png'], remove_text=True)
+ def test_property_collision_plot():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle('linewidth', [2, 4])
++    t = range(10)
+     for c in range(1, 4):
+-        ax.plot(np.arange(10), c * np.arange(10), lw=0.1, color='k')
+-    ax.plot(np.arange(10), 4 * np.arange(10), color='k')
+-    ax.plot(np.arange(10), 5 * np.arange(10), color='k')
++        ax.plot(t, t, lw=0.1)
++    ax.plot(t, t)
++    ax.plot(t, t)
++    assert [l.get_linewidth() for l in ax.lines] == [0.1, 0.1, 0.1, 2, 4]
+ 
+ 
+-@image_comparison(['property_collision_fill.png'], remove_text=True)
+ def test_property_collision_fill():
+     fig, ax = plt.subplots()
+-    xs = np.arange(10)
+-    ys = 0.25 * xs**.5 + 2
+     ax.set_prop_cycle(linewidth=[2, 3, 4, 5, 6], facecolor='bgcmy')
++    t = range(10)
+     for c in range(1, 4):
+-        ax.fill(xs, c * ys, lw=0.1)
+-    ax.fill(xs, 4 * ys)
+-    ax.fill(xs, 5 * ys)
++        ax.fill(t, t, lw=0.1)
++    ax.fill(t, t)
++    ax.fill(t, t)
++    assert ([p.get_facecolor() for p in ax.patches]
++            == [mpl.colors.to_rgba(c) for c in 'bgcmy'])
++    assert [p.get_linewidth() for p in ax.patches] == [0.1, 0.1, 0.1, 5, 6]
+ 
+ 
+ def test_valid_input_forms():
+-- 
+2.27.0
+
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index a4c0390e0f30..9503034ec4c0 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -19,19 +19,15 @@ SLOT="0"
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
+IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
 RESTRICT="!test? ( test )"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
 REQUIRED_USE="
 	doc? ( ${PY2_FLAGS} )
 	excel? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
 	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
+	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
@@ -51,11 +47,6 @@ COMMON_DEPEND="
 	>=media-libs/qhull-2013
 	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
 	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
 	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
 
 # internal copy of pycxx highly patched
@@ -85,7 +76,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	${PY2_DEPEND}
@@ -93,7 +84,8 @@ RDEPEND="${COMMON_DEPEND}
 	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
+	)
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
@@ -201,7 +193,8 @@ python_configure() {
 		EOF
 	else
 		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
+			gtk = False
+			gtkagg = False
 			$(use_setup wxwidgets wx)
 		EOF
 	fi
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
index 738f51416fb1..824ae05fff3f 100644
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
@@ -18,18 +18,14 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
 RESTRICT="!test? ( test )"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
 REQUIRED_USE="
-	gtk2? ( ${PY2_FLAGS} )
 	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
+	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
@@ -49,11 +45,6 @@ COMMON_DEPEND="
 	>=media-libs/qhull-2013
 	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
 	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
 	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
 
 # internal copy of pycxx highly patched
@@ -84,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	${PY2_DEPEND}
@@ -92,7 +83,8 @@ RDEPEND="${COMMON_DEPEND}
 	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
+	)
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
@@ -203,7 +195,8 @@ python_configure() {
 		EOF
 	else
 		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
+			gtk = False
+			gtkagg = False
 			$(use_setup wxwidgets wx)
 		EOF
 	fi
diff --git a/dev-python/matplotlib/matplotlib-3.1.2.ebuild b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
index db457aa8b799..91b2099a971d 100644
--- a/dev-python/matplotlib/matplotlib-3.1.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
@@ -12,21 +12,20 @@ DESCRIPTION="Pure python plotting library with matlab like syntax"
 HOMEPAGE="https://matplotlib.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-SLOT="0"
 # Main license: matplotlib
 # Some modules: BSD
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	test? (
-		cairo latex qt5 tk wxwidgets gtk3
-		)"
+REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )"
+# tests are fixed in 3.2.1, this version is beyond repair
+RESTRICT="test"
 
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
 COMMON_DEPEND="
 	dev-python/cycler[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
@@ -41,9 +40,6 @@ COMMON_DEPEND="
 	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
 	wxwidgets? ( dev-python/wxpython:*[${PYTHON_USEDEP}] )"
 
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
 DEPEND="${COMMON_DEPEND}
 	dev-python/versioneer[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -67,7 +63,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
@@ -162,6 +158,8 @@ python_configure() {
 		tests = $(usex test True False)
 		[gui_support]
 		agg = True
+		gtk = False
+		gtkagg = False
 		pyside = False
 		pysideagg = False
 		qt4 = False
@@ -170,6 +168,7 @@ python_configure() {
 		$(use_setup gtk3)
 		$(use_setup qt5)
 		$(use_setup tk)
+		$(use_setup wxwidgets wx)
 	EOF
 
 	if use gtk3 && use cairo; then
@@ -177,20 +176,6 @@ python_configure() {
 	else
 		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
 	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
 }
 
 wrap_setup() {
diff --git a/dev-python/matplotlib/matplotlib-3.2.1.ebuild b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
index 20dfaaa499ee..5f616ebccb19 100644
--- a/dev-python/matplotlib/matplotlib-3.2.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
@@ -3,35 +3,31 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 DISTUTILS_USE_SETUPTOOLS=bdepend
-
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
 
+FT_PV=2.6.1
 DESCRIPTION="Pure python plotting library with matlab like syntax"
 HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
 
-SLOT="0"
 # Main license: matplotlib
 # Some modules: BSD
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
 
-REQUIRED_USE="
-	test? (
-		cairo latex qt5 tk wxwidgets gtk3
-	)
-"
-
 # internal copy of pycxx highly patched
 #	dev-python/pycxx
-
 RDEPEND="
 	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
@@ -70,7 +66,9 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{6,7,8})
 	)
 "
 
@@ -92,22 +90,37 @@ BDEPEND="
 		dev-texlive/texlive-latexrecommended
 		>=media-gfx/graphviz-2.42.3[cairo]
 	)
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
 "
 
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
 DISTUTILS_IN_SOURCE_BUILD=1
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 pkg_setup() {
 	unset DISPLAY # bug #278524
 }
 
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
 use_setup() {
 	local uword="${2:-${1}}"
-	if use ${1}; then
+	if use_supported "${1}" && use "${1}"; then
 		echo "${uword} = True"
 		echo "${uword}agg = True"
 	else
@@ -131,14 +144,21 @@ python_prepare_all() {
 #	EOF
 
 	local PATCHES=(
-		"${FILESDIR}"/${PN}-3.1.2-qhull.patch
+		"${FILESDIR}"/matplotlib-3.1.2-qhull.patch
+		"${FILESDIR}"/matplotlib-3.2.1-test.patch
 	)
 
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
 	sed \
 		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
 		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
 		|| die "sed pyparsing failed"
 
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
 	hprefixify setupext.py
 
 	rm -rf libqhull || die
@@ -147,10 +167,6 @@ python_prepare_all() {
 	mkdir "${XDG_RUNTIME_DIR}" || die
 	chmod 0700 "${XDG_RUNTIME_DIR}" || die
 
-	local freetype_version
-	freetype_version="$(best_version media-libs/freetype | sed -r -e 's/.*-([0-9].*[0-9])(-r[0-9]+|$)/\1/g')"
-	sed -i -r -e "s:(LOCAL_FREETYPE_VERSION =).*:\\1 \"${freetype_version}\":g" setupext.py lib/matplotlib/__init__.py || die
-
 	distutils-r1_python_prepare_all
 }
 
@@ -176,6 +192,8 @@ python_configure() {
 		tests = $(usex test True False)
 		[gui_support]
 		agg = True
+		gtk = False
+		gtkagg = False
 		pyside = False
 		pysideagg = False
 		qt4 = False
@@ -184,6 +202,7 @@ python_configure() {
 		$(use_setup gtk3)
 		$(use_setup qt5)
 		$(use_setup tk)
+		$(use_setup wxwidgets wx)
 	EOF
 
 	if use gtk3 && use cairo; then
@@ -191,26 +210,11 @@ python_configure() {
 	else
 		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
 	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
 }
 
 wrap_setup() {
 	local MAKEOPTS=-j1
 	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	unset DISPLAY
 	"$@"
 }
 
@@ -230,11 +234,19 @@ python_compile_all() {
 	fi
 }
 
-python_test() {
-	wrap_setup distutils_install_for_testing
+src_test() {
+	virtx distutils-r1_src_test
+}
 
-	distutils_install_for_testing
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || die
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	local -x MPLLOCALFREETYPE=1
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(verbosity=2))" || die
 }
 
 python_install() {
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index d238bedf5ab2..f024fad13338 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -17,7 +17,6 @@
 	</longdescription>
 	<use>
 		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
-		<flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
 	</use>
 	<upstream>