gentoo auto-resync : 15:12:2024 - 02:02:03

3 files changed, 306 insertions, 3 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 6d7880f0ed19..e9d82650c9f2 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -2,14 +2,16 @@ AUX matplotlib-3.10.0-test.patch 9677 BLAKE2B d4c4f6611dba8eff0395d1c820cbfa2567
 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.0rc1.tar.gz 36682106 BLAKE2B c6948deb4749a08fa84e0a72d4c6877cfa561360c5475a9d96c56bad906b94c59f35286587f5af768e0f7e2bb5d5e30101c66da3725ac81f5981ae298089d1a8 SHA512 8ccef930c094e1d0fdb61236b968dcc556b991fd53a8171c84e19fba08e9a5d67dc62f24de832d50e805ddf040dd58828799c6046b355f17dd532fe4d23c4515
+DIST matplotlib-3.10.0.tar.gz 36686418 BLAKE2B b154d4d2512a7989d967e7e257ef148e530b1bb030375fe0443f0feb3adea8b0cdc0287d292587832542f6263ccbbb89860fa0b827301fb9dbed34f6a197a475 SHA512 31a71640ef9cbc8cae928156c70119a0bdc1a8c44c8dc5af5333f5484525dd6a375e6f263d739ad3422b0e35d474f7742e08c71c40df0f1f71b526e21adc17e1
 DIST matplotlib-3.9.0.tar.gz 36069890 BLAKE2B 02ddb25901b5a93a8daf6f26c98b92d5e35abe2e98783b039928338abb1d628adbf3fd4786c08cb1610bf405cb558ca31fc12dbde77ec5f2a633143c7ea659a1 SHA512 135ee2f97c26cb60479cc10bf8a833384c393993d8a905ab869f4c73b91a50ffa596f84ce349af7f1a0b08a21e1906394cf6a702bb567a9c3999d40f54974326
 DIST matplotlib-3.9.1.tar.gz 36084124 BLAKE2B b7cc9e219664849411cc3133afbdb676f956c943f92d447ba5cca0467da56d1575796fe1046e7503e6d7c4dfdfad6e5181404f331ed7ac1397c8c61f4a30bd23 SHA512 a1d48c42a5f4f04b57e34d25df842917e6380b8d6b6d1018c9b630cbbea4619b1d75729a218a6f52b63d4a61c2204bb26ad8f741566f84e41ca73190e419f672
 DIST matplotlib-3.9.2.tar.gz 36088381 BLAKE2B c84d08b7afa1f0460b5b57447481ef90f22380c02d20227c3a45b6f603032a11359b223397f18c8dc9111ad36fbd7510e2d5496502b3202e3074ddf8e8258bb7 SHA512 4b7437eeb085915a90db64600d0e6c59501ea1513d07b8298a159a763461ef6947a0cb332dcde1a5f0996840320ca7dd1d972d7514ff6f87b036fc631e79885f
 DIST matplotlib-3.9.3.tar.gz 36113438 BLAKE2B 6d51d11e04a71e2a01eaa9b76c072633cbbcb393b91be069f0db2f8a523711d244c93f7a4a9e0f8bc50b14928567d22865f5091a39000c7d7160fc258e21cab5 SHA512 f42a1bc8febf88369b5164879f32bc7967fe0930e42d12395722ac3d2c10a8c59ac9419b68c4bcb499c7df26dfc429dafb672b61f85aee971dd270b0e29742ed
-EBUILD matplotlib-3.10.0_rc1.ebuild 10975 BLAKE2B e882358612e88eb9779ebbc332305779d5e3c2d29043f74cdf8f36c6887e80fc81e343538960a6ba493d0a6570d2051fec480c4e2dc8f51cda7a26c0ac063f25 SHA512 36923d01bf103161586fb295f1aa72da04c4e6a09e538f67b472893101e538531c709cc42bc4bc6e92dfbe991cdba9f4a8bb002fe0081c34bb9d07e71c16d91e
+DIST matplotlib-3.9.4.tar.gz 36106529 BLAKE2B f95791bce82bf62d922e3db7ebe8e34e5759896c26cf952e2c67e92d5c4e5e190c556ba3ff4d7160d60de3c90ed5e1dc4d7ca2866647ded6b96dd35e16d4e259 SHA512 adfa875cba0b030ee0efaf11ed1be881858dc13391c966a2d9485ae2358fccf0b5356e16966a0c9da9f682e4a9d2f3960551756aca30ddc048632346548b1447
+EBUILD matplotlib-3.10.0.ebuild 11074 BLAKE2B 6c7789d1376c6bdde5124d02c6f18c1d59f3727f18a39009ba66d29c39aec2110ee5f98f0051a9c3eef73d7e8a3c98c93fed4d6fa638459b1d28171ce54bf513 SHA512 c1027b1f953f4cf7d98f214e626ef3c80e7fc14cf51da622d2541a011affa7c886d96008c4e6b5279701921025aff2e31d25380d49b8300ae5450ca91c09f431
 EBUILD matplotlib-3.9.0-r1.ebuild 9776 BLAKE2B 9f05ba95f89bb02c04d3338ca750b4b404a531e78c287208b7ecd9f04525adc23593c3b9f5e981d5e23357bf236d6487185cff354e7c80825d1342ff4720ec37 SHA512 120ae193b6b9b16dcd554cd818b52a80f529c6e72e7b67752707fc70407d6b7dc18908ab01ce81ee6d192063dd8bbd4165e17da76200310b74ff9df5ecced82e
 EBUILD matplotlib-3.9.1.ebuild 9810 BLAKE2B e7832213774d7e35507dec104a661c363066c7e6e6dff6a9fa716bbd13901bae1f70875cab4fc24729994a9b0ac6977d7a92200f9883cba841febce7228bbbb0 SHA512 68934eec459cff252d96985bbe895b26a88ec89d1b91d6b7d1d0c520c7f517e19ca19b0878c03062b15d3dfdbcef41dc0e3b41ccc0b2ab2edded12614cd8cc30
 EBUILD matplotlib-3.9.2.ebuild 9808 BLAKE2B 852614b4db23c8eebbeece82fae15bd681a1cbe5ea637e2760fe399a87f0010d9c5c50524ee8f5dc3fccfd6de1f72ee5963798c6ec8ed6c2ddea27c37bb310ce SHA512 ff8dfb1e20bbd4b7fd2dffb880099c2e14b087229bd3fc7b1b0ca1c5108f72e52735f76808cc6408239e96d71c14801a534133ce60da61d25337eee09fdb255c
 EBUILD matplotlib-3.9.3.ebuild 9813 BLAKE2B 19e86821ae3c3c71e6da0dca2ba8c9ee4b02b529601eca8276e4bcea88d9a0f0e9253e682eedd47048930dd7d29db60ccd0d76db6f46af0a6d0282960fda4158 SHA512 4262c5032f5eaea1449c2b6e1801a425443e877dde314a8bf6b5e3563473672827728779e374617b519cc2132f6143175be3539fe26577a554dede90aa18bcb9
+EBUILD matplotlib-3.9.4.ebuild 9813 BLAKE2B 19e86821ae3c3c71e6da0dca2ba8c9ee4b02b529601eca8276e4bcea88d9a0f0e9253e682eedd47048930dd7d29db60ccd0d76db6f46af0a6d0282960fda4158 SHA512 4262c5032f5eaea1449c2b6e1801a425443e877dde314a8bf6b5e3563473672827728779e374617b519cc2132f6143175be3539fe26577a554dede90aa18bcb9
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.10.0_rc1.ebuild b/dev-python/matplotlib/matplotlib-3.10.0.ebuild
index 8f1dff9323be..118d1707c8a9 100644
--- a/dev-python/matplotlib/matplotlib-3.10.0_rc1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.10.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS=""
+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="
diff --git a/dev-python/matplotlib/matplotlib-3.9.4.ebuild b/dev-python/matplotlib/matplotlib-3.9.4.ebuild
new file mode 100644
index 000000000000..2be141c0003a
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.9.4.ebuild
@@ -0,0 +1,301 @@
+# 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
+}