devel/py-sip: Update to 6.8.1

https://riverbankcomputing.com/news/SIP_v6.8.1_Released

4 files changed, 4 insertions, 78 deletions

diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 11fc24b23533..7533fb1fd9e3 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -85,7 +85,7 @@ MASTER_SITES_QSCI2=	RIVERBANK/QScintilla/${PORTVERSION} \
 #
 # Where noted, the ports are epoched and the py-${comp}-PATH variables,
 # below, should have a suitable epoch appended to the version.
-SIP_VERSION=		6.8.0	# ,1
+SIP_VERSION=		6.8.1	# ,1
 SIP4_VERSION=		4.19.25
 QSCI2_VERSION=		2.14.1
 PYQT5_VERSION=		5.15.10
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index b13cb227fd2a..79cdefccb83e 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	sip
 PORTVERSION=	${SIP_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_SIP}
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index 9c3043973f44..187ff206a45d 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701799473
-SHA256 (sip-6.8.0.tar.gz) = 2ed1904820cb661b7207eb1dccfaebec1a5463dcad903ba448ad1945502d089c
-SIZE (sip-6.8.0.tar.gz) = 985563
+TIMESTAMP = 1702419746
+SHA256 (sip-6.8.1.tar.gz) = 3002df415e168ac3ffe393942dbc7131cb82ade50000e1526f46a88ade26f598
+SIZE (sip-6.8.1.tar.gz) = 986219
diff --git a/devel/py-sip/files/patch-sipbuild_generator_outputs_code.py b/devel/py-sip/files/patch-sipbuild_generator_outputs_code.py
deleted file mode 100644
index c0fbf4765ab7..000000000000
--- a/devel/py-sip/files/patch-sipbuild_generator_outputs_code.py
+++ /dev/null
@@ -1,73 +0,0 @@
-Fix several regressions in the new code generator that was re-written in
-Python.
-
-Includes upstream fixes:
-https://www.riverbankcomputing.com/hg/sip/rev/67e0294b505c
-https://www.riverbankcomputing.com/hg/sip/rev/4b98e8e43a1e
-https://www.riverbankcomputing.com/hg/sip/rev/0d6692e9c295
-https://www.riverbankcomputing.com/hg/sip/rev/10b05deedee7
-https://www.riverbankcomputing.com/hg/sip/rev/2d6fa85ae3de
-https://www.riverbankcomputing.com/hg/sip/rev/fc6f81078cc4
-
-plus a missed space in a function declaration (first hunk).
-
---- sipbuild/generator/outputs/code.py.orig	2023-11-30 12:14:32 UTC
-+++ sipbuild/generator/outputs/code.py
-@@ -521,7 +521,7 @@ f'''
-             sf.write(
- f'''
- 
--void sipVEH_{module_name}_{virtual_error_handler.name}(sipSimpleWrapper *{self_name}, sip_gilstate_t{state_name})
-+void sipVEH_{module_name}_{virtual_error_handler.name}(sipSimpleWrapper *{self_name}, sip_gilstate_t {state_name})
- {{
- ''')
- 
-@@ -4251,7 +4251,7 @@ def _call_default_ctor(spec, ctor):
- 
-         # Do what we can to provide type information to the compiler.
-         if arg.type is ArgumentType.CLASS and len(arg.derefs) > 0 and not arg.is_reference:
--            class_type = fmt_argument_as_cpp_type(spec, arg.definition)
-+            class_type = fmt_argument_as_cpp_type(spec, arg)
-             arg_s = f'static_cast<{class_type}>(0)'
-         elif arg.type is ArgumentType.ENUM:
-             enum_type = fmt_enum_as_cpp_type(arg.definition)
-@@ -6177,7 +6177,7 @@ def _catch_block(sf, spec, exception, py_signature=Non
-     # with older versions of SIP.
-     exception_cpp_stripped = exception_fq_cpp_name.cpp_stripped(STRIP_GLOBAL)
- 
--    sip_exception_ref = 'sipExceptionRef' if exception.class_exception is not None or _is_used_in_code(exception.raise_code) else ''
-+    sip_exception_ref = 'sipExceptionRef' if exception.class_exception is not None or _is_used_in_code(exception.raise_code, 'sipExceptionRef') else ''
- 
-     sf.write(
- f'''            catch ({exception_cpp_stripped} &{sip_exception_ref})
-@@ -7593,10 +7593,10 @@ def _arg_parser(sf, spec, scope, py_signature, ctor=No
-             operator = '!='
-             sip_value = 'sipValue'
- 
--        parser_function = f'sipValue {operator} SIP_NULLPTR && sipParsePair('
-+        parser_function = f'sipValue {operator} SIP_NULLPTR && sipParsePair'
-         args.append('&sipParseErr')
-         args.append('sipName')
--        args.append('sipValue')
-+        args.append(sip_value)
- 
-     elif (overload is not None and overload.common.allow_keyword_args) or ctor is not None:
-         # We handle keywords if we might have been passed some (because one of
-@@ -8013,7 +8013,7 @@ def _delete_temporaries(sf, spec, py_signature):
-             if spec.c_bindings or not arg.is_const:
-                 sf.write(f'            sipFree({arg_name});\n')
-             else:
--                sf.write(f'            sipFree(const_cast<wchar_t *>({arg_nr}));\n')
-+                sf.write(f'            sipFree(const_cast<wchar_t *>({arg_name}));\n')
- 
-         else:
-             convert_to_type_code = _get_convert_to_type_code(arg)
-@@ -8408,7 +8408,7 @@ def _class_docstring(sf, spec, bindings, klass):
-     else:
-         is_first = True
- 
--    if klass.docstring is None or klass.docstring.signature is not SocstringSignature.DISCARDED:
-+    if klass.docstring is None or klass.docstring.signature is not DocstringSignature.DISCARDED:
-         for ctor in klass.ctors:
-             if ctor.access_specifier is AccessSpecifier.PRIVATE:
-                 continue