commit: b62ec449848959dea6c0794a42e8eb5d19037a42 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Fri May 2 12:41:36 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Fri May 2 15:44:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62ec449
sci-mathematics/cryptominisat: replace tomli dep with tomllib built-in Closes: https://bugs.gentoo.org/955200 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> ...tominisat-5.11.21-r1.ebuild => cryptominisat-5.11.21-r2.ebuild} | 7 ++----- ...1.21-setup-py.patch => cryptominisat-5.11.21-setup-py-r1.patch} | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.11.21-r1.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.11.21-r2.ebuild similarity index 90% rename from sci-mathematics/cryptominisat/cryptominisat-5.11.21-r1.ebuild rename to sci-mathematics/cryptominisat/cryptominisat-5.11.21-r2.ebuild index db2ca950f559..cb6eded6439b 100644 --- a/sci-mathematics/cryptominisat/cryptominisat-5.11.21-r1.ebuild +++ b/sci-mathematics/cryptominisat/cryptominisat-5.11.21-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,9 +38,6 @@ RDEPEND=" sys-libs/zlib:= python? ( ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ') ) " DEPEND=" @@ -53,7 +50,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-5.11.21-setup-py.patch" + "${FILESDIR}/${PN}-5.11.21-setup-py-r1.patch" "${FILESDIR}/${PN}-5.11.21-unistd.patch" ) diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py-r1.patch similarity index 85% rename from sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py.patch rename to sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py-r1.patch index 6b13b3e05b26..fdc0a58ee770 100644 --- a/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py.patch +++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py-r1.patch @@ -5,14 +5,14 @@ from setuptools import Extension, setup import sysconfig -import toml -+import tomli ++import tomllib import pathlib from sys import platform def _parse_toml(pyproject_path): pyproject_text = pyproject_path.read_text() - pyproject_data = toml.loads(pyproject_text) -+ pyproject_data = tomli.loads(pyproject_text) ++ pyproject_data = tomllib.loads(pyproject_text) return pyproject_data['project']['version'] picosatlib = ('picosatlib', {
