gentoo resync : 18.08.2019

4 files changed, 126 insertions, 3 deletions

diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 46dc39e96143..00305d9ff352 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,15 +1,18 @@
+AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
 DIST grpcio-1.16.1.tar.gz 14514047 BLAKE2B e4fc7f196f3e377afb0a103aca60337dd63b3b0f84846e7e2a4622a0102d4300782f08367e1429e1fd021dd90b151f17dd927a25a749f35724c7d2a41a6943a6 SHA512 efd7fb36a61e2ee872c0807a8198cabe8f1f9003bd5bce7cd46c75541752c0f745db02bbfe3f37f572531e15df60913f2b08b678545f176fe683f3e64e22124f
 DIST grpcio-1.17.1.tar.gz 14563233 BLAKE2B 61ccfaa967ee348f02f5a201e4f36f25d4fa09a1af11c6b5a0f345d13bf86f0fb12c3aea125c5bc27925698e0a23a9592806fe5db92fa37360cdcaf88e596189 SHA512 bf8dc6b7ce2f4a0765377fbae085395caef9f0cd0a2b4a779b3bf1667c6aba5fff034168bff9539f96dea76b2c97d7586305715c850d10e54918337458a4ee95
 DIST grpcio-1.18.0.tar.gz 14601124 BLAKE2B 4dc57243759c573b960e841def6af335f490fc6aa285f88979b4c66365b104a84269688c589ed7ae797527b04124a9997937f5bf33b179978077b2b680e515f5 SHA512 da791a418e0f6f3a7be921e107586837edcd2020dc8dab1107712372ebd4896b6b94e00d7501ed957e4ab0d5f7d6a3f2b57477ff33c55eb5e4ad7828b2f21624
 DIST grpcio-1.19.0.tar.gz 14621509 BLAKE2B b756ba60d317baa089b8ee57c458bc68fb72e61a87150f1ef3366fea23456ca8d5bd443ba1579d1bef5d0049f249fc8c2c6e7c7cc0967eb58c102fb03d783103 SHA512 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
 DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255d055f32f5947191fcb5fd45cca9c97aa3f8c4966e7195add5289ba3747a77b2f0c01a35762ffbeba6938c76046d SHA512 0ac126d8b2c25204bb03daccfc9b17016bc18dd31f89f6e208f2ae39d7e6fd17ae04a8178367a5334421d959b14fd3d31ac71a692b48a060d98f983553fcc3e2
 DIST grpcio-1.21.1.tar.gz 13919484 BLAKE2B dcad98da8db4aa588facc30d1b010ec1e4d5f8085751422277631329f1c4949ba3e2c3882829354025a845992ba9972df1c48a277df93caef9015969f9423aef SHA512 0ea20490ce5e776a6253d4b89dd9d9091afb7462d6bd6bd9d2d3329979d61360a3e31abbd043b90d0908512cf7ff2668bb21cb472fbf0ad5a3b5963073850dd7
-DIST grpcio-1.22.0.tar.gz 13925872 BLAKE2B 96cb2244e6fe11c628349b21026906336981d51661474f4e871ad33125cd183255cd9eb2de2eca9af00f80ddd1989dde80e60cdbe5bc833225980c63e12c92fc SHA512 912672209e2192fadaef79fe6cd79575d386e54ca0362f43e8e7138ca1f3673ea6a55f884257e9fb1780bae78664816675279a7f5ee799cc5d25ae43287729b1
+DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4bf6fae42b163f2ae04e01c4b323c4d7c2a5380ccdbab14f9a6986c86fae4948bc827a97c189f915bc24738fc426 SHA512 5392041a021b0523fc7a615070ea0f907fc960cb69ffba1e7fcdf0aa8e498cb33f567d9eec795dc06662f558884dcabcc17a1ae4a26fcaa479b0a43c08e8b913
+DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
 EBUILD grpcio-1.16.1.ebuild 921 BLAKE2B b6299a97f90c14a8fd60c148cbe6449a8025b391c69a7f3a9fa1201e06317a687982c873437b270ddceaa5470d5077cc840cc931c65a6e7cb442ad7342f75c8d SHA512 70b3fd83bc2bbbbd2e1cfd93624a5f6a18e2a126165ec5d2d1d946e5f77a672ecf2a2ddcc3f21e29d14e0d3e65e97edb89f98034b0b81644adf516ff3ae48259
 EBUILD grpcio-1.17.1.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.18.0.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.19.0.ebuild 1097 BLAKE2B d9eec593595d99eecc5ca5e127f1ab24b015715bfd76b19013788c793aea428732daddcd6458889142a1ec542cc82bbdcf1f74d6b0f158faf4a4722efedf5d36 SHA512 353cad322f66ea4dd434f8c26b29220b5911a66e53228b6f87b34fbb6fa143e9f13dd78be15b9e1aa60b912837e73c7e0554a015c6c788cd8421b416962a9b7f
 EBUILD grpcio-1.20.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
 EBUILD grpcio-1.21.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
-EBUILD grpcio-1.22.0.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
+EBUILD grpcio-1.22.1.ebuild 1160 BLAKE2B 0b6a41225f2177c211b218a9f21120369adca0f373384069ec08ab60c6c9e338121309ba6ec813b4fdc67a81da3f6242546f556491bc37ef67a67674b245b1e7 SHA512 8372b6fefaf920796dcdf1888f70ade08f15e823166ab197e77db2e09c9596597d6fc7f35404edef51e5c67360014d4467e6ddba32434c431fa93ae41c24e9e4
+EBUILD grpcio-1.23.0.ebuild 1160 BLAKE2B 0b6a41225f2177c211b218a9f21120369adca0f373384069ec08ab60c6c9e338121309ba6ec813b4fdc67a81da3f6242546f556491bc37ef67a67674b245b1e7 SHA512 8372b6fefaf920796dcdf1888f70ade08f15e823166ab197e77db2e09c9596597d6fc7f35404edef51e5c67360014d4467e6ddba32434c431fa93ae41c24e9e4
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch b/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
new file mode 100644
index 000000000000..90bd9115893f
--- /dev/null
+++ b/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
@@ -0,0 +1,78 @@
+From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson <benjamin@dropbox.com>
+Date: Fri, 3 May 2019 08:11:00 -0700
+Subject: [PATCH] Rename gettid() functions.
+
+glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
+---
+ src/core/lib/gpr/log_linux.cc          | 4 ++--
+ src/core/lib/gpr/log_posix.cc          | 4 ++--
+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 561276f0c20..8b597b4cf2f 100644
+--- a/src/core/lib/gpr/log_linux.cc
++++ b/src/core/lib/gpr/log_linux.cc
+@@ -40,7 +40,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ 
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
+   struct tm tm;
+   static __thread long tid = 0;
+-  if (tid == 0) tid = gettid();
++  if (tid == 0) tid = sys_gettid();
+ 
+   timer = static_cast<time_t>(now.tv_sec);
+   final_slash = strrchr(args->file, '/');
+diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
+index b6edc14ab6b..2f7c6ce3760 100644
+--- a/src/core/lib/gpr/log_posix.cc
++++ b/src/core/lib/gpr/log_posix.cc
+@@ -31,7 +31,7 @@
+ #include <string.h>
+ #include <time.h>
+ 
+-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
+ 
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   char* prefix;
+   gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
+                gpr_log_severity_string(args->severity), time_buffer,
+-               (int)(now.tv_nsec), gettid(), display_file, args->line);
++               (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
+ 
+   fprintf(stderr, "%-70s %s\n", prefix, args->message);
+   gpr_free(prefix);
+diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
+index 08116b3ab53..76f59844312 100644
+--- a/src/core/lib/iomgr/ev_epollex_linux.cc
++++ b/src/core/lib/iomgr/ev_epollex_linux.cc
+@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
+ }
+ 
+ #ifndef NDEBUG
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ #endif
+ 
+ /* pollset->mu lock must be held by the caller before calling this.
+@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
+ #define WORKER_PTR (&worker)
+ #endif
+ #ifndef NDEBUG
+-  WORKER_PTR->originator = gettid();
++  WORKER_PTR->originator = sys_gettid();
+ #endif
+   if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+     gpr_log(GPR_INFO,
diff --git a/dev-python/grpcio/grpcio-1.22.0.ebuild b/dev-python/grpcio/grpcio-1.22.1.ebuild
index 095bde11b67c..cdd2bdd1ec3e 100644
--- a/dev-python/grpcio/grpcio-1.22.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.22.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
 	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
+
 python_configure_all() {
 	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
 	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
diff --git a/dev-python/grpcio/grpcio-1.23.0.ebuild b/dev-python/grpcio/grpcio-1.23.0.ebuild
new file mode 100644
index 000000000000..cdd2bdd1ec3e
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.23.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+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 ~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:=
+	!<net-libs/grpc-1.16.0[python]
+	sys-libs/zlib:=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
+
+python_configure_all() {
+	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)"
+}