gentoo resync : 28.04.2021

4 files changed, 59 insertions, 12 deletions

diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 1e9c5965aed5..31e2e86a3de4 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,7 @@
-DIST fonttools-4.18.2.tar.gz 2499129 BLAKE2B 1ae93418121942e4303e4b138b192a30195d25c87e8c6204b508cc6a5b7a87608fcde7acbb6a2e8fb3c71ea59938827dabbe1556b7edad537523f6f0b3615696 SHA512 ceec3656c674ff5c43f4dc7cdf1468ddaf5c8bbe569d865fb015a9251ac089caedcf3dcea82c93a0c367576fcd7d65451642a6ab5d3093d941aa391b50070d53
 DIST fonttools-4.21.1.tar.gz 2531249 BLAKE2B 7f507f85061c67da0003ed2c4f685b22ccf0e6c5067adb934772ef0832656bbe092d1282b30b5a40071cd3a3219f5cfd810e06e9cd3f85ddd8fa93538134c943 SHA512 8c54809ab9f39e34f482ee6b17dbf8b309e8bfa0bde783e24195c1f2949ded64591c5e79565136ec8492c0095d593db20779d3f28b933f8e40e54b610130e0f4
-EBUILD fonttools-4.18.2.ebuild 1384 BLAKE2B 5b85d8367c403fad1710a93d76e4131ccfbc9a6f2b6cbde64c8a91489825f455a160cf21f4766f28560791e8267b3c51c6db7db160fdd7de4a685831ce654908 SHA512 659f68fb7deb7735869201c3ace83ed7a6cc38e8359b3c4af860d109c8e9decafb724d1744f3ee6587737300606b89be63d4368cef2f12044217a500240137c1
-EBUILD fonttools-4.21.1.ebuild 1469 BLAKE2B d6d83b39df02d6bbf34c9c4f79c0addb55dd423a5f68ef6dee3769cefed638d4d420b85114757cf90da8d944fdf109501ff7dd282e1d5368f8f0a8fbae710eaa SHA512 99796a6165ea1cb5b25885492fe7ec67a6ffbeab14d5755dd79e4af9a2c06818904d64e792ebe8a12bc96fee20b6aea412d8fa008fe7ae1a8baae5ee4a2640cd
+DIST fonttools-4.22.0.tar.gz 2544600 BLAKE2B 685da467c40fc7cffe2b33b08da53e5bd148c5190efdc8d08e2c66ef06e67b5e26ec5fa090334b9ef427b1a005c6386b0f78b978d376c7daee7f4d540faa21c7 SHA512 06db054ce488d0291f876b05b5dd09a772a702f1d45b97c1ba46d02e01fe59f7c63e268fff958baa4076c1ce72f450384e473263250c1617791d78c0e311710d
+DIST fonttools-4.22.1.tar.gz 2544433 BLAKE2B 711737f696bd3a25f0c0eec2c1fb80c38dcab81d974c7f5c9d9e644aa3850dbb08502ba14111397b42615fc5287f9af8aa4d7b83e7fe9f23ae4d080f2864189d SHA512 2f38eda41ce913bdd6e62f495a215c38ed9c1fa7df87f1ecc0964b3065498e39c55e030899a5561321b16f995a705449c958244ecca2aaef492c49066db0ef93
+EBUILD fonttools-4.21.1.ebuild 1461 BLAKE2B 639b7aa92a31be6b1d52c677a053bc465a5c91dfa76606fb4b0a0662dffb6708fa6c2d0eba7f0d8e8479ca1c8149276ddd5ad09043afc4780f14b8379f1d9318 SHA512 d8155e25d259c646af4fd6fc4592de14dbeb2e6e2b936fb1723d0bd69f5ad39a01112d1c9b3b242c7e252654d4e02120118b9e6906cb86ec1a013965816a9d12
+EBUILD fonttools-4.22.0.ebuild 1316 BLAKE2B 9d44143f4439f4f8c74ae55dc801945a7aad1c7d1e30e3826b488a14dfbe761ebb63501f4a92545a1eb2b8fb6bd37ad07cc494aeb73fb72169798bba63139060 SHA512 895e3d29de74df1a1782fcc9f7b15d3991e14e69b6066b249839ef86eff3ed4853faf48d9626c63fc3fad5c81c1c4946c2cc899ce1882dae8fbab60d1aa46687
+EBUILD fonttools-4.22.1.ebuild 1316 BLAKE2B 9d44143f4439f4f8c74ae55dc801945a7aad1c7d1e30e3826b488a14dfbe761ebb63501f4a92545a1eb2b8fb6bd37ad07cc494aeb73fb72169798bba63139060 SHA512 895e3d29de74df1a1782fcc9f7b15d3991e14e69b6066b249839ef86eff3ed4853faf48d9626c63fc3fad5c81c1c4946c2cc899ce1882dae8fbab60d1aa46687
 MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
diff --git a/dev-python/fonttools/fonttools-4.21.1.ebuild b/dev-python/fonttools/fonttools-4.21.1.ebuild
index 6627fc915f27..3052a8212314 100644
--- a/dev-python/fonttools/fonttools-4.21.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.21.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 RESTRICT="!test? ( test )"
 IUSE="test"
 
diff --git a/dev-python/fonttools/fonttools-4.18.2.ebuild b/dev-python/fonttools/fonttools-4.22.0.ebuild
index d0292f5917e4..a132b8324f4c 100644
--- a/dev-python/fonttools/fonttools-4.18.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.22.0.ebuild
@@ -15,20 +15,17 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-RESTRICT="!test? ( test )"
-IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-
 		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
 		app-arch/brotli[python,${PYTHON_USEDEP}]
 		app-arch/zopfli
 	)"
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	# When dev-python/pytest-shutil is installed, we get weird import errors.
 	# This is due to incomplete nesting in the Tests/ tree:
@@ -47,5 +44,5 @@ python_prepare_all() {
 
 python_test() {
 	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx pytest -vv Tests fontTools
+	virtx epytest Tests fontTools
 }
diff --git a/dev-python/fonttools/fonttools-4.22.1.ebuild b/dev-python/fonttools/fonttools-4.22.1.ebuild
new file mode 100644
index 000000000000..a132b8324f4c
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.22.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}