gentoo resync : 25.11.2020

4 files changed, 69 insertions, 47 deletions

diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 63ac784c460f..68a20096b8e1 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,3 +1,3 @@
-DIST tikzplotlib-0.9.1.tar.gz 584961 BLAKE2B 62737db9117c96484de690b26c3f13d5a872a3c70ad4ebe635bcba348dfa7f0eb944b8c469807c4c474351a9fae7db6dd71df82e33ee33cbdd8b1abeb9686e1b SHA512 10f3be8b843ea81d48bd6fad494a7e7a0cc5afd45a96c26be7f4dfbac929bdb3010fd355c6e1ef262273fd0783fc5b5b4a7b41a0c01e18cff5446bb9d96ee2b7
-EBUILD tikzplotlib-0.9.1.ebuild 966 BLAKE2B 5627cfb8c33aa85f84b627b0a9c20a11259a0e8ec14511c1140696f75da088d55dbef2b78551ba0d3281e9b31a1d23b783b75313a6f61a61cb206c4cea707040 SHA512 bbb5ebd42f12dffeb0e6f6e51fecba5a30edb07051825de6a676967713a0c42d7020bd04c0f657cdb3a39cd200863477b55d0cb6981cf0edcb641970e7e8bea1
-MISC metadata.xml 841 BLAKE2B c48fa9e38e55f5cf06293ec648491a2824c1f27c0bef31f69a59307b2d42ca1fc1e7ebaec524d01329191250afc4d766e69c2a9a8323cf48c3b31e8fbfc9f8ee SHA512 e69af74f46343c192187cb7ea178c169651ea4d7f40e264d556fcf319a2a24cdaca94629f75b428e543fd4911e5269f25e0fba358dac61ac07cea6ebbc9c4d78
+DIST tikzplotlib-0.9.4.tar.gz 588518 BLAKE2B 3f6ec8b9149ef86e8a0dd551d4aeca4f676df3ca86de8bb9bfbf2abed81afab50adef99752970a40f174258f4d14c245366c5159f241d2cd10f7cebdfd6bbbfb SHA512 0d654dbecc473f5bc20dc128ad55852c3787ddd50cf730ed57b25a25e6a55e79bfd451eb28188d75ac6b61a53a6a6e244bef2ca366dcb636e0d325c74b32d1cd
+EBUILD tikzplotlib-0.9.4.ebuild 1431 BLAKE2B 44a9cabdf7cab0881932d8bfe06fe56265e5c57521ec31dfa9e66306e1a48241f37aea97f8769d8c8672cf85c73210b10418372cedb5c87b00f850f71bacf2a4 SHA512 1911e14521d586cb89186ce8deec6253edc15c46e342d7e84af065b80b98c4e3f66e0a81ba10fe32077b577161c0000e13dd662841ca68af680e62e3daf62d58
+MISC metadata.xml 963 BLAKE2B 211d448ee2e29e104616f0713ac523e3f19a06f5322b2da7f04e9b19e879504a0486e677b0570d72a112b4987ac73551343d9d115da99a40dd8c8a6946e50093 SHA512 5cbda85d835d17aaeb4050cf1b31c0d12fb4611768286780895baf827e9899646d144a695e7f0145ae71f4ba2390bb0e4d8b4e22f780681e391203bc47e0529d
diff --git a/dev-python/tikzplotlib/metadata.xml b/dev-python/tikzplotlib/metadata.xml
index 50a33145b076..34881f6ec28c 100644
--- a/dev-python/tikzplotlib/metadata.xml
+++ b/dev-python/tikzplotlib/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>tikzplotlib is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of tikzplotlib is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of tikzplotlib retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
 	<upstream>
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
deleted file mode 100644
index d079411a0592..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/tikzplotlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_prepare_all() {
-	# this test fails: tikz error
-	# cannot mix dimensions and dimensionless values in an ellipse
-	rm test/test_patches.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx pytest -vv
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild
new file mode 100644
index 000000000000..c6df920586bc
--- /dev/null
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
+HOMEPAGE="https://github.com/nschloe/tikzplotlib"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/texlive[extra]
+	$( python_gen_cond_dep \
+		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
+	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/exdown[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/mock
+
+python_prepare_all() {
+	# setup.py was removed in commit f04323cfa575caf8a25a9236f55fe6baf1a33b20
+	# for some reason, DISTUTULS_USE_SETUPTOOLS="pyproject.toml" is not working
+	# it complains about file not found, setup.cfg does exist
+
+	cat > setup.py <<EOF || die
+from setuptools import setup
+
+if __name__ == "__main__":
+	setup()
+EOF
+
+	# Lots of TeX errors
+	rm test/test_patches.py || die
+	rm test/test_context.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x MPLBACKEND=Agg
+	virtx pytest -vv
+}