gentoo resync : 15.06.2021

7 files changed, 73 insertions, 79 deletions

diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 6b8cb0181eca..93a2faa03dba 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,8 +1,7 @@
-AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
-DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
+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.0.tar.gz 21391828 BLAKE2B efbbf42ad4e67a2c39369c47f345b2a823427341f3e535737d28ff4061941bc649bca179cab84ff5457bab2ccef49146fd2cf7daeb0cae7303e47f192f250feb SHA512 7def460f1a96df65b99fae8aa149428286002aecd14242f62885622fda1568f2d44fc69c3bea28cd1568e3eaa46f03b0fbfda2a9cee23e1e5dfb44ac99ffe597
-EBUILD grpcio-1.32.0-r1.ebuild 1206 BLAKE2B 9efb8a65a9330cb803fd72fb1002c20bbb05a4c650248eff3c869f2615695deeb8a4cf698cd3cc727708c4e4b40e947ea11c2f391c10fd2b91d6823125e96646 SHA512 2b109be98186b79a61c332bd39a1134a2b3e187f222cfc08c43f69271bb0310ffeaf9deeded15cd1627f1c14d797c8daee652d9823cf7a07bacd85ca1173b44c
-EBUILD grpcio-1.37.1.ebuild 1198 BLAKE2B a57a7c85950f94f79c1e7283263cb716dc26a808a32c1c0a590d6ff9c0009f0fa63e58b7531d9071bfd284108551ff8125ef0e0d2811b712ae428b67b0c55636 SHA512 00c382bec1f5b7b141ac68723de6ec2940b0f612ae26cb11c94013ba794968c67401c2365cd39c0e8c1767f8b008bf6833ca36846063287786b8b1711f28e20a
-EBUILD grpcio-1.38.0.ebuild 1198 BLAKE2B a57a7c85950f94f79c1e7283263cb716dc26a808a32c1c0a590d6ff9c0009f0fa63e58b7531d9071bfd284108551ff8125ef0e0d2811b712ae428b67b0c55636 SHA512 00c382bec1f5b7b141ac68723de6ec2940b0f612ae26cb11c94013ba794968c67401c2365cd39c0e8c1767f8b008bf6833ca36846063287786b8b1711f28e20a
+EBUILD grpcio-1.37.1.ebuild 1295 BLAKE2B d16eb9202cda977433192d63717b8620c2d809189dce02e89a992e773926ac0caba73a5c89dbdbea90820fa6f9703dcd4771805eda61b93c6b91cfdd8ebe9f50 SHA512 3806f7503dca762fd7ab9603e03dcb09bb4d8f061e167c478adb507d0d41cdd7a66241ba51dbc642be13feecd307a147935872c48f17dcc6e67c7eae71230730
+EBUILD grpcio-1.38.0.ebuild 1255 BLAKE2B a770a542184723b5108aaf6c4456a7c339a60209066652fcfd7b6ba2320d32058e1afaecab48fa61feab6465bccc9acf7842c7790d48d47fa44fe0e37772c749 SHA512 3bc75d5e2fbdad1b2c1e5d8e9749cff3e6952e095a7260c9792a17d42dea41cb19f14c62b8c4fc2835c52aee5b55aac9cb9cd271a3f75fc7674616f128eb4826
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch b/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
deleted file mode 100644
index c6729e9808b4..000000000000
--- a/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c8e7e1c3cd55bf44b6fad6afa716dec9de3bf14f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Fri, 25 Sep 2020 15:34:19 -0700
-Subject: [PATCH] setup.py: respect CC variable in latomic test
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 20a6d76..d1cd707 100644
---- a/setup.py
-+++ b/setup.py
-@@ -164,9 +164,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
- 
- def check_linker_need_libatomic():
-     """Test if linker on system needs libatomic."""
-+    cc = os.environ.get('CC', 'cc')
-     code_test = (b'#include <atomic>\n' +
-                  b'int main() { return std::atomic<int64_t>{}; }')
--    cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
-+    cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
-                                stdin=PIPE,
-                                stdout=PIPE,
-                                stderr=PIPE)
--- 
-2.28.0
-
diff --git a/dev-python/grpcio/files/1.37.1-cc-flag-test-fix.patch b/dev-python/grpcio/files/1.37.1-cc-flag-test-fix.patch
new file mode 100644
index 000000000000..0869c57dd113
--- /dev/null
+++ b/dev-python/grpcio/files/1.37.1-cc-flag-test-fix.patch
@@ -0,0 +1,26 @@
+From c21ddf679bf46c0a13046060f17d7a87608923e3 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Mon, 14 Jun 2021 19:38:37 -0700
+Subject: [PATCH] fix cc flag test
+
+---
+ 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 df8fc46..de71ea5 100644
+--- a/src/python/grpcio/commands.py
++++ b/src/python/grpcio/commands.py
+@@ -234,7 +234,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++11', '-'],
++                cc = os.environ.get('CC', 'cc')
++                cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++11', '-'],
+                                            stdin=subprocess.PIPE,
+                                            stdout=subprocess.PIPE,
+                                            stderr=subprocess.PIPE)
+-- 
+2.32.0
+
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
new file mode 100644
index 000000000000..71e02eafeb65
--- /dev/null
+++ b/dev-python/grpcio/files/1.37.1-cxx-no-gnu99.patch
@@ -0,0 +1,35 @@
+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.32.0-r1.ebuild b/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
deleted file mode 100644
index c9c963aa55e7..000000000000
--- a/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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-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.32.0-setup.py-respect-CC-variable-in-latomic-test.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_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.37.1.ebuild b/dev-python/grpcio/grpcio-1.37.1.ebuild
index 9a037a3b070e..4c178de93a22 100644
--- a/dev-python/grpcio/grpcio-1.37.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.37.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 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
@@ -27,6 +27,11 @@ RDEPEND="
 
 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
diff --git a/dev-python/grpcio/grpcio-1.38.0.ebuild b/dev-python/grpcio/grpcio-1.38.0.ebuild
index 9a037a3b070e..13d41c60bbc2 100644
--- a/dev-python/grpcio/grpcio-1.38.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.38.0.ebuild
@@ -27,6 +27,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/1.37.1-cc-flag-test-fix.patch" )
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 	hprefixify setup.py