commit: 129e3ad23cc637ca00bd002526f69a085417763d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Aug 28 10:38:58 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Aug 28 10:39:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=129e3ad2
dev-python/cffi: Revert "Require <dev-python/setuptools-74" Actually, the broken imports apply only to win32. Reverts: 7f32c4ba9c0d492b2a4f5494a981a991df022623 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/cffi/{cffi-1.16.0-r1.ebuild => cffi-1.16.0.ebuild} | 4 ++-- dev-python/cffi/{cffi-1.17.0-r1.ebuild => cffi-1.17.0.ebuild} | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dev-python/cffi/cffi-1.16.0-r1.ebuild b/dev-python/cffi/cffi-1.16.0.ebuild similarity index 95% rename from dev-python/cffi/cffi-1.16.0-r1.ebuild rename to dev-python/cffi/cffi-1.16.0.ebuild index bffeaa3b3bba..a44630dcd7d5 100644 --- a/dev-python/cffi/cffi-1.16.0-r1.ebuild +++ b/dev-python/cffi/cffi-1.16.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # please keep this ebuild at EAPI 8 -- sys-apps/portage dep @@ -31,7 +31,7 @@ DEPEND=" RDEPEND=" ${DEPEND} dev-python/pycparser[${PYTHON_USEDEP}] - <dev-python/setuptools-74[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/dev-python/cffi/cffi-1.17.0-r1.ebuild b/dev-python/cffi/cffi-1.17.0.ebuild similarity index 93% rename from dev-python/cffi/cffi-1.17.0-r1.ebuild rename to dev-python/cffi/cffi-1.17.0.ebuild index 8c4d27a3a72d..60922891b668 100644 --- a/dev-python/cffi/cffi-1.17.0-r1.ebuild +++ b/dev-python/cffi/cffi-1.17.0.ebuild @@ -27,11 +27,10 @@ DEPEND=" >=dev-libs/libffi-3.4.4-r1:= " # setuptools as a modern distutils provider -# <setuptools-74 for https://github.com/python-cffi/cffi/issues/117 RDEPEND=" ${DEPEND} dev-python/pycparser[${PYTHON_USEDEP}] - <dev-python/setuptools-74[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND}