gentoo Easter resync : 12.04.2020

5 files changed, 91 insertions, 149 deletions

diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 24dcf3fa63d2..3235cf4af520 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,7 +1,5 @@
 AUX pyx-0.14.1-unicode-latex.patch 600 BLAKE2B d7e2b4804731372b8b149b8e50ed6163297e60548c479aad8d796df4630f87e3df7e28379c6e88158e135f1b2e1eddcc712828efdd3fdcae501681bdf5e602f0 SHA512 f2a6af35aeddcd10d936a9ced93f708606bccb9f249bb45c6cf86111744f7efad9c08e9ce9e41d63b04345069e973e2ae69df5a2b004535bb0fac09dbee3dc90
-DIST PyX-0.12.1.tar.gz 561989 BLAKE2B 894b507f78745e0688abca20db91f4161627812ce303a066dde64841a3ac4e6415e00fb76a9273b413ddd9dc72550726e2f39004c053c6350f4f76253b884be4 SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1
-DIST PyX-0.14.1.tar.gz 2475186 BLAKE2B 5e18b2a052c586cfdcfcc46f5351683ce7c3ec41d508b6fd5e085be543ac3730ee866b636d3ab9663e782b95efafcc340260826c82a77955b586ad7a55676c5b SHA512 16265bbdcaf28ce194189a2987b32952f296c850b829454bcccce0abd23838bfca0276c3e9c8e96b8cbfaf1473bf14669f9b7f2032ee039b61ae59ea3aa45a20
-EBUILD pyx-0.12.1-r1.ebuild 1064 BLAKE2B 24dd213a467b93808b203e7e8af9f481d477f1337b5ce7eec197a58393b1f552b6c6e958555bc81e985fce33bfde1e4bc8742fda705bdc78d27424006ab80318 SHA512 858962f65ac79fe6797c6a0b1b0add9ad1a81091a026a82171e4874c58835d66a1636bbf41b65881e5af2ac0c1d54c67285e3cfd2bd36bdc1685497842fd17de
-EBUILD pyx-0.14.1-r1.ebuild 1203 BLAKE2B a8f78484fbb512f5df1eda2ab56023c6fb6bc7aa4b03cbc5319e2bdc08978b2557c9e0c7c7a6892fe8ae3c8088d2c6eb6c72134c56814a914e96ada846b926ab SHA512 06051ea7321595ad18f5ae79844763a636de2f2270256a39887fbae911b7cf53fdae8c7804b434e79946673d36180a3f9a3dfaa473d898d703ebb0b61fdc59aa
-EBUILD pyx-0.14.1.ebuild 1150 BLAKE2B d10dca1165a11201e67e4b08eb43064e7783ca4f8c5a80ae217423ca4bda6da92c02fce4a171059921eae9fb02929243cdcc7333e3103faa3674b8f94313de5b SHA512 5e6d4acd635eb62e87d2efb4f18b70dc8d73989962c9e4cc53a7caa9faae7027bc5bf31cbb8ff7cd69d0c80779fdbea40107a40344c8b31acc0d0396c0e28e48
+DIST W3C_SVG_11_TestSuite.tar.gz 14651624 BLAKE2B 680059d8b20775725cebb3aed4444acbc3222fde880ba93ee5186c99fc12afa8df2c790bdacbcd6e5ff4ab00e697d8317a9a6ae3039b8b2f02cf7774a18ca533 SHA512 e28e3996284c3f3e423e2b6957cddea71980bcb781d4180894e08f37a7ecce9c6021917329d6d433dcba792cbabb15c7cd503076e616ba5189193a5c554374ca
+DIST pyx-0.15.gh.tar.gz 875286 BLAKE2B 49d36e1c0df3ee47a895279d7f296194324cf1582bb7db0259bcd01c9b17c4d0903c25fef10c7a22635fac62dc6378ffbece200eac99f75bb3ce81d48a71a0d1 SHA512 a7debff01f8055455855f4cac5a08d00c22d20d7918bd7341d2af83844223ae8bb23bbbe92149403656e18ffb8861e8568dfdcb59cc01c55ec60e63b62a8825a
+EBUILD pyx-0.15.ebuild 2102 BLAKE2B 20c00fcb9f71c23c518efddb9134684cce8bfcd2c394a8f929efeab0fa562792fcff05242d40661079724fd0e2a8c80d36500a91ab423f37d4abfa693e44152e SHA512 cbe842e37a585bc6f26556f8550bf15e34d90ded242991a95eef397e47a686de840346373200c879a1c98ffcf49037951045798a497b72d746a08f1599e00311
 MISC metadata.xml 642 BLAKE2B be6324da06bbf69bd5c56fb28aad984a9b36fc50efa418558c81a63d5e4ec01793b7096664c2a6570e24caad368f50b520d30bd83e01e41d9aa52654d5f54c7b SHA512 c95b0de51a001623d93ef15159eaceb5c62fbe38bd7c21f261d12d131eb00c1764ab4f4f124c4bfdfce575d80a1318a996cb02629cfff0a5f9b853fd078627e9
diff --git a/dev-python/pyx/pyx-0.12.1-r1.ebuild b/dev-python/pyx/pyx-0.12.1-r1.ebuild
deleted file mode 100644
index 8e3c042cff44..000000000000
--- a/dev-python/pyx/pyx-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P/pyx/PyX}"
-
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.org/project/PyX/"
-SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base
-		dev-texlive/texlive-basic"
-
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base
-		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts emake -C "${S}"/faq latexpdf
-	fi
-}
-
-python_install_all() {
-	use doc && dodoc faq/_build/latex/pyxfaq.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyx/pyx-0.14.1-r1.ebuild b/dev-python/pyx/pyx-0.14.1-r1.ebuild
deleted file mode 100644
index 529d32eab319..000000000000
--- a/dev-python/pyx/pyx-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-MY_PN=PyX
-MY_P="${P/pyx/PyX}"
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.org/project/PyX/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base
-		dev-texlive/texlive-basic"
-
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base
-		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${P}-unicode-latex.patch )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts
-		emake -C "${S}"/manual latexpdf
-		emake -C "${S}"/faq latexpdf
-	fi
-}
-
-python_install_all() {
-	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyx/pyx-0.14.1.ebuild b/dev-python/pyx/pyx-0.14.1.ebuild
deleted file mode 100644
index b9e6d91ebb6b..000000000000
--- a/dev-python/pyx/pyx-0.14.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-MY_PN=PyX
-MY_P="${P/pyx/PyX}"
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.org/project/PyX/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base
-		dev-texlive/texlive-basic"
-
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base
-		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts
-		emake -C "${S}"/manual latexpdf
-		emake -C "${S}"/faq latexpdf
-	fi
-}
-
-python_install_all() {
-	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyx/pyx-0.15.ebuild b/dev-python/pyx/pyx-0.15.ebuild
new file mode 100644
index 000000000000..eaba2324fc04
--- /dev/null
+++ b/dev-python/pyx/pyx-0.15.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="
+	https://github.com/pyx-project/pyx
+	https://pyx-project.org/
+	https://pypi.org/project/PyX/"
+SRC_URI="https://github.com/pyx-project/pyx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	virtual/tex-base
+	dev-texlive/texlive-basic"
+
+BDEPEND="${RDEPEND}
+	doc? (
+		virtual/latex-base
+		$(python_gen_any_dep '
+			dev-python/sphinx[latex,${PYTHON_USEDEP}]
+			dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/pyx-0.14.1-unicode-latex.patch )
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[latex,${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+	unpack "${P}.gh.tar.gz"
+
+	if use test; then
+		mkdir "${S}"/test/svg/suite || die
+		cd "${S}"/test/svg/suite || die
+		unpack W3C_SVG_11_TestSuite.tar.gz
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+	# stop test suite from downloading files
+	sed -i \
+		-e '/suite:/,$d' test/svg/Makefile || die
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	if use doc; then
+		local -x VARTEXFONTS="${T}"/fonts
+		emake -C "${S}"/manual latexpdf
+		emake -C "${S}"/faq latexpdf
+	fi
+}
+
+python_test() {
+	emake -C test
+}
+
+python_install_all() {
+	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
+	distutils-r1_python_install_all
+}