gentoo resync : 21.06.2021

4 files changed, 361 insertions, 2 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 7f8f5eef4a3b..e8284d43cd2f 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -3,11 +3,14 @@ AUX matplotlib-3.3.2-test-extra.patch 851 BLAKE2B 8fca758413834cf78707a42edbf878
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
 AUX matplotlib-3.3.4-test-extra.patch 481 BLAKE2B 1926876a15bd2d8b14c62404dddb0b119abde78baea3cee7dd751d0b0a21249ad1461fbba4d20823d7e754f074cbf48aaf2da317685dded99c792be9e17edb9d SHA512 7a7e0bdbd96a4f1f335eb3ee1840747045b09ba974d2614f234fa4fbc5c3e1e7c5fd154ec68a74640a916fed9e0b3d5ca01d1b22ba4f7bf3ba5f47039e67d00a
 AUX matplotlib-3.4.0-test.patch 10105 BLAKE2B 3a084180ec096a99d0b9a25458fd1b422d23599cb6fcbe0d7367df7e5c308675f92e95d008fb80e96125101f8f67c4b3a437209bc4bc032cb779130043827160 SHA512 f6196ded497e6c931f33a50cd82f4c7a5710dbc2dd1d74e3ba4467cf936176ef5a64fc2a9ff5281a0a114041c9751e352e522869ebb28e0e0bc50c4ebf1a8b5a
+AUX matplotlib-3.4.1-xelatex-test.patch 3200 BLAKE2B 0203bf1a3996ecf639d2dfee733f9fb1c664f35d501ca5049e5940b459f707cd4024b665106b62ab769805c4b976566c518a237637b766d97d2cb65abba8a266 SHA512 58c65834645974e56e6484788ed07d5bedaee3f72ff2023a36df9be3be03639eb588f769b7a727a5dc25a125d9df4d351e7fedc15699dd0576afd10718398fef
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4
 DIST matplotlib-3.4.0.tar.gz 37142983 BLAKE2B 64b23d5b9e93e6b319674cea06d0ad425def952e50e7cb163ae91ae0d4460872bb329144271472b7dc2d0ab0a742c9c93ea735dca60ee4b4aa569cb4350cca0b SHA512 880c1e1027c819a34f5528b96d1b730cdd6541aa23931aef4185406ecec971ec2f4c8ca374eced56e654e016652472f7abcd0aae977dd4f327b8c511983a2a1d
 DIST matplotlib-3.4.1.tar.gz 37253296 BLAKE2B e1dfd1b0d8bb0d3ed13ac03a5b3112a237c4b7ef3c82694ad6779c810bbd94c165bde88d00fad270d5da6e269d778b33f276620b51e1f134fa2c5b9dcb0a4f28 SHA512 076510ddd152a395fabb76aa47566e9b75f3c8ba3c5246b39229b20fbfc209d4bbdfd441271b22e364f0974963309c02bdd0519fc2a7e8a406afc462f69246b6
+DIST matplotlib-3.4.2.tar.gz 37308683 BLAKE2B b769244b3d7a7da9125f6b634e9340676d849322491390d1c9a0cec3dfce59a8b5b5c0b567575ae78212129f7303b6b1fbbf30ce7c8a23c43c1304e83c9c5f5e SHA512 d4798dd2d6c857db0fe6d4ec85ebabc028b78627311bab17f7b9b30f6aa61d5243114b1cfe9d83293ad66ae47df83add5272f032954990dfc04054a792049f2a
 EBUILD matplotlib-3.3.4.ebuild 6929 BLAKE2B 22ff822577ff6cf4f692809429681a52f0f48591eaacf2858d04a34f7008473c803ef87f95ddae705e36c17a09dcaf61281410824e96a947d56e28cdd81ec4cb SHA512 a7af125117cf69af4a40debcbf3476342004100f3499f1028e7087e61168514693f086a6dfd6ace1616d8f27c343346d421a199073fff8a0a78d17062db40ed2
 EBUILD matplotlib-3.4.0.ebuild 6837 BLAKE2B 0ac7dc9aef75e2778102eeead917cff7e7627e1c158a9fcee0d1a247de2d0e5fc7b7b02cff543dbbeba236106f6915906391297bb34598c3ab6e349578caa960 SHA512 31f7cc26d605f3a3db310cf8b5d48a0bcb42e8aff0bf91ea6f94d072c049484be9bb3418aefeb6d02a14e241ff48fc95abf3dad7c87ae5a98d3842c3d0b548f4
-EBUILD matplotlib-3.4.1.ebuild 6793 BLAKE2B 98c0a818b789e1bdd72f533489ba4e4a807793212392dca7af9f025ccf5eeca1388baeee4d0071e6234bb43393e10d755399620a9cb29813414e191b660780d9 SHA512 e1bfcc70b94b31e4869a10bedd5847fc2d5c4096abe450d115c71b4f6c4ecd5f67a489dd53c044021f68d645a9ba367a1c21058b42cf160aa5c2be8db8c84aba
+EBUILD matplotlib-3.4.1.ebuild 6845 BLAKE2B 91e4c9281b79eb1c0bba8142a8de315322198dec213755717d318b00ce90ee2746ea950d7bf3ddbcccb039d757801ad541922966574297d50843600c4bc28edd SHA512 19fc5c3e739c1d687c16339c361a36245fb48d84b31e274c15fde827458fb1723f7836a737d9750778bb1430e83ac328d9242868de817722143dba4cb7a49eaa
+EBUILD matplotlib-3.4.2.ebuild 6919 BLAKE2B bbeb96dfe6ede78bfba56d83098ddbf23229d484543740c70c60fe9b0aabf7cb41154158df770f548ea5344efb3896133f73165e6ee47d66a1a135e4782f112a SHA512 c14941e651e63f4277971378a30e082c9b68b2a411e342de261d1eaa7e4e8a7829e2409078175482348f9e905a11053acbe86648b52fcd8ede414d92e950ee1b
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/files/matplotlib-3.4.1-xelatex-test.patch b/dev-python/matplotlib/files/matplotlib-3.4.1-xelatex-test.patch
new file mode 100644
index 000000000000..5f1bda49c71e
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.4.1-xelatex-test.patch
@@ -0,0 +1,74 @@
+From d0f92f582800b6bd6b4bb2e59cd7e5b3cd6b5948 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 20 Jun 2021 14:46:17 +0200
+Subject: [PATCH] _GSConverter: handle stray 'GS' in output gracefully
+
+Search the GS output stream for either "GS<" or "GS>" explicitly rather
+than any "GS", in order to prevent the code from wrongly matching stray
+"GS".  This fixes a recent test regression on Gentoo where the following
+output seems to have been wrongly matched:
+
+    **** Error 'gs' ignored -- ExtGState missing from Resources.
+                                  ^^
+
+Fixes #20472
+---
+ lib/matplotlib/testing/compare.py | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
+index 3957188b3e2..27af3e186bd 100644
+--- a/lib/matplotlib/testing/compare.py
++++ b/lib/matplotlib/testing/compare.py
+@@ -154,15 +154,17 @@ def encode_and_escape(name):
+             + b") run flush\n")
+         self._proc.stdin.flush()
+         # GS> if nothing left on the stack; GS<n> if n items left on the stack.
+-        err = self._read_until(b"GS")
+-        stack = self._read_until(b">")
+-        if stack or not os.path.exists(dest):
+-            stack_size = int(stack[1:]) if stack else 0
+-            self._proc.stdin.write(b"pop\n" * stack_size)
+-            # Using the systemencoding should at least get the filenames right.
+-            raise ImageComparisonFailure(
+-                (err + b"GS" + stack + b">")
+-                .decode(sys.getfilesystemencoding(), "replace"))
++        err = self._read_until((b"GS<", b"GS>"))
++        if err.endswith(b"GS<"):
++            stack = self._read_until(b">")
++            if stack or not os.path.exists(dest):
++                stack_size = int(stack[1:]) if stack else 0
++                self._proc.stdin.write(b"pop\n" * stack_size)
++                # Using the systemencoding should at least get the filenames
++                # right.
++                raise ImageComparisonFailure(
++                    (err + b"GS" + stack + b">")
++                    .decode(sys.getfilesystemencoding(), "replace"))
+ 
+ 
+ class _SVGConverter(_Converter):
+From d73dd52edf7ec106cf2f6c0ffc79dcda31102ecd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 20 Jun 2021 15:07:56 +0200
+Subject: [PATCH] increase test_backend_pgf.py::test_xelatex[pdf] tol
+
+---
+ lib/matplotlib/tests/test_backend_pgf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
+index 55e375311..684f38fb7 100644
+--- a/lib/matplotlib/tests/test_backend_pgf.py
++++ b/lib/matplotlib/tests/test_backend_pgf.py
+@@ -80,7 +80,7 @@ def test_common_texification(plain_text, escaped_text):
+ # test compiling a figure to pdf with xelatex
+ @needs_xelatex
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_xelatex.pdf'], style='default')
++@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8)
+ def test_xelatex():
+     rc_xelatex = {'font.family': 'serif',
+                   'pgf.rcfonts': False}
+-- 
+2.32.0
+
diff --git a/dev-python/matplotlib/matplotlib-3.4.1.ebuild b/dev-python/matplotlib/matplotlib-3.4.1.ebuild
index 6ac9f568ad38..a145e84f8c2b 100644
--- a/dev-python/matplotlib/matplotlib-3.4.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
@@ -147,6 +147,7 @@ python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}"/matplotlib-3.4.0-test.patch
 		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+		"${FILESDIR}"/matplotlib-3.4.1-xelatex-test.patch
 	)
 
 	# requires jupyter-nbconvert
diff --git a/dev-python/matplotlib/matplotlib-3.4.2.ebuild b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
new file mode 100644
index 000000000000..2bc085e89cfb
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+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
+	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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	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-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{8,9})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${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 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_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.4.0-test.patch
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+		"${FILESDIR}"/matplotlib-3.4.1-xelatex-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
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	distutils-r1_python_compile -j1 --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(argv=['-m', 'not network'], verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}