commit: 29f1014bb63465a243d71f2a7299f04f055e8604 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Wed Jun 1 01:51:30 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Wed Jun 1 05:02:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=29f1014b
dev-util/afdko: enable py3.10, fix tests Closes: https://bugs.gentoo.org/840029 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> dev-util/afdko/Manifest | 2 +- dev-util/afdko/afdko-3.8.1.ebuild | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dev-util/afdko/Manifest b/dev-util/afdko/Manifest index 2a8246531..3c687f4bb 100644 --- a/dev-util/afdko/Manifest +++ b/dev-util/afdko/Manifest @@ -1 +1 @@ -DIST afdko-3.8.1.tar.gz 14290160 BLAKE2B 17cfe6666d5b981bff9b8e41e58ac511d04add7408636782ea8c2ad94af36129d58eda2016af5542825f64a62d79fb1ea3e02e9af8dca4df072bb2abbe67032d SHA512 543f4909a8859e71c11629c35f41de56bcc2bc6d0fe217fa467660783cf3dbb7be9f1dc8e890944d90c8ed4f8da7b97a72e9cd6c6fe528e70dbac300fd5244f3 +DIST afdko-3.8.1.gh.tar.gz 14290160 BLAKE2B 17cfe6666d5b981bff9b8e41e58ac511d04add7408636782ea8c2ad94af36129d58eda2016af5542825f64a62d79fb1ea3e02e9af8dca4df072bb2abbe67032d SHA512 543f4909a8859e71c11629c35f41de56bcc2bc6d0fe217fa467660783cf3dbb7be9f1dc8e890944d90c8ed4f8da7b97a72e9cd6c6fe528e70dbac300fd5244f3 diff --git a/dev-util/afdko/afdko-3.8.1.ebuild b/dev-util/afdko/afdko-3.8.1.ebuild index 0543175ca..ea59fcbce 100644 --- a/dev-util/afdko/afdko-3.8.1.ebuild +++ b/dev-util/afdko/afdko-3.8.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 @@ -13,49 +13,51 @@ HOMEPAGE=" https://adobe-type-tools.github.io/afdko/ https://github.com/adobe-type-tools/afdko " -SRC_URI="https://github.com/adobe-type-tools/afdko/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/adobe-type-tools/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64" LICENSE="Apache-2.0" SLOT="0" -#lxml, unicodedata2, fs, brotli, brotlicffi, zopfli, fontpens are indirect dependencies -RDEPEND=" - dev-cpp/antlr-cpp:4 - >=dev-python/lxml-4.8.0[${PYTHON_USEDEP}] - >=dev-python/fs-2.2.0[${PYTHON_USEDEP}] +COMMON_DEPEND=" >=app-arch/brotli-1.0.1[python,${PYTHON_USEDEP}] - >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] >=app-arch/zopfli-0.1.4 - dev-python/fontPens[${PYTHON_USEDEP}] - + dev-cpp/antlr-cpp:4 +" +RDEPEND="${COMMON_DEPEND} >=dev-python/booleanOperations-0.9.0[${PYTHON_USEDEP}] + >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] >=dev-python/defcon-0.9.0[${PYTHON_USEDEP}] >=dev-python/fontMath-0.8.1[${PYTHON_USEDEP}] + dev-python/fontPens[${PYTHON_USEDEP}] >=dev-python/fonttools-4.26.2[${PYTHON_USEDEP}] - >=dev-util/psautohint-2.3.1[${PYTHON_USEDEP}] + >=dev-python/fs-2.2.0[${PYTHON_USEDEP}] + >=dev-python/lxml-4.8.0[${PYTHON_USEDEP}] >=dev-python/tqdm-4.62.2[${PYTHON_USEDEP}] >=dev-python/ufoNormalizer-0.6.0[${PYTHON_USEDEP}] >=dev-python/ufoProcessor-1.9.0[${PYTHON_USEDEP}] -" -DEPEND=" - ${RDEPEND} + >=dev-util/psautohint-2.3.1[${PYTHON_USEDEP}] + !app-i18n/transifex-client +" # file collisions with app-i18n/transifex-client +DEPEND="${COMMON_DEPEND} >=dev-python/cython-0.29.5[${PYTHON_USEDEP}] >=dev-python/scikit-build-0.11.1[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-3.2.0[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] " BDEPEND=" + >=dev-python/setuptools_scm-3.2.0[${PYTHON_USEDEP}] dev-util/ninja dev-util/cmake " DOCS=( {README,NEWS}.md docs ) + PATCHES=( "${FILESDIR}/${P}-no-cmake-ninja-deps.patch" "${FILESDIR}/${P}-antlr.patch" ) +EPYTEST_DESELECT=( tests/makeotf_test.py::test_writeOptionsFile ) + distutils_enable_tests pytest pkg_setup() { @@ -70,6 +72,5 @@ python_prepare_all() { python_test() { local -x PYTHONPATH="${S}/python:${PYTHONPATH}" local -x PATH="${BUILD_DIR}/test/scripts:${S}/c/build_all:${PATH}" - distutils_install_for_testing - epytest -vv || die + epytest }
