gentoo resync : 15.12.2019

6 files changed, 96 insertions, 71 deletions

diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index bbec2d0e1337..7b9feb6597c0 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,9 +1,7 @@
-DIST fonttools-3.0.tar.gz 298992 BLAKE2B 74adad38ea49e95b19a306d7a37cdff60f9983d32f4cce0685135153f1cd9adaf1b344edff57cdb060ec085dfde41d9f096e4eb49d5789494e19e54343c55316 SHA512 d0793d4c17e077e2cd308f37680d8b2ac34502542fda5a4a20e9567dff3667c8fc3f73aff8605e2e86d5486bf9a61f3f25f1f8d20d6de610477f7f8b0c7be40e
-DIST fonttools-3.24.2.tar.gz 1264825 BLAKE2B dd08243ec237c9c8616cb15f749a89b38fce13a0ac3a3deb64abe19dd95854222aa40003d0457f8821aeebe2e2d637262861f2af90235deb26bafccba30819dc SHA512 6a4b771e94ff23bf75f7a4aad2049350bc8cc41aae09c7fddaac6dc76662248032f138f64849cad8b8a46ad4c7ff8ff115e22084b6af4833cefb2614fdd289a8
 DIST fonttools-3.44.0.tar.gz 2040100 BLAKE2B cdbebe8b38929ed8f436b899a9f5c7c5cddf546558ffd9e347fd41fc06dc4521741dd80d4b8c1cec4f996322ec09e8892174c965ff55bc6e4c7e4c5f44be0fe5 SHA512 ce390ccf69a4222ab8042f72c4e2495e39cb6907fafaea36f505407c7c6cca891d43374d648ae9f1a3119bfaeb1768b34f7c0340fad4fd158722cf2bfff425f7
 DIST fonttools-4.0.1.tar.gz 2240578 BLAKE2B d7d735c4edfc09d90e2fd5b05e195e900f4f96e7acb52d0fdb00d95e9a39fa698dc853908b93f6f54674d9536caa9b7bc6c2b487565443b3e115a5ab3237eae7 SHA512 ae8a956ee03923ccbaf9d8950361cf0a2e3b86d61145298de07e8f4ed50680cea07dc56802663e3edf1fd9f18850983fac5685036f3c99fc454ea72591646eb0
-EBUILD fonttools-3.0.ebuild 726 BLAKE2B e62cfb46680252cde540fa383f11e88ae8926d09e5810724fb77476ae408ae72c5093a8fca22f204778e1a7fdcd7f312e051dca037a4cce94d12aedcab6157bc SHA512 2e2a26304e6eba1ef030b4b991015076bcbfdcc0ebfc753ebc99ba3859416cdb5d6e77195d49465269c5cd80e46207020e5dfd339eb5e427f7a9ea9f7046ac78
-EBUILD fonttools-3.24.2.ebuild 793 BLAKE2B 4a2fc04f6c669ca62b03b650a8d919366b89d37f00185c29ed642e57696262b914a61a0acd42306712449003f73ff7c848ac97b27d6d5bbbc2f74fd98c153bba SHA512 0336578576671d0ef5668b91f8e3a16a87e6b4f91812d73f263f5744bd26df1636be78f326c1323402b6469b78b1009bb1ca60abdadd44c9b920395522b19071
-EBUILD fonttools-3.44.0.ebuild 914 BLAKE2B 62d4e1a675b851269b7626fc7462cad0c2f7ee35d286f3e6ae08cc78adc12a7c2c81e10afe25b4fc6886765a20fe478b4164e3378501d6b4a6025af0c409ed4a SHA512 3c9f0ba0682b7c3ceb4308c6c81ae1e295706acf39b4349678a36448a3376d84b307f3e260cbc98f227247d8664280e4729d8421164c85b2ef5cd2b8b4de1b4b
-EBUILD fonttools-4.0.1.ebuild 910 BLAKE2B 2a0846f9ded885cfcab77d9cd78a6c98d057f60e89c98be708fbe5dbd5fb0049b3e3d2f36a748f902067f165d4ebc3ccd37f60912f896c42625f47f79b2b9b01 SHA512 4b0631a727274c5fc3ba660d4026a19221da1cba8dea2a8ae4a7468fa95cfce485c44293f5143c0f1ad45578d0449029bd6a44b2b5f734de2b00bda68049e58f
+DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
+EBUILD fonttools-3.44.0.ebuild 1479 BLAKE2B 81662e78ed574cc0377e38be3b1f41b896cff9ce300c07acfed8992326a6f58ae05c7413990cf6dfb38401c56ea81a3192dec99cefddf749766f9c77a4404197 SHA512 583b8d949eaf0b5497981a68319f86a32df01adc505487309e0d826bffd9460cdd1f76ab5dd3fdf5845c45dd75e090e341d4eae0d831e1abb09192d6d97f3290
+EBUILD fonttools-4.0.1.ebuild 1388 BLAKE2B 065474e8ae4c107b50d39421c3c92107c60d81e8cff77a8d457eb6c0c1bd92501f59acf46552d383b9059a2b5cd8b7b9b1e464c7422140a7459d0009acbca083 SHA512 6eeb194b8312b892a5edd619ce5e1be1745dae27bc5d2e45d7e3225e2555388458f2af6f4e88a607fa5322a7c9e5ac80ca1ff2885311117707c2a366e8d371af
+EBUILD fonttools-4.1.0.ebuild 1386 BLAKE2B 6c702fa823426d5aa59d1aa8c2237039a4af1b1bb0a21a5195a2d39a0c456aa0c8fab2e31f786d5564e3bbc1c3dc2e1481ee414e57741ffe953294c5123f7347 SHA512 d2b6f1bd6b1104700eeb8a3609eb90ae151208f9947d100f15981053efd086849750ce9dbde3532f06a354bdcda52dc7ad8188c81eddaded0e7dafec963922d6
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.0.ebuild b/dev-python/fonttools/fonttools-3.0.ebuild
deleted file mode 100644
index ece1a7adc9c1..000000000000
--- a/dev-python/fonttools/fonttools-3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-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 s390 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-python/numpy-1.0.2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	DOCS=( README.md Doc/{changes.txt,install.txt} )
-	HTML_DOCS=( Doc/documentation.html )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/fonttools/fonttools-3.24.2.ebuild b/dev-python/fonttools/fonttools-3.24.2.ebuild
deleted file mode 100644
index 3f9adb57e046..000000000000
--- a/dev-python/fonttools/fonttools-3.24.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-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 ~mips ~ppc ~ppc64 s390 ~sparc x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	touch Tests/svgLib/__init__.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/fonttools/fonttools-3.44.0.ebuild b/dev-python/fonttools/fonttools-3.44.0.ebuild
index a0487ce8e15b..14c286579526 100644
--- a/dev-python/fonttools/fonttools-3.44.0.ebuild
+++ b/dev-python/fonttools/fonttools-3.44.0.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -26,9 +27,28 @@ DEPEND="${RDEPEND}
 		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
 		app-arch/brotli[python,${PYTHON_USEDEP}]
 		app-arch/zopfli
+		python_targets_python2_7? (
+			dev-python/backports-os[python_targets_python2_7]
+		)
 	)"
 
+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 pytest -vv Tests fontTools || die "pytest failed"
+	virtx pytest -vv Tests fontTools
 }
diff --git a/dev-python/fonttools/fonttools-4.0.1.ebuild b/dev-python/fonttools/fonttools-4.0.1.ebuild
index b9df172c14cc..b798b62b0282 100644
--- a/dev-python/fonttools/fonttools-4.0.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.0.1.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -28,7 +29,23 @@ DEPEND="${RDEPEND}
 		app-arch/zopfli
 	)"
 
+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 pytest -vv Tests fontTools || die "pytest failed"
+	virtx pytest -vv Tests fontTools
 }
diff --git a/dev-python/fonttools/fonttools-4.1.0.ebuild b/dev-python/fonttools/fonttools-4.1.0.ebuild
new file mode 100644
index 000000000000..b395c5d610a5
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+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 ~ppc ~ppc64 ~sparc ~x86"
+RESTRICT="!test? ( test )"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+
+		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+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 pytest -vv Tests fontTools
+}