diff options
author | 2024-06-07 21:22:43 +0300 | |
---|---|---|
committer | 2024-06-07 21:22:43 +0300 | |
commit | 046c9fd54b15d55739316d6e3557febaad630b68 (patch) | |
tree | 4b998b74ac94a9ce8519239c5b2e03f5159d678f | |
parent | dev-perl/Net-Twitter: treeclean (diff) | |
download | gentoo-046c9fd54b15d55739316d6e3557febaad630b68.tar.gz gentoo-046c9fd54b15d55739316d6e3557febaad630b68.tar.bz2 gentoo-046c9fd54b15d55739316d6e3557febaad630b68.zip |
dev-python/grpcio*: treeclean
Closes: https://bugs.gentoo.org/904945
Bug: https://bugs.gentoo.org/906720
Bug: https://bugs.gentoo.org/929457
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
-rw-r--r-- | dev-python/grpcio-testing/Manifest | 1 | ||||
-rw-r--r-- | dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild | 24 | ||||
-rw-r--r-- | dev-python/grpcio-testing/metadata.xml | 9 | ||||
-rw-r--r-- | dev-python/grpcio-tools/Manifest | 1 | ||||
-rw-r--r-- | dev-python/grpcio-tools/grpcio-tools-1.51.0.ebuild | 36 | ||||
-rw-r--r-- | dev-python/grpcio-tools/metadata.xml | 9 | ||||
-rw-r--r-- | dev-python/grpcio/Manifest | 1 | ||||
-rw-r--r-- | dev-python/grpcio/files/1.51.0-cython3.patch | 150 | ||||
-rw-r--r-- | dev-python/grpcio/files/1.51.0-respect-cc.patch | 28 | ||||
-rw-r--r-- | dev-python/grpcio/grpcio-1.51.0-r1.ebuild | 55 | ||||
-rw-r--r-- | dev-python/grpcio/metadata.xml | 9 | ||||
-rw-r--r-- | profiles/package.mask | 8 |
12 files changed, 0 insertions, 331 deletions
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest deleted file mode 100644 index 254135ada0a6..000000000000 --- a/dev-python/grpcio-testing/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST grpcio-testing-1.51.0.tar.gz 22390 BLAKE2B 813ade1f3f44e3aeda7ca779f130897281036de111cb17f9297f267961a591e1fa3b88380ccbec42edd339487f1b3f1028dcd308c46ffd8fde5817e3909cfd41 SHA512 3fd9de9cd75aebcf1f6c3716bbacaf5cc9cc9aa74acb42dd128b5c158fa2d52549cdcc8f3ea9f2cb0b86d0b84c998acd55fa16e879ac9099a2348d889d35d837 diff --git a/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild deleted file mode 100644 index 7dd1d26fa299..000000000000 --- a/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild +++ /dev/null @@ -1,24 +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 -PYPI_NO_NORMALIZE=1 - -inherit distutils-r1 pypi - -DESCRIPTION="Testing utilities for gRPC Python" -HOMEPAGE="https://grpc.io" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - -RDEPEND=" - ~dev-python/grpcio-${PV}[${PYTHON_USEDEP}] - <dev-python/protobuf-python-5[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-4.21.3[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND}" diff --git a/dev-python/grpcio-testing/metadata.xml b/dev-python/grpcio-testing/metadata.xml deleted file mode 100644 index a0b62eae0c7a..000000000000 --- a/dev-python/grpcio-testing/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">grpc/grpc</remote-id> - <remote-id type="pypi">grpcio-testing</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest deleted file mode 100644 index f21c8b1d3670..000000000000 --- a/dev-python/grpcio-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST grpcio-tools-1.51.0.tar.gz 2254565 BLAKE2B 7486c7c62d691cb3cbaf02a68e73d6d94ee48396b26c4d46c22776396ba7d637c9b6738c00e19a99101e189e7092b2240adbf53ae9d32188dc813a9b0a49c25d SHA512 fa76fd970c399aed7639d6ce343834a5e7d76f2247cc99e59d0bf29844fb2f366bc9b8e2124d7c9dd9163953741c06015ded7f400b8e77d0cdad8ac291a7af83 diff --git a/dev-python/grpcio-tools/grpcio-tools-1.51.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.51.0.ebuild deleted file mode 100644 index 92eb5d244d7a..000000000000 --- a/dev-python/grpcio-tools/grpcio-tools-1.51.0.ebuild +++ /dev/null @@ -1,36 +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 -PYPI_NO_NORMALIZE=1 - -inherit distutils-r1 multiprocessing prefix pypi - -DESCRIPTION="Protobuf code generator for gRPC" -HOMEPAGE="https://grpc.io" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~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}] -" - -DEPEND="${RDEPEND}" - -python_prepare_all() { - distutils-r1_python_prepare_all - hprefixify setup.py -} - -python_configure_all() { - export GRPC_PYTHON_BUILD_WITH_CYTHON=1 - export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)" -} diff --git a/dev-python/grpcio-tools/metadata.xml b/dev-python/grpcio-tools/metadata.xml deleted file mode 100644 index 45243c46c8bf..000000000000 --- a/dev-python/grpcio-tools/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">grpc/grpc</remote-id> - <remote-id type="pypi">grpcio-tools</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest deleted file mode 100644 index 698e5d88b4e3..000000000000 --- a/dev-python/grpcio/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST grpcio-1.51.0.tar.gz 22142437 BLAKE2B 20acb52c89e41cd6e87ddb5554bcf79acc6fa18f4516c7be7a3fa1408ecb1e5800d6123bd7ac561093ca341344618de9701c3df75251e96cd9da5a3443568303 SHA512 3560e07df79143cb7a8a0a1f0dbaba2d164962ba712adf030a60654102bbd5ce6a08f88c133b81a3e471f1ec3d63de14f1b0567aa45bd641d958d3349ccef542 diff --git a/dev-python/grpcio/files/1.51.0-cython3.patch b/dev-python/grpcio/files/1.51.0-cython3.patch deleted file mode 100644 index 97e70e150455..000000000000 --- a/dev-python/grpcio/files/1.51.0-cython3.patch +++ /dev/null @@ -1,150 +0,0 @@ -https://bugs.gentoo.org/911370 -https://github.com/grpc/grpc/issues/33918#issuecomment-1703386656 -https://github.com/grpc/grpc/issues/33918#issuecomment-1788823585 -https://github.com/grpc/grpc/pull/34242 -https://src.fedoraproject.org/rpms/grpc/blob/8bf11b8c20d2c54dcf7b88777d7590237b6b0555/f/0001-Specify-noexcept-for-cdef-functions.patch - -From 45d31dba83999638808891ee7bf93638106bdb71 Mon Sep 17 00:00:00 2001 -From: Atri Bhattacharya <badshah400@gmail.com> -Date: Thu, 7 Sep 2023 07:06:56 +0200 -Subject: [PATCH] Specify noexcept for cdef functions. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -To build against cython 3.0, cdef functions that do not raise exceptions -need to be explicitly declared as noexcept. Fixes issue #33918. - -Co-Authored-By: Miro HronĨok <miro@hroncok.cz> ---- - .../grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi | 2 +- - .../grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi | 2 +- - .../grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi | 2 +- - .../grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi | 12 ++++++------ - .../grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi | 6 +++--- - .../grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi | 6 +++--- - 6 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi -index e54e510..26edbdb 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi -@@ -48,7 +48,7 @@ cdef class CallbackWrapper: - @staticmethod - cdef void functor_run( - grpc_completion_queue_functor* functor, -- int succeed) -+ int succeed) noexcept - - cdef grpc_completion_queue_functor *c_functor(self) - -diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi -index f2d94a9..5dda90a 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi -@@ -50,7 +50,7 @@ cdef class CallbackWrapper: - @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 --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi -index 23de3a0..52071f5 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi -@@ -314,7 +314,7 @@ def server_credentials_ssl_dynamic_cert_config(initial_cert_config, - 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 --git a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi -index a925bdd..5e97a6d 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi -@@ -15,15 +15,15 @@ - - cdef extern from "pthread.h" nogil: - int pthread_atfork( -- void (*prepare)() nogil, -- void (*parent)() nogil, -- void (*child)() nogil) -+ void (*prepare)() noexcept nogil, -+ void (*parent)() noexcept nogil, -+ void (*child)() noexcept nogil) noexcept - - --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 --git a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi -index 53657e8..d4d1cff 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi -@@ -34,7 +34,7 @@ _GRPC_ENABLE_FORK_SUPPORT = ( - - _fork_handler_failed = False - --cdef void __prefork() nogil: -+cdef void __prefork() noexcept nogil: - with gil: - global _fork_handler_failed - _fork_handler_failed = False -@@ -48,14 +48,14 @@ cdef void __prefork() nogil: - _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 --git a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi -index da4b81b..f594100 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi -@@ -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: --- -2.41.0 diff --git a/dev-python/grpcio/files/1.51.0-respect-cc.patch b/dev-python/grpcio/files/1.51.0-respect-cc.patch deleted file mode 100644 index 8a2c8313aa8f..000000000000 --- a/dev-python/grpcio/files/1.51.0-respect-cc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 209e9e0c21dd5bdf62d943dfd9caca40565734b5 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Mon, 28 Nov 2022 14:08:17 -0800 -Subject: [PATCH] respect CC variable - -https://github.com/grpc/grpc/pull/26480 -Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> ---- - src/python/grpcio/commands.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py -index 58ab57be47..6d8228ffa0 100644 ---- a/src/python/grpcio/commands.py -+++ b/src/python/grpcio/commands.py -@@ -228,7 +228,8 @@ class BuildExt(build_ext.build_ext): - """ - try: - # TODO(lidiz) Remove the generated a.out for success tests. -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++14', '-'], -+ cc = os.environ.get('CC', 'cc') -+ cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++14', '-'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) --- -2.38.1 - diff --git a/dev-python/grpcio/grpcio-1.51.0-r1.ebuild b/dev-python/grpcio/grpcio-1.51.0-r1.ebuild deleted file mode 100644 index d6ca281e1887..000000000000 --- a/dev-python/grpcio/grpcio-1.51.0-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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..11} ) - -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" - -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}] - net-dns/c-ares:= - sys-libs/zlib:= -" -DEPEND="${RDEPEND}" -BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/1.51.0-respect-cc.patch" - "${FILESDIR}/1.51.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 - export GRPC_PYTHON_BUILD_SYSTEM_CARES=1 - export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 - export GRPC_PYTHON_BUILD_WITH_SYSTEM_RE2=1 - export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 - export GRPC_PYTHON_BUILD_WITH_CYTHON=1 - export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)" -} diff --git a/dev-python/grpcio/metadata.xml b/dev-python/grpcio/metadata.xml deleted file mode 100644 index e29d9f9a4bd2..000000000000 --- a/dev-python/grpcio/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">grpc/grpc</remote-id> - <remote-id type="pypi">grpcio</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index c71908c1d87e..8182b59c1a82 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -289,14 +289,6 @@ media-libs/lastfmlib dev-python/dask dev-python/dask-expr -# Michał Górny <mgorny@gentoo.org> (2024-05-01) -# Unmaintained in Gentoo. Multiple releases behind upstream. No tests. -# No Python 3.12. No (unconditional) reverse dependencies. -# Removal on 2024-05-31. Bug #904945. -dev-python/grpcio -dev-python/grpcio-testing -dev-python/grpcio-tools - # Sam James <sam@gentoo.org> (2024-04-28) # Masked for testing. Tracker bug: bug #930805. >=sys-libs/ncurses-6.5 |