4 files changed, 2 insertions, 90 deletions
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index e6c283c10e3b..f04f80b96a7c 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,7 +1,4 @@
 AUX 1.37.1-cc-flag-test-fix.patch 1053 BLAKE2B c2f6b0a506fc2d074e656db3081447b3a0521a2ed2bd14a19104b962e0ad45b0068116384403eaf199d2bb8027b4a260dfaa7ed274974ad0bb6ca56b9ad19e8b SHA512 72dc39d549a008d137db29aa446ab7fc0add575103e941a969bed0124ce3b285f27edc31ca06db71b2dd3232c77c280755de3d3ef257792ead0516122f0a9b3f
-AUX 1.37.1-cxx-no-gnu99.patch 1366 BLAKE2B f8dc0d4cbcf5868d74c168dc1103a4b89d3a330470c67f835572697ab9d03ac1d9d89f3268186181fe395877d2f7842cdc7cef8bcceffb719553cd8206ddf5a5 SHA512 c93a54f30e87a51ec161639e6e89d59367c0b9afdf404004050b7e950f640acb5eeba05473e2e7893bd222487a9369bdf65b739fb3919317bece5f140599edfd
-DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
 DIST grpcio-1.38.1.tar.gz 21392075 BLAKE2B 92f1ad9e119fe346bc1f8f10ffe7067fb736c975ecd276eb8ab37a3b25d0a818fff76cec164db5745ac157ba7b94b841c6e66bb332d9f3b2c08974cab415a973 SHA512 c4f831ee654eec78f01c099fa5a6d9dc7e9551b1db5e5c89e3b8bd4e5c3bae622aee32cac9212bb60bc1baec98e4a49f8e18c0043bc90d1144729dee337072f9
-EBUILD grpcio-1.37.1-r1.ebuild 1298 BLAKE2B ef7cf673b021ded68d29c46f506d76cee781bd62ff03aabb8dbd03488c810032ea1369418bbd2800439642eebd2e327e5a7cf2153631aaef64497ca4a7bce4ac SHA512 28bddf5c20d4902166dc68c944f26699cfb85045bc3a7ee700486d2c1d6b55543d0383ee48ce188232529b3364048bafcee65f49ce313de767e2b496839ebafb
-EBUILD grpcio-1.38.1.ebuild 1264 BLAKE2B ce658058c785aa5884656bd733916856010f36afa686c8ac3cc1d2dabf1216f4cf2f6b329ad67901ab59be1df5bc14588eb3569ca16fced565230a49124e31f5 SHA512 ad684f3e6d53413584d0defd55033cfc18c9045f4aacdfcae145d39b5ab6affed2546c25dfd21ed4a476dc3f325e1bbb4560054bac058692d2b5d93f1da37f14
+EBUILD grpcio-1.38.1.ebuild 1263 BLAKE2B 41c0a00756aa4354a5cba8fb3da44c2a4073b0b4325d5fd188186dbda0050e0d8bb0b16e321827b1421f6d687490c7ea923add840397c2bafde291c1c961dc21 SHA512 8ad606a485f52a6e9dc6f3916538e08dc4fe548cbecfcd4d8ecec91bff6d3181eca381b02d373211fbd24d9d51abe314a79c6adaa86e2843ffdaf57e9a6d18ed
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/1.37.1-cxx-no-gnu99.patch b/dev-python/grpcio/files/1.37.1-cxx-no-gnu99.patch
deleted file mode 100644
index 71e02eafeb65..000000000000
--- a/dev-python/grpcio/files/1.37.1-cxx-no-gnu99.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 05ae3c5a87ba1037bd4c7a94e6b574c8df847065 Mon Sep 17 00:00:00 2001
-From: Lidi Zheng <lidiz@google.com>
-Date: Tue, 6 Apr 2021 06:50:40 -0700
-Subject: [PATCH] Remove -std=gnu99 CFlag when compiling C++ with clang
- (#25778)
-
-* Remove -std=gnu99 CFlag when compiling C++ with clang
-
-* Use endswith instead of hard-coded slices
-
-* Fix a typo
----
- src/python/grpcio/commands.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
-index f4a3d2bdc041..df8fc46a3cad 100644
---- a/src/python/grpcio/commands.py
-+++ b/src/python/grpcio/commands.py
-@@ -258,10 +258,14 @@ def compiler_ok_with_extra_std():
-             old_compile = self.compiler._compile
- 
-             def new_compile(obj, src, ext, cc_args, extra_postargs, pp_opts):
--                if src[-2:] == '.c':
-+                if src.endswith('.c'):
-                     extra_postargs = [
-                         arg for arg in extra_postargs if not '-std=c++' in arg
-                     ]
-+                elif src.endswith('.cc') or src.endswith('.cpp'):
-+                    extra_postargs = [
-+                        arg for arg in extra_postargs if not '-std=gnu99' in arg
-+                    ]
-                 return old_compile(obj, src, ext, cc_args, extra_postargs,
-                                    pp_opts)
- 
diff --git a/dev-python/grpcio/grpcio-1.37.1-r1.ebuild b/dev-python/grpcio/grpcio-1.37.1-r1.ebuild
deleted file mode 100644
index 4a41d63de85e..000000000000
--- a/dev-python/grpcio/grpcio-1.37.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 multiprocessing prefix
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]
-	>=dev-libs/re2-0.2021.04.01:=
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.37.1-cxx-no-gnu99.patch"
-	"${FILESDIR}/1.37.1-cc-flag-test-fix.patch"
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	hprefixify setup.py
-}
-
-python_configure_all() {
-	# 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/grpcio-1.38.1.ebuild b/dev-python/grpcio/grpcio-1.38.1.ebuild
index 1d79bf9a0481..97c8b8152736 100644
--- a/dev-python/grpcio/grpcio-1.38.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.38.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]