diff options
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/grpcio-tools/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/grpcio-tools/grpcio-tools-1.66.1.ebuild (renamed from dev-python/grpcio-tools/grpcio-tools-1.62.0.ebuild) | 21 | ||||
| -rw-r--r-- | dev-python/grpcio/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/grpcio/files/1.62.0-cython3.patch | 107 | ||||
| -rw-r--r-- | dev-python/grpcio/grpcio-1.66.1.ebuild (renamed from dev-python/grpcio/grpcio-1.62.0.ebuild) | 25 |
5 files changed, 31 insertions, 126 deletions
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest index 36fc7269..9c2603a4 100644 --- a/dev-python/grpcio-tools/Manifest +++ b/dev-python/grpcio-tools/Manifest @@ -1 +1 @@ -DIST grpcio-tools-1.62.0.tar.gz 4613875 BLAKE2B 60c8d7c38f10a80ed5b420ecab312ea6f5ad384245194c4f6726783385d443c6354306bbef604230d3a81e9f2cc6885f76eb6a5beae4733279d6210c3fe6603d SHA512 c1691a705cea54056850e98caff37025e551b165b4042f6cab856319805e9507b9aaac5ceea35641f62ce619274faac735e4d2002d36e22b1ce22cf96269dc58 +DIST grpcio_tools-1.66.1.tar.gz 5134197 BLAKE2B b55eecb8fef4f529bb1cf616b71fd676d5cef27431d01cb5bc5920664e904c6f0a6b84ffb3ae067eebfc5a964fbe45ff18b89f74786a52c7d6b98232ee1521c3 SHA512 04cb1cd4280e938d9eec8b4c9ddd8d2cb815a6b8785968b6afa305612d60ead90c8162f522287d82a5bb4d335095918e4b2babaa7766db6f8fb821e5fbb07096 diff --git a/dev-python/grpcio-tools/grpcio-tools-1.62.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.66.1.ebuild index 3ebdbe20..ac2c3223 100644 --- a/dev-python/grpcio-tools/grpcio-tools-1.62.0.ebuild +++ b/dev-python/grpcio-tools/grpcio-tools-1.66.1.ebuild @@ -3,9 +3,9 @@ EAPI=8 +DISTUTILS_EXT=1 PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 inherit distutils-r1 multiprocessing prefix pypi @@ -14,20 +14,31 @@ HOMEPAGE="https://grpc.io" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" RDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] ~dev-python/grpcio-${PV}[${PYTHON_USEDEP}] - <dev-python/protobuf-python-5[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-4.21.3[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-5.26.1[${PYTHON_USEDEP}] + <dev-python/protobuf-python-6[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + dev-python/cython[${PYTHON_USEDEP}] +" python_prepare_all() { distutils-r1_python_prepare_all hprefixify setup.py + + # use system protobuf + sed -r -i \ + -e '/^CC_FILES=\[/,/\]/{/^CC_FILES=\[/n;/\]/!d;}' \ + -e '/^CC_INCLUDES=\[/,/\]/{/^CC_INCLUDES=\[/n;/\]/!d;}' \ + -e "s@^(PROTO_INCLUDE=')[^']+'@\1/usr/include'@" \ + -e '/^PROTOBUF_SUBMODULE_VERSION=/d' \ + protoc_lib_deps.py } python_configure_all() { diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest index 930ec826..692bae34 100644 --- a/dev-python/grpcio/Manifest +++ b/dev-python/grpcio/Manifest @@ -1 +1 @@ -DIST grpcio-1.62.0.tar.gz 26315723 BLAKE2B a49156538644f66af7a569c0a91eb48a5d15177a8aa7c4410c4f8ea54f18893f2ca6d10a522a73f4e4d8950372aa35e8bc909f062b89db0a40e8765cebd43a23 SHA512 cd54cf3c2d296faca2f7b4eb13385e407aa09be752234585cb71b53afd1bc48fd8aca01eac1a4e2583a0ef07a902b84c887413d6678210c5f38a91a13960e826 +DIST grpcio-1.66.1.tar.gz 12326405 BLAKE2B 06bd29d040952690c95a0bffae87fa3472e222af982872839dc451c4f1842b682d27794c6f5d309525004181b30ec974e7c7efb6735e1712aeae584f250891fd SHA512 64a358e894fce45766ee7d0b3ab8cdcc0d2176f31d5e1583ffa2a17f0becd9c4b78b48ada6da1cb463f9bdee4f82f0a7845d0a47009d600fa268b2f74089e657 diff --git a/dev-python/grpcio/files/1.62.0-cython3.patch b/dev-python/grpcio/files/1.62.0-cython3.patch deleted file mode 100644 index e734a7bd..00000000 --- a/dev-python/grpcio/files/1.62.0-cython3.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi ---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi 2024-03-05 18:46:12.903254598 +0800 -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi 2024-03-05 18:46:42.989252881 +0800 -@@ -48,7 +48,7 @@ - @staticmethod - cdef void functor_run( - grpc_completion_queue_functor* functor, -- int succeed) -+ int succeed) noexcept - - cdef grpc_completion_queue_functor *c_functor(self) - -diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi ---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi 2024-03-05 18:46:12.903254598 +0800 -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi 2024-03-05 18:47:00.094251906 +0800 -@@ -50,7 +50,7 @@ - @staticmethod - cdef void functor_run( - grpc_completion_queue_functor* functor, -- int success): -+ int success) noexcept: - cdef CallbackContext *context = <CallbackContext *>functor - cdef object waiter = <object>context.waiter - if not waiter.cancelled(): -diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi ---- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi 2024-03-05 18:46:12.903254598 +0800 -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi 2024-03-05 18:48:02.097248368 +0800 -@@ -316,7 +316,7 @@ - return credentials - - cdef grpc_ssl_certificate_config_reload_status _server_cert_config_fetcher_wrapper( -- void* user_data, grpc_ssl_server_certificate_config **config) with gil: -+ void* user_data, grpc_ssl_server_certificate_config **config) noexcept with gil: - # This is a credentials.ServerCertificateConfig - cdef ServerCertificateConfig cert_config = None - if not user_data: -diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi ---- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi 2024-03-05 18:46:12.902254598 +0800 -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi 2024-03-05 19:16:29.155150966 +0800 -@@ -12,10 +12,10 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --cdef void __prefork() nogil -+cdef void __prefork() noexcept nogil - - --cdef void __postfork_parent() nogil -+cdef void __postfork_parent() noexcept nogil - - --cdef void __postfork_child() nogil -\ No newline at end of file -+cdef void __postfork_child() noexcept nogil -\ No newline at end of file -diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi ---- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi 2024-03-05 18:46:12.903254598 +0800 -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi 2024-03-05 19:17:17.124148229 +0800 -@@ -35,7 +35,7 @@ - - _fork_handler_failed = False - --cdef void __prefork() nogil: -+cdef void __prefork() noexcept nogil: - with gil: - global _fork_handler_failed - _fork_handler_failed = False -@@ -49,14 +49,14 @@ - _fork_handler_failed = True - - --cdef void __postfork_parent() nogil: -+cdef void __postfork_parent() noexcept nogil: - with gil: - with _fork_state.fork_in_progress_condition: - _fork_state.fork_in_progress = False - _fork_state.fork_in_progress_condition.notify_all() - - --cdef void __postfork_child() nogil: -+cdef void __postfork_child() noexcept nogil: - with gil: - try: - if _fork_handler_failed: -diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi ---- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi 2024-03-05 18:46:12.903254598 +0800 -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi 2024-03-05 19:17:53.735146140 +0800 -@@ -13,16 +13,16 @@ - # limitations under the License. - - # TODO(https://github.com/grpc/grpc/issues/15662): Reform this. --cdef void* _copy_pointer(void* pointer): -+cdef void* _copy_pointer(void* pointer) noexcept: - return pointer - - - # TODO(https://github.com/grpc/grpc/issues/15662): Reform this. --cdef void _destroy_pointer(void* pointer): -+cdef void _destroy_pointer(void* pointer) noexcept: - pass - - --cdef int _compare_pointer(void* first_pointer, void* second_pointer): -+cdef int _compare_pointer(void* first_pointer, void* second_pointer) noexcept: - if first_pointer < second_pointer: - return -1 - elif first_pointer > second_pointer: diff --git a/dev-python/grpcio/grpcio-1.62.0.ebuild b/dev-python/grpcio/grpcio-1.66.1.ebuild index e0567c1b..58002b6a 100644 --- a/dev-python/grpcio/grpcio-1.62.0.ebuild +++ b/dev-python/grpcio/grpcio-1.66.1.ebuild @@ -1,42 +1,43 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 multiprocessing prefix pypi +inherit distutils-r1 flag-o-matic multiprocessing prefix pypi DESCRIPTION="High-performance RPC framework (python libraries)" HOMEPAGE="https://grpc.io" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="~amd64" RDEPEND=" - >=dev-libs/openssl-1.1.1:0=[-bindist(-)] - >=dev-libs/re2-0.2021.11.01:= - <dev-python/protobuf-python-5[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-4.21.3[${PYTHON_USEDEP}] + dev-libs/openssl:=[-bindist(-)] + dev-libs/re2:= + <dev-python/protobuf-python-6[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-5.26.1[${PYTHON_USEDEP}] net-dns/c-ares:= sys-libs/zlib:= " DEPEND="${RDEPEND}" BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" -PATCHES=( - "${FILESDIR}/1.62.0-cython3.patch" -) - python_prepare_all() { distutils-r1_python_prepare_all hprefixify setup.py } python_configure_all() { + # -Werror=odr -Werror=lto-type-mismatch + # https://bugs.gentoo.org/856775 + # https://github.com/grpc/grpc/issues/36158 + filter-lto + # os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True) export GRPC_BUILD_WITH_BORING_SSL_ASM= export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1 |