summaryrefslogtreecommitdiff
path: root/dev-python/sip
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/sip')
-rw-r--r--dev-python/sip/Manifest4
-rw-r--r--dev-python/sip/files/sip-6.5.0-pep517-args.patch190
-rw-r--r--dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch21
-rw-r--r--dev-python/sip/sip-6.6.1.ebuild39
4 files changed, 0 insertions, 254 deletions
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d8c8701f35dc..6fb58d518d35 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,10 +1,6 @@
AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-AUX sip-6.5.0-pep517-args.patch 7397 BLAKE2B f29af4b2378c569b21e09b1659e1ebd4bcd2d0308cdfe82042c8830336090d55b0ac48c03b27c98a8488c183f4670f0333ef7b552e66f51432ea1db63025c851 SHA512 3aa8063c53f012bbc1d59d6c43c7053817ade8abb42918e32787faaa85d2bd909ed3760ac9d07d88e62780b35921e06711cd39fffbd2ac7671ac49c69d60ed3c
-AUX sip-6.6.1-python311-invalid-regex.patch 675 BLAKE2B 6f948473730ba93546948b6a597efd5df29df9f4aa18bb41b1eddb76a7a118328be6437185e63a3c5aa7a1c2c3be3eda6af716374929aae8039a07c2b63c75aa SHA512 2040bb54e700dbe8072f9a028b237f30e3256f566d1c7854c1efcef83bcad916b780b7a37a4e90682e293f064b29320fd7eb5deedbdff051be7bbbb75e638a00
DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-DIST sip-6.6.1.tar.gz 1134991 BLAKE2B dec51bce80566ffad25dd67686a746134e032f3cf1696fbf256d000d266f9e3921dcafaead40bcf3dc67d42aa89c5982d090abde7d8b3c3f8ec6ddd4470b9a43 SHA512 49d03730819210f4239946da0ddd0694583dc13458997edc11895ef399d8017f38e3354a87bae495492c3cf3334b810c2d924ec0f5bbb129e88cc15eac720c01
DIST sip-6.6.2.tar.gz 1143535 BLAKE2B 92158af35be47a7581b71d97d1d79f6ca9022144144e3e44e09ccbfa3a285ebb4cec1264e621275159345c33f0f45c86183f7ea1fb3792aca2aeb64d9e46f7ad SHA512 5e031baa9ff6d8d19f4c36ef7c3900c6440d261102259cdc12fce28471a849fed80c123bf31ad506b099a925b2967eb5863e6736ac00fbcff99198711cf0e5e5
EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
-EBUILD sip-6.6.1.ebuild 1082 BLAKE2B 8f06f88625a1118f8ea004d1c07ccc2297b090c9adcd16506dc54572f9ba9d39d34f427880754b76a07c7bbd0d8a36b28806159329e31faaf3ec361506abd783 SHA512 4e4e6e5480243ffa5c75efe45896d143614a41f251012f399d894249fae70a92df6e23276bfe7bcec4d0535898b72d7b10db44c2f76d90f955dd591e8852269b
EBUILD sip-6.6.2.ebuild 974 BLAKE2B d7564afafdb4f1cbcd44209f6b5f9da41654a5d80f976ccd2bdbd12a09b1c3804913acc21583e54646b114f35a0173cddb9baf5f7ac3905036cac35c07ba1ec8 SHA512 cbd6b0ca1e1123e61934bdc0cf44003e63532570767807358031aa7d6412ef4452177ad375d103a26cc57a64947f5bf017f1f62f3c7e04cef1e06d4ae6484ae6
MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/files/sip-6.5.0-pep517-args.patch b/dev-python/sip/files/sip-6.5.0-pep517-args.patch
deleted file mode 100644
index c4d39dcf6156..000000000000
--- a/dev-python/sip/files/sip-6.5.0-pep517-args.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Backport from https://www.riverbankcomputing.com/hg/sip/
-
-changeset: 2771:8543f04b374f
-branch: 6.6-maint
-tag: tip
-user: Phil Thompson <phil@riverbankcomputing.com>
-date: Tue May 10 13:58:28 2022 +0100
-summary: Fixed the PEP571 backend to handle multiple instances of the same config
-
-changeset: 2769:c02af095a016
-branch: 6.6-maint
-user: Phil Thompson <phil@riverbankcomputing.com>
-date: Sat May 07 15:18:14 2022 +0100
-summary: Fix an API backward incompatibility.
-
-changeset: 2768:98dbce3e62f1
-branch: 6.6-maint
-user: Phil Thompson <phil@riverbankcomputing.com>
-date: Sat May 07 15:03:49 2022 +0100
-summary: Any config settings passed by a PEP 571 frontend are now used.
-
-diff -r 8583e2bb1b32 sipbuild/abstract_project.py
---- a/sipbuild/abstract_project.py Thu Nov 25 18:15:32 2021 +0000
-+++ b/sipbuild/abstract_project.py Tue May 10 16:15:30 2022 +0200
-@@ -1,4 +1,4 @@
--# Copyright (c) 2020, Riverbank Computing Limited
-+# Copyright (c) 2022, Riverbank Computing Limited
- # All rights reserved.
- #
- # This copy of SIP is licensed for use under the terms of the SIP License
-@@ -34,7 +34,7 @@
- """ This specifies the API of a project. """
-
- @classmethod
-- def bootstrap(cls, tool, tool_description=''):
-+ def bootstrap(cls, tool, tool_description='', arguments=None):
- """ Return an AbstractProject instance fully configured for a
- particular command line tool.
- """
-@@ -79,6 +79,10 @@
- "The project factory did not return an AbstractProject "
- "object")
-
-+ # We set this as an attribute rather than change the API of the ctor or
-+ # setup().
-+ project.arguments = arguments
-+
- # Complete the configuration of the project.
- project.setup(pyproject, tool, tool_description)
-
-diff -r 8583e2bb1b32 sipbuild/api.py
---- a/sipbuild/api.py Thu Nov 25 18:15:32 2021 +0000
-+++ b/sipbuild/api.py Tue May 10 16:15:30 2022 +0200
-@@ -1,4 +1,4 @@
--# Copyright (c) 2019, Riverbank Computing Limited
-+# Copyright (c) 2022, Riverbank Computing Limited
- # All rights reserved.
- #
- # This copy of SIP is licensed for use under the terms of the SIP License
-@@ -28,10 +28,8 @@
- def build_sdist(sdist_directory, config_settings=None):
- """ The PEP 517 hook for building an sdist from pyproject.toml. """
-
-- # Note that we ignore config_settings until we have a frontend that we can
-- # fully test with. (pip seems lacking at the moment.)
--
-- project = AbstractProject.bootstrap('pep517')
-+ project = AbstractProject.bootstrap('sdist',
-+ arguments=_convert_config_settings(config_settings))
-
- # pip executes this in a separate process and doesn't handle exceptions
- # very well. However it does capture stdout and (eventually) show it to
-@@ -45,10 +43,8 @@
- def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
- """ The PEP 517 hook for building a wheel from pyproject.toml. """
-
-- # Note that we ignore config_settings until we have a frontend that we can
-- # fully test with. (pip seems lacking at the moment.)
--
-- project = AbstractProject.bootstrap('pep517')
-+ project = AbstractProject.bootstrap('wheel',
-+ arguments=_convert_config_settings(config_settings))
-
- # pip executes this in a separate process and doesn't handle exceptions
- # very well. However it does capture stdout and (eventually) show it to
-@@ -57,3 +53,26 @@
- return project.build_wheel(wheel_directory)
- except Exception as e:
- handle_exception(e)
-+
-+
-+def _convert_config_settings(config_settings):
-+ """ Return any configuration settings from the frontend to a pseudo-command
-+ line.
-+ """
-+
-+ if config_settings is None:
-+ config_settings = {}
-+
-+ args = []
-+
-+ for name, value in config_settings.items():
-+ if value:
-+ if not isinstance(value, list):
-+ value = [value]
-+
-+ for m_value in value:
-+ args.append(name + '=' + m_value)
-+ else:
-+ args.append(name)
-+
-+ return args
-diff -r 8583e2bb1b32 sipbuild/configurable.py
---- a/sipbuild/configurable.py Thu Nov 25 18:15:32 2021 +0000
-+++ b/sipbuild/configurable.py Tue May 10 16:15:30 2022 +0200
-@@ -1,4 +1,4 @@
--# Copyright (c) 2021, Riverbank Computing Limited
-+# Copyright (c) 2022, Riverbank Computing Limited
- # All rights reserved.
- #
- # This copy of SIP is licensed for use under the terms of the SIP License
-@@ -244,7 +244,7 @@
- """
-
- # The tools that will build a set of bindings.
-- BUILD_TOOLS = ('build', 'install', 'pep517', 'wheel')
-+ BUILD_TOOLS = ('build', 'install', 'wheel')
-
- # All the valid tools.
- _ALL_TOOLS = BUILD_TOOLS + ('sdist', )
-diff -r 8583e2bb1b32 sipbuild/project.py
---- a/sipbuild/project.py Thu Nov 25 18:15:32 2021 +0000
-+++ b/sipbuild/project.py Tue May 10 16:15:30 2022 +0200
-@@ -155,6 +155,7 @@
-
- # The current directory should contain the .toml file.
- self.root_dir = os.getcwd()
-+ self.arguments = None
- self.bindings = collections.OrderedDict()
- self.bindings_factories = []
- self.builder = None
-@@ -204,11 +205,6 @@
- def apply_user_defaults(self, tool):
- """ Set default values for user options that haven't been set yet. """
-
-- # If we are the backend to a 3rd-party frontend (most probably pip)
-- # then let it handle the verbosity of messages.
-- if self.verbose is None and tool == '':
-- self.verbose = True
--
- # This is only used when creating sdist and wheel files.
- if self.name is None:
- self.name = self.metadata['name']
-@@ -569,14 +565,9 @@
- # Set the initial configuration from the pyproject.toml file.
- self._set_initial_configuration(pyproject, tool)
-
-- # Add any tool-specific command line options for (so far unspecified)
-+ # Add any tool-specific command line arguments for (so far unspecified)
- # parts of the configuration.
-- if tool != 'pep517':
-- self._configure_from_command_line(tool, tool_description)
-- else:
-- # Until pip improves it's error reporting we give the user all the
-- # help we can.
-- self.verbose = True
-+ self._configure_from_arguments(tool, tool_description)
-
- # Now that any help has been given we can report a problematic
- # pyproject.toml file.
-@@ -712,8 +703,8 @@
- for bindings in self.bindings.values():
- bindings.verify_configuration(tool)
-
-- def _configure_from_command_line(self, tool, tool_description):
-- """ Update the configuration from the user supplied command line. """
-+ def _configure_from_arguments(self, tool, tool_description):
-+ """ Update the configuration from any user supplied arguments. """
-
- from argparse import SUPPRESS
- from .argument_parser import ArgumentParser
-@@ -739,7 +730,7 @@
- bindings.add_command_line_options(parser, tool, all_options)
-
- # Parse the arguments and update the corresponding configurables.
-- args = parser.parse_args()
-+ args = parser.parse_args(self.arguments)
-
- for option, configurables in all_options.items():
- for configurable in configurables:
diff --git a/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch b/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch
deleted file mode 100644
index 908111627854..000000000000
--- a/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1651507410 -3600
-# Node ID 3d656f0765f508ea9714b5e7c9ce00e304e6f600
-# Parent c179f418c5bee188e3ec7a0c0e50f9eab34cf12f
-Fixed indented directives.
-
-diff -r c179f418c5be -r 3d656f0765f5 sipbuild/generator/parser/tokens.py
---- a/sipbuild/generator/parser/tokens.py Mon May 02 16:51:06 2022 +0100
-+++ b/sipbuild/generator/parser/tokens.py Mon May 02 17:03:30 2022 +0100
-@@ -174,7 +174,7 @@
-
- # Handle directives.
- def t_DIRECTIVE(t):
-- r'(?m)^\s*%[a-zA-Z][a-zA-Z]*'
-+ r'%[a-zA-Z][a-zA-Z]*'
-
- # The name of the directive is used as its type.
- name = t.value[t.value.index('%') + 1:]
-
diff --git a/dev-python/sip/sip-6.6.1.ebuild b/dev-python/sip/sip-6.6.1.ebuild
deleted file mode 100644
index fa5b7a2265af..000000000000
--- a/dev-python/sip/sip-6.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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 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}]
- dev-python/toml[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-python311-invalid-regex.patch"
- "${FILESDIR}/${PN}-6.5.0-pep517-args.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 23:15:27 +0000