From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8A3715802F for ; Tue, 7 Mar 2023 07:08:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1ED7CE0864; Tue, 7 Mar 2023 07:08:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC560E0864 for ; Tue, 7 Mar 2023 07:08:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BFF6341331 for ; Tue, 7 Mar 2023 07:08:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86ABB8DD for ; Tue, 7 Mar 2023 07:08:53 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1678172795.b6e1505025f4180520e91f0f7f43b15a170acd59.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/fonttools/files/, dev-python/fonttools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch dev-python/fonttools/fonttools-4.38.0-r1.ebuild X-VCS-Directories: dev-python/fonttools/files/ dev-python/fonttools/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b6e1505025f4180520e91f0f7f43b15a170acd59 X-VCS-Branch: master Date: Tue, 7 Mar 2023 07:08:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e83139e0-2101-4a42-8937-21d2c2840cbd X-Archives-Hash: c4253e78aa1513a1e2b9d2a866adfea1 commit: b6e1505025f4180520e91f0f7f43b15a170acd59 Author: Michał Górny gentoo org> AuthorDate: Tue Mar 7 05:45:09 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Mar 7 07:06:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e15050 dev-python/fonttools: Revert "add pypy3 to PYTHON_COMPAT" The patch no longer applies to 4.39.0, and there are no revdeps right now, so let's revert it until it is upstreamed properly. Reverts: 7d043cbaeda9ad1128fe8130ca31738371e02233 Signed-off-by: Michał Górny gentoo.org> .../fonttools/files/fonttools-4.38.0-pypy3.patch | 34 ----------- dev-python/fonttools/fonttools-4.38.0-r1.ebuild | 70 ---------------------- 2 files changed, 104 deletions(-) diff --git a/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch b/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch deleted file mode 100644 index 4a85cde3891e..000000000000 --- a/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch +++ /dev/null @@ -1,34 +0,0 @@ -url: https://github.com/fonttools/fonttools/issues/2996 - -commit ca9d98d94c3ba98db934f0d1e3a77134171f2262 -Author: Jérôme Carretero -Date: Fri Feb 17 19:24:46 2023 -0500 - - Fixup pypy3 compatibility - -diff --git a/Lib/fontTools/misc/macCreatorType.py b/Lib/fontTools/misc/macCreatorType.py -index 6b191054b..f680f238d 100644 ---- a/Lib/fontTools/misc/macCreatorType.py -+++ b/Lib/fontTools/misc/macCreatorType.py -@@ -24,7 +24,7 @@ def getMacCreatorAndType(path): - """ - if xattr is not None: - try: -- finderInfo = xattr.getxattr(path, 'com.apple.FinderInfo') -+ finderInfo = xattr.getxattr(str(path), 'com.apple.FinderInfo') - except (KeyError, IOError): - pass - else: -diff --git a/Lib/fontTools/subset/svg.py b/Lib/fontTools/subset/svg.py -index 4ed2cbd20..4a8823928 100644 ---- a/Lib/fontTools/subset/svg.py -+++ b/Lib/fontTools/subset/svg.py -@@ -77,7 +77,7 @@ def iter_referenced_ids(tree: etree.Element) -> Iterator[str]: - - attrs = el.attrib - if "style" in attrs: -- attrs = {**attrs, **parse_css_declarations(el.attrib["style"])} -+ attrs = {**dict(attrs), **dict(parse_css_declarations(el.attrib["style"]))} - for attr in ("fill", "clip-path"): - if attr in attrs: - value = attrs[attr] diff --git a/dev-python/fonttools/fonttools-4.38.0-r1.ebuild b/dev-python/fonttools/fonttools-4.38.0-r1.ebuild deleted file mode 100644 index d401fb8fb46d..000000000000 --- a/dev-python/fonttools/fonttools-4.38.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 virtualx - -DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts" -HOMEPAGE=" - https://github.com/fonttools/fonttools/ - https://pypi.org/project/fonttools/ -" -SRC_URI=" - https://github.com/fonttools/fonttools/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" - -RDEPEND=" - >=dev-python/fs-2.4.9[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - test? ( - app-arch/brotli[python,${PYTHON_USEDEP}] - app-arch/zopfli - ) -" - -PATCHES=( - "${FILESDIR}/fonttools-4.38.0-pypy3.patch" -) - -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}" -}