gentoo resync : 23.09.2020

5 files changed, 6 insertions, 284 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 26f55b31638e..ff77f29d8267 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -5,10 +5,8 @@ AUX matplotlib-3.3.2-test-extra.patch 851 BLAKE2B 8fca758413834cf78707a42edbf878
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31
 DIST matplotlib-3.3.0.tar.gz 38782487 BLAKE2B 97330d93b8d8a64a1296ccb173e44ebcc54c61e22aacdd73cc38a46fb2d22fbfe7334fb3c6993be001c475724c47f530243affddd71ec647232ac093db6e3135 SHA512 2ffd9e79e300a37092ab4b5a7156c2f57e408975818abd413c74477ad622030c7636695467aab821c9996564cddec57e26ba6a8004f6639070964fcb7a510a75
-DIST matplotlib-3.3.1.tar.gz 38780756 BLAKE2B b67388408da5ca6c36333705f0c19db6a1dc815819f01a5b0a7fe4ebd990f3e0df8def90971494e308ba8731f305db80dbe367f64c4fbf1294fd0f884cbb2d64 SHA512 cb3c61b7c96dde226f978980ebc960edc1329655efdeb974c8b6d8fd0cd3b660a8dfa3c98c1b140128b2ba13b134c81b000f6e87fa049d77512c81b1138b2b35
 DIST matplotlib-3.3.2.tar.gz 37939974 BLAKE2B f28e184a0fccd4192ba8135b70569bf463d08cae0f4eb8e7f997f417cb947500a9fe46eb5f979473b4d7d22c0ad03ab55aba4067082c86f63eacbf837b8606ad SHA512 cae68e63d879bcfb41b25df4de48472461f7987403d42d34c7205a65ed3ef567660309c04d2a55e155fbe1ef708fd9de0b0d66e71578f34c3ee93379c4ea1e1a
-EBUILD matplotlib-3.2.2-r2.ebuild 6534 BLAKE2B fc84bb6c99dfb3e0c3eb97289d75eae653b7e395bc4aa934dfdaa507bd067fc597cb2f0f1b2e5d254d7f04e3686cf8cbe82ed6d23d37f87cc4e454eb0a05b08a SHA512 a93fcf89d97738e378e343dade32e0335c42314d8d782a62a57fbd1ad73a457f15728139e8086274c5df3685e097e692af2dbb29ed2fa681378f42bcf61e6e55
-EBUILD matplotlib-3.3.0-r1.ebuild 6656 BLAKE2B a78fd213fa3827540e062120bfc7f2bf40108db6951d370871b72c36c5667c4921c4947fd776bfd5aef11c1b63a32e37e479fbd5f6295e394e24f7fc81f8bb65 SHA512 11e4cb4b82791a9bfd53ad47b8d33467baba684eddb0ee62ef630c2e93209465fc5c2d8f02a80bd41fa89bd95eb78863d21c661482f2aa2167ad7b3227eb3bbb
-EBUILD matplotlib-3.3.1-r2.ebuild 6724 BLAKE2B 77ca45a10f77128eabc2f40ce35b57af57feb47748e414218578b6c0de5f8db82b9d4aebd971c53cc9bd55eb60108c30a514acef8efe6c50fadc8aaf6c8dacdc SHA512 2dcfd4ee0eb0f8d0cf1fe409806162b51ec0a8c23f07765cafd8ac197de44a4b909d8648af3c03699cbc49073d5aca3058c60306458ea00a0737b37b76dc01d0
-EBUILD matplotlib-3.3.2.ebuild 6774 BLAKE2B e1bbd7d90106a97cd489ac5aa73d078a1ac5009abb467421b23c0dc2e2f6c23be99df80fd0b9f907a394bbe1f01ba5f35bb7f28b32389c5d7078fee9bc9f4f2f SHA512 387c20f94aea1e53781413b0dd271562f8b95b925df77164b67241e90edb7b712799ce5882ad2b2f32d3f1e3f2d7285e331f4a7869f3e519626960ac708476d0
+EBUILD matplotlib-3.2.2-r2.ebuild 6536 BLAKE2B b1e13fa0b6247a6f8d70c7ffbc8e3c32af8a4da4aa110ff276b730bc58304c3311fa595d675dd177e9712a4eebb636938dc4f6d0c88a8ed3f4b4d14205afb40d SHA512 534db15787c1c773c70c6e0a322fe872cb9acd8a6b2c660e72265b6066e8f142a214f150e7b7c7ff47e363bfde3e763ad6d1001f4dbbafd705db3972a459656a
+EBUILD matplotlib-3.3.0-r1.ebuild 6658 BLAKE2B 37583fb82f1833e6615bff7aad7449e17dbe5f4a3f2d590ab8ed9cb04c454b780f9c945282e006022d687ab95be2f9097f2405aeb495aeaabf4c919be7bc9746 SHA512 240eae8dc22b41b9511fe55b38e637eba26daadf7ab6a7aad9b8e75f063ec2da0def8efc764c4908a5993e19ad2aac3337885009eb28344fe3c38fde48b49c6b
+EBUILD matplotlib-3.3.2.ebuild 6776 BLAKE2B b5d2d34ebd93b3c94c24021c48ed14fe857df5a5a57462aabf26d922c42de201548323c6422d4b3b90b98fd555d1d30c1c4aa5d3425092f25ed025fe26dac896 SHA512 0ac741e8b351b80f8e1b0d8b9e49d0380e9fae8d71ebf97766530e4afd896b3d0393da49b8c27ef562bcd4b4afac859562c05640da850b6528b7c211533683af
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
index 3296b24075d0..de55fd15dca0 100644
--- a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${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}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
index 92a63fef1567..068882d344d6 100644
--- a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${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}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
deleted file mode 100644
index d8b120fa06ff..000000000000
--- a/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	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 ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk 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-1.5.6[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${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
-	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		dev-python/pygobject: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}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)
-"
-
-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}]
-		>=sci-libs/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[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 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.3.0-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
-		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
-}
diff --git a/dev-python/matplotlib/matplotlib-3.3.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
index 9ded3690e457..f3c2b26d36e1 100644
--- a/dev-python/matplotlib/matplotlib-3.3.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
@@ -82,7 +82,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${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}]