commit: c4f51f46223fecd5e2e8ed6eda059e14aba05dc5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 13:09:13 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 15:38:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f51f46
dev-python/sip: drop 6.7.5-r1, 6.7.7
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-python/sip/Manifest | 2 -
dev-python/sip/files/sip-6.7.5-tomli.patch | 93 ------------------------------
dev-python/sip/sip-6.7.5-r1.ebuild | 44 --------------
dev-python/sip/sip-6.7.7.ebuild | 44 --------------
4 files changed, 183 deletions(-)
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 281a406407ad..0c5d9a1e495c 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,4 +1,2 @@
DIST sip-4.19.25.tar.gz 1056384 BLAKE2B
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
SHA512
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-DIST sip-6.7.5.tar.gz 1160691 BLAKE2B
64572687e026854c3e8ba7de637925f13a880e51e574993e37190b9b1fafa1850da686600a652bab9d399f58516e2c4e4d8a93f5fb13d53a12ecc5ec3885a98c
SHA512
2dc38a6c0489e374a016b7db1f9443bb5d2fb29dc1fa7647ed2dd5bb4aa8758586e2b85569f9fb3b992e15eded0f7a783ec1a53b3d18bee3f8be53d43b79b7b9
-DIST sip-6.7.7.tar.gz 1161807 BLAKE2B
b9a49e2d86f3b13b5852b91403946920c25e9b7c3cb3129f6beece1ba6d607493a04fb0d5c0dd564fbe4b7e814ad9837daf6331096b7a1a4a24ff2a7bb11acb4
SHA512
b41a1e53e8bad1fca08eda2c89b8a7cabe6cb9e54d0ddeba0c718499b0288633fb6b90128d54f3df2420e20bb217d3df224750d30e865487d2b0a640fba82444
DIST sip-6.7.8.tar.gz 1162921 BLAKE2B
3cc7107ad8c81240131ba96c43815b2a971bf109166a7a1bb3401cf5ed99e5d525599c0e7fcf7005c4b1d2194f9e7f386c4d58c10da712d4bd80d95e678f6804
SHA512
5d8965542c3fe821c95b2d2331d7f7df2ac9587a535f0b91f31223f4ee29f893ee73af42dc575abdff44a22a5b2ad98c6738211757595ae5a11f5a54fcea960d
diff --git a/dev-python/sip/files/sip-6.7.5-tomli.patch
b/dev-python/sip/files/sip-6.7.5-tomli.patch
deleted file mode 100644
index c785e41f265a..000000000000
--- a/dev-python/sip/files/sip-6.7.5-tomli.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 586606d..312a431 100644
---- a/setup.py
-+++ b/setup.py
-@@ -51,7 +51,7 @@ setup(
- version=version,
- license='SIP',
- python_requires='>=3.7',
-- install_requires=['packaging', 'ply', 'setuptools', 'toml'],
-+ install_requires=['packaging', 'ply', 'setuptools', 'tomli;
python_version<"3.11"'],
- packages=find_packages(),
- package_data={
- 'sipbuild.module': ['source/*/*'],
-diff --git a/sip.egg-info/requires.txt b/sip.egg-info/requires.txt
-index b465c08..8547535 100644
---- a/sip.egg-info/requires.txt
-+++ b/sip.egg-info/requires.txt
-@@ -1,4 +1,4 @@
- packaging
- ply
- setuptools
--toml
-+tomli; python_version<"3.11"
-diff --git a/sipbuild/bindings_configuration.py
b/sipbuild/bindings_configuration.py
-index 8197e27..a942f3f 100644
---- a/sipbuild/bindings_configuration.py
-+++ b/sipbuild/bindings_configuration.py
-@@ -22,11 +22,16 @@
-
-
- import os
--import toml
-+import sys
-
- from .exceptions import UserFileException, UserParseException
- from .module import resolve_abi_version
-
-+if sys.version_info >= (3, 11):
-+ import tomllib
-+else:
-+ import tomli as tomllib
-+
-
- def get_bindings_configuration(abi_major, sip_file, sip_include_dirs):
- """ Get the configuration of a set of bindings. """
-@@ -47,7 +52,8 @@ def get_bindings_configuration(abi_major, sip_file,
sip_include_dirs):
-
- # Read the configuration.
- try:
-- cfg = toml.load(toml_file)
-+ with open(toml_file, "rb") as f:
-+ cfg = tomllib.load(f)
- except Exception as e:
- raise UserParseException(toml_file, detail=str(e))
-
-diff --git a/sipbuild/pyproject.py b/sipbuild/pyproject.py
-index 1ba2223..6e4a7c6 100644
---- a/sipbuild/pyproject.py
-+++ b/sipbuild/pyproject.py
-@@ -22,11 +22,16 @@
-
-
- from collections import OrderedDict
--import toml
-+import sys
-
- from .exceptions import UserFileException
- from .py_versions import OLDEST_SUPPORTED_MINOR
-
-+if sys.version_info >= (3, 11):
-+ import tomllib
-+else:
-+ import tomli as tomllib
-+
-
- class PyProjectException(UserFileException):
- """ An exception related to a pyproject.toml file. """
-@@ -69,7 +74,8 @@ class PyProject:
- self.toml_error = None
-
- try:
-- self._pyproject = toml.load('pyproject.toml', _dict=OrderedDict)
-+ with open('pyproject.toml', 'rb') as f:
-+ self._pyproject = tomllib.load(f)
- except FileNotFoundError:
- self.toml_error = "there is no such file in the current directory"
- except Exception as e:
-@@ -174,4 +180,4 @@ class PyProject:
- def _is_section(value):
- """ Returns True if a section value is itself a section. """
-
-- return isinstance(value, (OrderedDict, list))
-+ return isinstance(value, (OrderedDict, dict, list))
diff --git a/dev-python/sip/sip-6.7.5-r1.ebuild
b/dev-python/sip/sip-6.7.5-r1.ebuild
deleted file mode 100644
index a839024c9fa8..000000000000
--- a/dev-python/sip/sip-6.7.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="
- https://www.riverbankcomputing.com/software/sip/
- https://pypi.org/project/sip/
-"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc
x86"
-
-RDEPEND="
- !<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
- !=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/ply[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/tomli[${PYTHON_USEDEP}]
- ' 3.{8..10})
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-PATCHES=(
- "${FILESDIR}"/${P}-tomli.patch
-)
diff --git a/dev-python/sip/sip-6.7.7.ebuild b/dev-python/sip/sip-6.7.7.ebuild
deleted file mode 100644
index 0c6d35c90af4..000000000000
--- a/dev-python/sip/sip-6.7.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="
- https://www.riverbankcomputing.com/software/sip/
- https://pypi.org/project/sip/
-"
-
-if [[ ${PV} == *_pre* ]]; then
- MY_P=${PN}-${PV/_pre/.dev}
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
- S=${WORKDIR}/${MY_P}
-else
- inherit pypi
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc
x86"
-
-RDEPEND="
- !<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
- !=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/ply[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/tomli[${PYTHON_USEDEP}]
- ' 3.{8..10})
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.7.5-tomli.patch
-)
