gentoo resync : 02.02.2022

4 files changed, 74 insertions, 10 deletions

diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index d9c8e76f3746..e981bde5cf17 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,7 @@
-DIST fonttools-4.28.4.tar.gz 2945369 BLAKE2B f178552aca7b41dcec1c03d2a7c3de17cdb5f4b2e057a75e196e78a098b9959a038a9a3b14ee8546d5ea12e3546c22d2a8d9b34a922c0822bf52f78bc03f4f54 SHA512 9ecdf4186e24a8a44c6010432d71f1689ebf8461a404dde71259eb4712c4987d94bbe31b33ad6943fb2e0105fc9f8e9032a94e6ccbb4ac01fe330bb700a39c63
 DIST fonttools-4.28.5.tar.gz 2948092 BLAKE2B b35f4be68cfc2be6afb209c2caee38f7088a1a17dea85fac0f40183b61a3eded59fab47f703587097669f8823a8dbc2e84b0df58305597784bed7f8c2e2b0f28 SHA512 5d87f4fadbcb447d1c1a1e97550f6a477d74bfe8647d14b35097e03e6a45a1a01632d2092483d675c523f97d4a04f39aa9b3175e535b1e1a4f19d619eb40ad5f
-EBUILD fonttools-4.28.4.ebuild 1425 BLAKE2B 4a2f7de50c982ee26701066d6f1dce56018299c7d2f0ba41c5c50eba6017277870c0fb564ec570d17dac33ce5acdefe509ab3f6fd60680f3ca08420e22140d35 SHA512 8b003d64c12b4f9dfc988f096df762305d10e0d21d66d5ae8bd98dd885a42d1525d8559709b64e36193b819ae9da7ab6a71b3c8f10d55a5394f3c069cbc22145
-EBUILD fonttools-4.28.5.ebuild 1433 BLAKE2B 2a02667f5d12f60c59537260cc91a2ec99f7915ba6663e78bfb374d9a00258fe377fe9e9b0995f2a0670342cd174193056caf7e62e7e443d35df133556a4e144 SHA512 d4f4356c0282a32ff1b624b664d7ec539a8e111f7186d06ba2cbdf19a46695258399261f2b0f58cbe2f77a7905798bbb2c80fa0762df472ee4a06627196dd2b4
+DIST fonttools-4.29.0.tar.gz 2954211 BLAKE2B 47b7228b2f0f7332f54df58d8be8289b9bc3a737caa57ffafe9a8467e4d7e35db153f7e02caf8c6129af8dbb2bc18689af3f3122b0be7afee19bece83c846aad SHA512 0573970ceaf43e4987eee970aa93a6aba5af2b592b5d92a1aec36b102cb1967f380f8170f7a14bb80cd6348ef09737ac17a0f82eaa1ad73f9f5e246271d34b32
+DIST fonttools-4.29.1.tar.gz 2954962 BLAKE2B e78a55e240975e12e9cfd56368eab0d18e104211d8416db833a20208c78f6e5dbce2d24d7338017882f0bd1c3c181c0af0c069025a750cba4e9f41c1b4b2489c SHA512 36f4272be18d19748069289bfb3d3339cf0b16967a12976971f9e2dd56a1e915d3176e0dd9cad08cee69b20f3d6ac1a966365d936bb091b39e23b6c693e28dc9
+EBUILD fonttools-4.28.5.ebuild 1425 BLAKE2B 4a2f7de50c982ee26701066d6f1dce56018299c7d2f0ba41c5c50eba6017277870c0fb564ec570d17dac33ce5acdefe509ab3f6fd60680f3ca08420e22140d35 SHA512 8b003d64c12b4f9dfc988f096df762305d10e0d21d66d5ae8bd98dd885a42d1525d8559709b64e36193b819ae9da7ab6a71b3c8f10d55a5394f3c069cbc22145
+EBUILD fonttools-4.29.0.ebuild 1509 BLAKE2B 4490c55c63dde9563f592e9d9b15a94226fafc038f76d15b13025c15144ba72c185c7fa0bf91f9eb2af00eef2e1b2a0ac705153b59cc17fd2b8be0385c1496e8 SHA512 e832e3c70f9c71b97cddd3bfbd49ea23403a42aa05ee068b4e073109f534778344e9149df4da377fedc52f7bc7e5f007c8d714d6cee2a8210a39c8693f0b12db
+EBUILD fonttools-4.29.1.ebuild 1509 BLAKE2B 4490c55c63dde9563f592e9d9b15a94226fafc038f76d15b13025c15144ba72c185c7fa0bf91f9eb2af00eef2e1b2a0ac705153b59cc17fd2b8be0385c1496e8 SHA512 e832e3c70f9c71b97cddd3bfbd49ea23403a42aa05ee068b4e073109f534778344e9149df4da377fedc52f7bc7e5f007c8d714d6cee2a8210a39c8693f0b12db
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.28.5.ebuild b/dev-python/fonttools/fonttools-4.28.5.ebuild
index b98e2fa9734d..9735a1293094 100644
--- a/dev-python/fonttools/fonttools-4.28.5.ebuild
+++ b/dev-python/fonttools/fonttools-4.28.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,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 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/fonttools/fonttools-4.28.4.ebuild b/dev-python/fonttools/fonttools-4.29.0.ebuild
index 9735a1293094..61180d63050f 100644
--- a/dev-python/fonttools/fonttools-4.28.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.29.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml(+)"
 
@@ -14,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 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
@@ -44,11 +45,14 @@ python_prepare_all() {
 }
 
 src_configure() {
-	DISTUTILS_ARGS=( --with-cython )
+	export FONTTOOLS_WITH_CYTHON=1
 }
 
-python_test() {
-	distutils_install_for_testing
+src_test() {
 	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/fonttools/fonttools-4.29.1.ebuild b/dev-python/fonttools/fonttools-4.29.1.ebuild
new file mode 100644
index 000000000000..61180d63050f
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.29.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+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 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		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
+}
+
+src_configure() {
+	export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}