* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/files/, dev-python/sip/
@ 2022-05-11 16:43 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2022-05-11 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 58ee906da23e6e5e7d51289e45b33af9ca6f45e6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 12:50:12 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 11 16:43:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ee906d
dev-python/sip: Backport PEP517 argument passing support
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/sip/files/sip-6.5.0-pep517-args.patch | 190 +++++++++++++++++++++++
dev-python/sip/sip-6.5.0-r1.ebuild | 36 +++++
2 files changed, 226 insertions(+)
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
new file mode 100644
index 000000000000..c4d39dcf6156
--- /dev/null
+++ b/dev-python/sip/files/sip-6.5.0-pep517-args.patch
@@ -0,0 +1,190 @@
+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/sip-6.5.0-r1.ebuild b/dev-python/sip/sip-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..3f31cadaf6d1
--- /dev/null
+++ b/dev-python/sip/sip-6.5.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+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/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+PATCHES=(
+ "${FILESDIR}"/${P}-pep517-args.patch
+)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/files/, dev-python/sip/
@ 2023-01-26 14:33 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-01-26 14:33 UTC (permalink / raw
To: gentoo-commits
commit: ba351131189efe64238463e2d8b8403f3f29d0ac
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 14:13:00 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 14:33:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba351131
dev-python/sip: Port to tomllib/tomli
Bug: https://bugs.gentoo.org/878671
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/sip/files/sip-6.7.5-tomli.patch | 93 ++++++++++++++++++++++
.../sip/{sip-6.7.5.ebuild => sip-6.7.5-r1.ebuild} | 14 +++-
2 files changed, 105 insertions(+), 2 deletions(-)
diff --git a/dev-python/sip/files/sip-6.7.5-tomli.patch b/dev-python/sip/files/sip-6.7.5-tomli.patch
new file mode 100644
index 000000000000..c785e41f265a
--- /dev/null
+++ b/dev-python/sip/files/sip-6.7.5-tomli.patch
@@ -0,0 +1,93 @@
+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.ebuild b/dev-python/sip/sip-6.7.5-r1.ebuild
similarity index 79%
rename from dev-python/sip/sip-6.7.5.ebuild
rename to dev-python/sip/sip-6.7.5-r1.ebuild
index 139b26e4f7c4..a839024c9fa8 100644
--- a/dev-python/sip/sip-6.7.5.ebuild
+++ b/dev-python/sip/sip-6.7.5-r1.ebuild
@@ -5,10 +5,14 @@ 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/"
+HOMEPAGE="
+ https://www.riverbankcomputing.com/software/sip/
+ https://pypi.org/project/sip/
+"
MY_P=${PN}-${PV/_pre/.dev}
if [[ ${PV} == *_pre* ]]; then
@@ -28,7 +32,13 @@ RDEPEND="
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/ply[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/toml[${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
+)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/files/, dev-python/sip/
@ 2023-09-01 5:20 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2023-09-01 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 81baa4f22c4992cad8d8926985a6b81cc970eb7e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 1 05:06:02 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 1 05:19:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81baa4f2
dev-python/sip: drop 4.19.25-r1 (last of SLOT=0)
Debated doing last-rites (as noted in bug #896878) but,
given this is py3.10-only, any revdeps left in overlays are
likely aleady in a poor state either way.
Closes: https://bugs.gentoo.org/896878
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-python/sip/Manifest | 1 -
dev-python/sip/files/sip-4.18-darwin.patch | 30 ----------
dev-python/sip/sip-4.19.25-r1.ebuild | 93 ------------------------------
3 files changed, 124 deletions(-)
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 95cfcff07124..de0eadf0b901 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,2 @@
-DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
DIST sip-6.7.10.tar.gz 1165087 BLAKE2B 945027e741033a9d85dd9716586324d50380a1cbb4bcbe0df5e2db08697f6e088fb6778d93488c3d07947df3b57442af7a2225500efec0b274a8a9bfa177ecc8 SHA512 56f18fe6599dc74a90c07c58a7f1c23511c7f3661a3ec507d70fd2d32e636713ecd3cf1c960a3687261175c9a42df9de099e28cd1e6c0067ed755b97fc753e96
DIST sip-6.7.11.tar.gz 1165368 BLAKE2B 62ba38ca39544e7ed0935e91729ba6f82a5e613a4b26fbf27c3708a5cb38ba0fa583ceb6a45c0c7485579f4c318fc5ac910eee8477aee6d25d33d4ae07bf527b SHA512 a9247714fd6f6e6dffff2e6b53b35a7831ced55f0706e7c883d6700f22b814dc2cf1e56e681214759c90386ff2c77cb4ace6d07cd0c8b6da0ed65444f9857056
diff --git a/dev-python/sip/files/sip-4.18-darwin.patch b/dev-python/sip/files/sip-4.18-darwin.patch
deleted file mode 100644
index 6dd45ac024e3..000000000000
--- a/dev-python/sip/files/sip-4.18-darwin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru sip-4.18.orig/siputils.py sip-4.18/siputils.py
---- sip-4.18.orig/siputils.py 2016-04-16 22:38:22.662502890 +0200
-+++ sip-4.18/siputils.py 2016-04-16 22:38:39.881551111 +0200
-@@ -946,8 +946,6 @@
- """
- if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
- plib = clib + ".lib"
-- elif sys.platform == "darwin" and framework:
-- plib = "-framework " + clib
- else:
- plib = "-l" + clib
-
-@@ -962,8 +960,6 @@
- """
- if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
- prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
-- elif sys.platform == "darwin" and framework:
-- prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl")
- else:
- prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
-
-@@ -1639,7 +1635,7 @@
- if sys.platform == "win32":
- ext = "pyd"
- elif sys.platform == "darwin":
-- ext = "so"
-+ ext = "bundle"
- elif sys.platform == "cygwin":
- ext = "dll"
- else:
diff --git a/dev-python/sip/sip-4.19.25-r1.ebuild b/dev-python/sip/sip-4.19.25-r1.ebuild
deleted file mode 100644
index a647c9b88364..000000000000
--- a/dev-python/sip/sip-4.19.25-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/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="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
- # Sub-slot sanity check
- local sub_slot=${SLOT#*/}
- local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
- if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
- eerror
- eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
- eerror "Please update SLOT variable as follows:"
- eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
- eerror
- die "sub-slot sanity check failed"
- fi
-
- default
-}
-
-src_configure() {
- configuration() {
- local incdir=$(python_get_includedir)
- local myconf=(
- "${EPYTHON}"
- "${S}"/configure.py
- --sysroot="${ESYSROOT}/usr"
- --bindir="${EPREFIX}/usr/bin"
- --destdir="$(python_get_sitedir)"
- --incdir="${incdir#${SYSROOT}}"
- --no-dist-info
- AR="$(tc-getAR) cqs"
- CC="$(tc-getCC)"
- CFLAGS="${CFLAGS}"
- CFLAGS_RELEASE=
- CXX="$(tc-getCXX)"
- CXXFLAGS="${CXXFLAGS}"
- CXXFLAGS_RELEASE=
- LINK="$(tc-getCXX)"
- LINK_SHLIB="$(tc-getCXX)"
- LFLAGS="${LDFLAGS}"
- LFLAGS_RELEASE=
- RANLIB=
- STRIP=
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- emake DESTDIR="${D}" install
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
- use doc && dodoc -r doc/html
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/files/, dev-python/sip/
@ 2023-11-30 19:42 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2023-11-30 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 26015185884dbf8a89578be9ea30cd01772fdb7a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 19:07:53 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 19:40:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26015185
dev-python/sip: add 6.8.0
Closes: https://bugs.gentoo.org/916261
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-python/sip/Manifest | 1 +
dev-python/sip/files/sip-6.8.0-typo-fix.patch | 11 +++++++++++
dev-python/sip/sip-6.8.0.ebuild | 27 +++++++++++++++++++++++++++
3 files changed, 39 insertions(+)
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 622f9a4d2c06..3d385922cbe7 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,2 +1,3 @@
DIST sip-6.7.12.tar.gz 1169656 BLAKE2B 07ae682e783da5bc6fc3109c62c7bff245faab795cc28f135758b1211fae1dfae79668e7e7c0de8b3bae5c8b10534d153cdd47969b34149c8f5598867d19f17c SHA512 885c32a051e882b82b59bf1365050933f8fc1c619b19f4bc03235edc5741a5e14aae8edf90479ad0283f74ba5c5233a2589c151ec865b130199a6db9800a2294
DIST sip-6.8.0.dev2310230931.tar.gz 1126109 BLAKE2B 53efdb9722888645b9772c6080f34459b89c745a02cfb9842f7924870afa81d4ba06ec6ac730ee1d254f5252c1c495a4b4dfd51157d759d7334d2980145214f8 SHA512 8bac33c9ae87dc11669837e2b07d5016a7e16e743439dbf763c13a118476431058d2a6c4b0c29e4ce7a7f5f86602bb1c9f27ccf0d3f6c1a298b06256f820ceaa
+DIST sip-6.8.0.tar.gz 985563 BLAKE2B 676636882a5bb39b226e7b25ae60cec43bf8ccfe9af085e14d9ff627af5ee579cc3ba01dbc5c2e75490575888fabdbd469895dbd964ea741d9e86748bebc1097 SHA512 09e25e3937339b6dbaa0b693bf0b99e5c225751ca79e0a307387c331f2b84e4e5a276897b471a123d24715e5d9cb85e84d244cf07960ff6f53f75859bbb2f901
diff --git a/dev-python/sip/files/sip-6.8.0-typo-fix.patch b/dev-python/sip/files/sip-6.8.0-typo-fix.patch
new file mode 100644
index 000000000000..637d416d403e
--- /dev/null
+++ b/dev-python/sip/files/sip-6.8.0-typo-fix.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/916261
+https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045607.html
+--- a/sipbuild/generator/outputs/code.py
++++ b/sipbuild/generator/outputs/code.py
+@@ -8409,5 +8409,5 @@
+ 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:
diff --git a/dev-python/sip/sip-6.8.0.ebuild b/dev-python/sip/sip-6.8.0.ebuild
new file mode 100644
index 000000000000..67ecebb1da3e
--- /dev/null
+++ b/dev-python/sip/sip-6.8.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+PATCHES=(
+ "${FILESDIR}"/${P}-typo-fix.patch
+)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-11-30 19:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-11 16:43 [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/files/, dev-python/sip/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-01-26 14:33 Michał Górny
2023-09-01 5:20 Ionen Wolkens
2023-11-30 19:42 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox