Remove net-libs/grpc
The dependencies on the packages have
been removed. This CL removes the package
ebuild.
BUG=b/340935901
TEST=presubmit and validation tests
RELEASE_NOTE=Removed net-libs/grpc.
Change-Id: Ia99f741287a46d14df14ea6cb8751f1330a4836c
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/73594
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
deleted file mode 100644
index 2849fc3..0000000
--- a/net-libs/grpc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST grpc-1.16.1.tar.gz 14442310 SHA256 a5342629fe1b689eceb3be4d4f167b04c70a84b9d61cf8b555e968bc500bdb5a SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d WHIRLPOOL c6a191bb11c126179694557cc43e12bd053576f462df932da24709a57b3b88baa5d9e70cdfa698ac10dba0e7424719ecb69abd8ae15c90ff8bd80cc920ca4216
-DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
-DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902
-DIST grpc-1.41.1.tar.gz 8346512 BLAKE2B fbb453f7ab398ac843b19922b7e3f71121bc9ba44b3e0c558796dc519dbbc5d34e31d1059bfa7552fefdd7c05d5a8b03645f5c5257e73126ba14a73bec0b1fb1 SHA512 17d4c0867a51e33c029bcce86371f8e1d4680ba78fe4f02fb63b8614e9c5f7f6078c22b7c56c63c6ff461429a70d2ec87cb3c0d30c897a88321fe7f26de6e052
-DIST grpc-1.43.0.tar.gz 8540919 BLAKE2B dc78026129a5d23e864c92a210e8de845a4bad886071a76d527730108da155d290612f1e54cec15d69f55713f37f377e6bff844b16b5deef64c7d8bb31195652 SHA512 e0471aa355d311a40c9d29d7101bf8e22b89ac675d4914c38e617d3213b61107487ef20ca80d7cff8093b548f4a976526298e1f32959ae6ce3c088d45ecc9781
diff --git a/net-libs/grpc/OWNERS b/net-libs/grpc/OWNERS
deleted file mode 100644
index 524333e..0000000
--- a/net-libs/grpc/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-include chromiumos/overlays/portage-stable:/dev-libs/protobuf/OWNERS
diff --git a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
deleted file mode 100644
index 926952f..0000000
--- a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sat, 30 Jun 2018 00:21:53 -0700
-Subject: [PATCH] Makefile: fix host ar handling
-
-Cherry picked lines from
-https://github.com/grpc/grpc/pull/11476
----
- Makefile | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8333858588..b5a44b7096 100644
---- a/Makefile
-+++ b/Makefile
-@@ -328,6 +328,7 @@ HOST_CC ?= $(CC)
- HOST_CXX ?= $(CXX)
- HOST_LD ?= $(LD)
- HOST_LDXX ?= $(LDXX)
-+HOST_AR ?= $(AR)
-
- CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
- CXXFLAGS += -std=c++11
-@@ -444,6 +445,7 @@ HOST_CFLAGS = $(CFLAGS)
- HOST_CXXFLAGS = $(CXXFLAGS)
- HOST_LDFLAGS = $(LDFLAGS)
- HOST_LDLIBS = $(LDLIBS)
-+HOST_AROPTS = $(AROPTS)
-
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-@@ -6886,10 +6888,10 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
- else
-
- $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-- $(E) "[AR] Creating $@"
-+ $(E) "[HOSTAR] Creating $@"
- $(Q) mkdir -p `dirname $@`
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+ $(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
- ifeq ($(SYSTEM),Darwin)
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
- endif
---
-2.18.0
-
diff --git a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch
deleted file mode 100644
index d18063f..0000000
--- a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 40f602c0beeb09197507d280b150174e09300d7f Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:26:04 -0700
-Subject: [PATCH 5/5] grpc-1.3.0: Don't run ldconfig
-
-It doesn't make sense to run ldconfig for a staged install. Remove it.
----
- Makefile | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 86bd66a5e0..f4c2a5bcb9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2582,11 +2582,6 @@ else ifneq ($(SYSTEM),Darwin)
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so.3
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
-- $(Q) ldconfig || true
--endif
--endif
-
-
- install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
-@@ -2635,11 +2630,6 @@ else ifneq ($(SYSTEM),Darwin)
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
-- $(Q) ldconfig || true
--endif
--endif
-
-
- install-shared_csharp: shared_csharp strip-shared_csharp
-@@ -2652,11 +2642,6 @@ else ifneq ($(SYSTEM),Darwin)
- $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
-- $(Q) ldconfig || true
--endif
--endif
-
-
- install-plugins: $(PROTOC_PLUGINS)
---
-2.14.0.rc0.284.gd933b75aa4-goog
-
diff --git a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
deleted file mode 100644
index 257bef8..0000000
--- a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile 2018-05-28 17:59:34.631540261 +0800
-+++ b/Makefile 2018-05-28 18:01:31.266936000 +0800
-@@ -460,11 +460,11 @@
- CACHE_MK += HAS_PKG_CONFIG = true,
- endif
-
--CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
--CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
--CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
- ifeq ($(SYSTEM),MINGW32)
- EXECUTABLE_SUFFIX = .exe
diff --git a/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch b/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
deleted file mode 100644
index ba2ca65..0000000
--- a/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a443abbdbbd402951138bb8fcb2a4f159b920fcd Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 12 Sep 2018 11:22:48 -0700
-Subject: [PATCH] Fix cpp soname symlinks
-
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4e993782ee..09bd52e8ad 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3050,7 +3050,7 @@ install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-con
- ifeq ($(SYSTEM),MINGW32)
- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.a
- else ifneq ($(SYSTEM),Darwin)
-- $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.6
-+ $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so
- endif
- $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3059,7 +3059,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.a
- else ifneq ($(SYSTEM),Darwin)
-- $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.6
-+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so
- endif
- $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3068,7 +3068,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.a
- else ifneq ($(SYSTEM),Darwin)
-- $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.6
-+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so
- endif
- $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3077,7 +3077,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.a
- else ifneq ($(SYSTEM),Darwin)
-- $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.6
-+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so
- endif
- $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3086,7 +3086,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.a
- else ifneq ($(SYSTEM),Darwin)
-- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.6
-+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
- endif
- $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3095,7 +3095,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.a
- else ifneq ($(SYSTEM),Darwin)
-- $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.6
-+ $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.1
- $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so
- endif
- ifneq ($(SYSTEM),MINGW32)
---
-2.18.0
-
diff --git a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
deleted file mode 100644
index fd9f914..0000000
--- a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0892788776d60d92a0cddcd22078779166b736db Mon Sep 17 00:00:00 2001
-From: Dario Berzano <dario.berzano@cern.ch>
-Date: Thu, 5 Jul 2018 11:27:20 +0200
-Subject: [PATCH] Prevent shell calls longer than ARG_MAX
-
-This patch we breaks the relevant paths array into multiple shorter arrays in
-order to make the shell calls succeed.
-
-See grpc/grpc#14844.
----
- Makefile | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 54823a31167..25eb092d996 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2946,8 +2946,14 @@ install-headers_c:
-
- install-headers_cxx:
- $(E) "[INSTALL] Installing public C++ headers"
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-
- install-static: install-static_c install-static_cxx
-
-@@ -5278,6 +5284,8 @@ PUBLIC_HEADERS_CXX += \
- include/grpc++/support/stub_options.h \
- include/grpc++/support/sync_stream.h \
- include/grpc++/support/time.h \
-+
-+PUBLIC_HEADERS_CXX1 += \
- include/grpcpp/alarm.h \
- include/grpcpp/channel.h \
- include/grpcpp/client_context.h \
-@@ -5325,6 +5333,8 @@ PUBLIC_HEADERS_CXX += \
- include/grpcpp/support/stub_options.h \
- include/grpcpp/support/sync_stream.h \
- include/grpcpp/support/time.h \
-+
-+PUBLIC_HEADERS_CXX2 += \
- include/grpc/support/alloc.h \
- include/grpc/support/atm.h \
- include/grpc/support/atm_gcc_atomic.h \
-@@ -5376,6 +5386,8 @@ PUBLIC_HEADERS_CXX += \
- include/grpc/impl/codegen/propagation_bits.h \
- include/grpc/impl/codegen/slice.h \
- include/grpc/impl/codegen/status.h \
-+
-+PUBLIC_HEADERS_CXX3 += \
- include/grpc++/impl/codegen/async_stream.h \
- include/grpc++/impl/codegen/async_unary_call.h \
- include/grpc++/impl/codegen/byte_buffer.h \
-@@ -5406,6 +5418,8 @@ PUBLIC_HEADERS_CXX += \
- include/grpc++/impl/codegen/stub_options.h \
- include/grpc++/impl/codegen/sync_stream.h \
- include/grpc++/impl/codegen/time.h \
-+
-+PUBLIC_HEADERS_CXX4 += \
- include/grpcpp/impl/codegen/async_generic_service.h \
- include/grpcpp/impl/codegen/async_stream.h \
- include/grpcpp/impl/codegen/async_unary_call.h \
diff --git a/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch b/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch
deleted file mode 100644
index 0afd825..0000000
--- a/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 807a938a576ec52bc8c971100b2da26b059d9347 Mon Sep 17 00:00:00 2001
-From: Tobias Jungel <tobias.jungel@gmail.com>
-Date: Wed, 22 Aug 2018 21:14:46 +0200
-Subject: [PATCH 1/2] mitigate gcc8 -Werror=ignored-qualifiers
-
----
- src/core/ext/transport/chttp2/transport/flow_control.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
-index 53932bcb7f5..4b1862735d6 100644
---- a/src/core/ext/transport/chttp2/transport/flow_control.cc
-+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
-@@ -190,7 +190,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t,
- uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) {
- FlowControlTrace trace("t updt sent", this, nullptr);
- const uint32_t target_announced_window =
-- static_cast<const uint32_t>(target_window());
-+ static_cast<uint32_t>(target_window());
- if ((writing_anyway || announced_window_ <= target_announced_window / 2) &&
- announced_window_ != target_announced_window) {
- const uint32_t announce = static_cast<uint32_t> GPR_CLAMP(
-
-From 5a03e7f10145c6591f313055907a9cf26ccb9234 Mon Sep 17 00:00:00 2001
-From: Tobias Jungel <tobias.jungel@gmail.com>
-Date: Wed, 22 Aug 2018 21:17:01 +0200
-Subject: [PATCH 2/2] mitigate gcc8 -Werror=stringop-truncation
-
----
- .../client_channel/lb_policy/grpclb/load_balancer_api.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-index f24281a5bfb..8c064214729 100644
---- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-@@ -68,7 +68,8 @@ grpc_grpclb_request* grpc_grpclb_request_create(const char* lb_service_name) {
- req->has_initial_request = true;
- req->initial_request.has_name = true;
- strncpy(req->initial_request.name, lb_service_name,
-- GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH);
-+ GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH - 1);
-+ req->initial_request.name[GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH - 1] = '\0';
- return req;
- }
-
diff --git a/net-libs/grpc/files/grpc-1.16.1-Support-vsock.patch b/net-libs/grpc/files/grpc-1.16.1-Support-vsock.patch
deleted file mode 100644
index f7b779b..0000000
--- a/net-libs/grpc/files/grpc-1.16.1-Support-vsock.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 716cb35ab711efbd99a65c599b50f044e4912bd0 Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:22:59 -0700
-Subject: [PATCH 4/5] grpc-1.3.0: Support vsock
-
-Add support for vsock as a transport for client <-> server communication. Has
-not been sent upstream because upstream has not indicated whether they are
-interested in adding support for this transport. Also the patch in its current
-form is probably not upstream-able because it assumes that vsock is always
-available, which is definitely not the case for all the platforms that upstream
-supports.
-
-Rebased by: Allen Webb <allenwebb@google.com>
-Rebased on: 2018-12-28
-diff --git a/src/core/ext/filters/client_channel/parse_address.cc b/src/core/ext/filters/client_channel/parse_address.cc
-index 707beb8..9e83452 100644
---- a/src/core/ext/filters/client_channel/parse_address.cc
-+++ b/src/core/ext/filters/client_channel/parse_address.cc
-@@ -26,6 +26,8 @@
- #include <string.h>
- #ifdef GRPC_HAVE_UNIX_SOCKET
- #include <sys/un.h>
-+#include <sys/socket.h>
-+#include <linux/vm_sockets.h>
- #endif
-
- #include <grpc/support/alloc.h>
-@@ -54,6 +56,21 @@ bool grpc_parse_unix(const grpc_uri* uri,
- return true;
- }
-
-+bool grpc_parse_vsock(const grpc_uri* uri,
-+ grpc_resolved_address* resolved_addr) {
-+ memset(resolved_addr, 0, sizeof(grpc_resolved_address));
-+ struct sockaddr_vm *vm =
-+ reinterpret_cast<struct sockaddr_vm *>(resolved_addr->addr);
-+
-+ if (sscanf(uri->path, "%u:%u", &vm->svm_cid, &vm->svm_port) != 2) {
-+ return false;
-+ }
-+ vm->svm_family = AF_VSOCK;
-+
-+ resolved_addr->len = static_cast<socklen_t>(sizeof(*vm));
-+ return true;
-+}
-+
- #else /* GRPC_HAVE_UNIX_SOCKET */
-
- bool grpc_parse_unix(const grpc_uri* uri,
-@@ -200,6 +217,8 @@ bool grpc_parse_uri(const grpc_uri* uri, grpc_resolved_address* resolved_addr) {
- return grpc_parse_ipv4(uri, resolved_addr);
- } else if (strcmp("ipv6", uri->scheme) == 0) {
- return grpc_parse_ipv6(uri, resolved_addr);
-+ } else if (strcmp("vsock", uri->scheme) == 0) {
-+ return grpc_parse_vsock(uri, resolved_addr);
- }
- gpr_log(GPR_ERROR, "Can't parse scheme '%s'", uri->scheme);
- return false;
-diff --git a/src/core/ext/filters/client_channel/parse_address.h b/src/core/ext/filters/client_channel/parse_address.h
-index c2af0e6..7daab6a 100644
---- a/src/core/ext/filters/client_channel/parse_address.h
-+++ b/src/core/ext/filters/client_channel/parse_address.h
-@@ -30,6 +30,11 @@
- * unix socket path. Returns true upon success. */
- bool grpc_parse_unix(const grpc_uri* uri, grpc_resolved_address* resolved_addr);
-
-+/** Populate \a addr and \a len from \a uri, whose path is expected to contain a
-+ * vsock specification. Returns true upon success. */
-+bool grpc_parse_vsock(const grpc_uri* uri,
-+ grpc_resolved_address* resolved_addr);
-+
- /** Populate \a resolved_addr from \a uri, whose path is expected to contain an
- * IPv4 host:port pair. Returns true upon success. */
- bool grpc_parse_ipv4(const grpc_uri* uri, grpc_resolved_address* resolved_addr);
-diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc
-index c285d7e..cad143d 100644
---- a/src/core/lib/iomgr/resolve_address_posix.cc
-+++ b/src/core/lib/iomgr/resolve_address_posix.cc
-@@ -59,6 +59,11 @@ static grpc_error* posix_blocking_resolve_address(
- return grpc_resolve_unix_domain_address(name + 5, addresses);
- }
-
-+ if (name[0] == 'v' && name[1] == 's' && name[2] == 'o' && name[3] == 'c' &&
-+ name[4] == 'k' && name[5] == ':' && name[6] != 0) {
-+ return grpc_resolve_vsock_address(name + 6, addresses);
-+ }
-+
- /* parse name, splitting it into host and port parts */
- gpr_split_host_port(name, &host, &port);
- if (host == nullptr) {
-diff --git a/src/core/lib/iomgr/sockaddr_posix.h b/src/core/lib/iomgr/sockaddr_posix.h
-index 3cedd90..f12f52e 100644
---- a/src/core/lib/iomgr/sockaddr_posix.h
-+++ b/src/core/lib/iomgr/sockaddr_posix.h
-@@ -50,6 +50,8 @@ typedef struct in6_addr grpc_in6_addr;
-
- #define GRPC_AI_PASSIVE AI_PASSIVE
-
--#endif
-+#endif /* GRPC_POSIX_SOCKET_SOCKADDR */
-+
-+#include <linux/vm_sockets.h> // Needs to come after sys/socket.h
-
- #endif /* GRPC_CORE_LIB_IOMGR_SOCKADDR_POSIX_H */
-diff --git a/src/core/lib/iomgr/sockaddr_utils.cc b/src/core/lib/iomgr/sockaddr_utils.cc
-index 1b66dce..5b96a3e 100644
---- a/src/core/lib/iomgr/sockaddr_utils.cc
-+++ b/src/core/lib/iomgr/sockaddr_utils.cc
-@@ -222,7 +222,8 @@ char* grpc_sockaddr_to_uri(const grpc_resolved_address* resolved_addr) {
- resolved_addr = &addr_normalized;
- }
- const char* scheme = grpc_sockaddr_get_uri_scheme(resolved_addr);
-- if (scheme == nullptr || strcmp("unix", scheme) == 0) {
-+ if (scheme == nullptr || strcmp("unix", scheme) == 0 ||
-+ strcmp("vsock", scheme) == 0) {
- return grpc_sockaddr_to_uri_unix_if_possible(resolved_addr);
- }
- char* path = nullptr;
-@@ -247,6 +248,8 @@ const char* grpc_sockaddr_get_uri_scheme(
- return "ipv6";
- case GRPC_AF_UNIX:
- return "unix";
-+ case AF_VSOCK:
-+ return "vsock";
- }
- return nullptr;
- }
-@@ -265,6 +268,8 @@ int grpc_sockaddr_get_port(const grpc_resolved_address* resolved_addr) {
- return grpc_ntohs(((grpc_sockaddr_in*)addr)->sin_port);
- case GRPC_AF_INET6:
- return grpc_ntohs(((grpc_sockaddr_in6*)addr)->sin6_port);
-+ case AF_VSOCK:
-+ return (int)((struct sockaddr_vm *)addr)->svm_port;
- default:
- if (grpc_is_unix_socket(resolved_addr)) {
- return 1;
-@@ -290,6 +295,9 @@ int grpc_sockaddr_set_port(const grpc_resolved_address* resolved_addr,
- ((grpc_sockaddr_in6*)addr)->sin6_port =
- grpc_htons(static_cast<uint16_t>(port));
- return 1;
-+ case AF_VSOCK:
-+ ((struct sockaddr_vm *)addr)->svm_port = (unsigned int)port;
-+ return 1;
- default:
- gpr_log(GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_set_port",
- addr->sa_family);
-diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc
-index 22fcaf5..e62b9ef 100644
---- a/src/core/lib/iomgr/unix_sockets_posix.cc
-+++ b/src/core/lib/iomgr/unix_sockets_posix.cc
-@@ -23,6 +23,7 @@
-
- #include "src/core/lib/iomgr/sockaddr.h"
-
-+#include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-@@ -66,10 +67,33 @@ grpc_error* grpc_resolve_unix_domain_address(const char* name,
- return GRPC_ERROR_NONE;
- }
-
-+grpc_error* grpc_resolve_vsock_address(const char* name,
-+ grpc_resolved_addresses** addrs) {
-+ struct sockaddr_vm *vm;
-+ unsigned int cid;
-+ unsigned int port;
-+
-+ if (sscanf(name, "%u:%u", &cid, &port) != 2) {
-+ return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Failed to parse cid:port pair");
-+ }
-+
-+ *addrs = static_cast<grpc_resolved_addresses*>(
-+ gpr_malloc(sizeof(grpc_resolved_addresses)));
-+ (*addrs)->naddrs = 1;
-+ (*addrs)->addrs = static_cast<grpc_resolved_address*>(
-+ gpr_zalloc(sizeof(grpc_resolved_address)));
-+ vm = (struct sockaddr_vm *)(*addrs)->addrs->addr;
-+ vm->svm_family = AF_VSOCK;
-+ vm->svm_cid = cid;
-+ vm->svm_port = port;
-+ (*addrs)->addrs->len = sizeof(struct sockaddr_vm);
-+ return GRPC_ERROR_NONE;
-+}
-+
- int grpc_is_unix_socket(const grpc_resolved_address* resolved_addr) {
- const grpc_sockaddr* addr =
- reinterpret_cast<const grpc_sockaddr*>(resolved_addr->addr);
-- return addr->sa_family == AF_UNIX;
-+ return addr->sa_family == AF_UNIX || addr->sa_family == AF_VSOCK;
- }
-
- void grpc_unlink_if_unix_domain_socket(
-@@ -92,6 +116,13 @@ char* grpc_sockaddr_to_uri_unix_if_possible(
- const grpc_resolved_address* resolved_addr) {
- const grpc_sockaddr* addr =
- reinterpret_cast<const grpc_sockaddr*>(resolved_addr->addr);
-+ if (addr->sa_family == AF_VSOCK) {
-+ char *result;
-+ struct sockaddr_vm *vm = (struct sockaddr_vm*)addr;
-+ gpr_asprintf(&result, "vsock:%u:%u", vm->svm_cid, vm->svm_port);
-+ return result;
-+ }
-+
- if (addr->sa_family != AF_UNIX) {
- return nullptr;
- }
-diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h
-index 917d032..77b85ea 100644
---- a/src/core/lib/iomgr/unix_sockets_posix.h
-+++ b/src/core/lib/iomgr/unix_sockets_posix.h
-@@ -32,6 +32,9 @@ void grpc_create_socketpair_if_unix(int sv[2]);
- grpc_error* grpc_resolve_unix_domain_address(
- const char* name, grpc_resolved_addresses** addresses);
-
-+grpc_error* grpc_resolve_vsock_address(
-+ const char* name, grpc_resolved_addresses** addrs);
-+
- int grpc_is_unix_socket(const grpc_resolved_address* resolved_addr);
-
- void grpc_unlink_if_unix_domain_socket(
diff --git a/net-libs/grpc/files/grpc-1.16.1-backport-glibc-gettid-fix.patch b/net-libs/grpc/files/grpc-1.16.1-backport-glibc-gettid-fix.patch
deleted file mode 100644
index 2b3abc47..0000000
--- a/net-libs/grpc/files/grpc-1.16.1-backport-glibc-gettid-fix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From ef0fee9031417189b0cd25b608eb3cade3d37090 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 561276f0c2..8b597b4cf2 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 0acb225572..cd0b702b94 100644
---- a/src/core/lib/gpr/log_posix.cc
-+++ b/src/core/lib/gpr/log_posix.cc
-@@ -30,7 +30,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, ...) {
-@@ -85,7 +85,7 @@ void gpr_default_log(gpr_log_func_args* args) {
- char* prefix;
- gpr_asprintf(&prefix, "%s%s.%09d %7tu %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 06a382c556..371bd19aa8 100644
---- a/src/core/lib/iomgr/ev_epollex_linux.cc
-+++ b/src/core/lib/iomgr/ev_epollex_linux.cc
-@@ -1150,7 +1150,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.
-@@ -1170,7 +1170,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_polling_trace.enabled()) {
- gpr_log(GPR_INFO,
---
-2.30.1
-
diff --git a/net-libs/grpc/files/grpc-1.16.1-fix-cross-compilation.patch b/net-libs/grpc/files/grpc-1.16.1-fix-cross-compilation.patch
deleted file mode 100644
index 06f3750..0000000
--- a/net-libs/grpc/files/grpc-1.16.1-fix-cross-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b9e631dad111f725c1a4e8b69ff1960397a5cc22 Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:19:35 -0700
-Subject: [PATCH 2/5] grpc-1.3.0: Fix cross-compiling
-
-Cross-compiling was severely broken in the Makefile. Fix it.
-
-Sent upstream as https://github.com/grpc/grpc/pull/11476.
-diff --git a/Makefile b/Makefile
-index 520ccd4..1f8ec2e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -457,11 +457,11 @@ LDFLAGS += $(EXTRA_LDFLAGS)
- DEFINES += $(EXTRA_DEFINES)
- LDLIBS += $(EXTRA_LDLIBS)
-
--HOST_CPPFLAGS = $(CPPFLAGS)
--HOST_CFLAGS = $(CFLAGS)
--HOST_CXXFLAGS = $(CXXFLAGS)
--HOST_LDFLAGS = $(LDFLAGS)
--HOST_LDLIBS = $(LDLIBS)
-+HOST_CPPFLAGS = $(CPPFLAGS_NO_ARCH) -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
-+HOST_CFLAGS = -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
-+HOST_CXXFLAGS = -std=c++11 -Wnon-virtual-dtor
-+HOST_LDFLAGS = -g -fPIC -Llibs/$(CONFIG)
-+HOST_LDLIBS = -lprotoc
- HOST_AROPTS = $(AROPTS)
-
- # These are automatically computed variables.
diff --git a/net-libs/grpc/files/grpc-1.16.1-new-protobuf-decoder-fix.patch b/net-libs/grpc/files/grpc-1.16.1-new-protobuf-decoder-fix.patch
deleted file mode 100644
index 8e50fcb..0000000
--- a/net-libs/grpc/files/grpc-1.16.1-new-protobuf-decoder-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Modify proto_utils.h to work with protobuf >3.11.x
-
-Newer version of protobuf updated the SetTotalBytesLimit interface dropping one
-function input. The patch updates proto_utils.h to use a new interface signature
-when a protobuf >3.11.x is detected.
-
-diff --git a/include/grpcpp/impl/codegen/proto_utils.h b/include/grpcpp/impl/codegen/proto_utils.h
-index d9db6de..ede7381 100644
---- a/include/grpcpp/impl/codegen/proto_utils.h
-+++ b/include/grpcpp/impl/codegen/proto_utils.h
-@@ -83,7 +83,12 @@ Status GenericDeserialize(ByteBuffer* buffer, grpc::protobuf::Message* msg) {
- return reader.status();
- }
- ::grpc::protobuf::io::CodedInputStream decoder(&reader);
-- decoder.SetTotalBytesLimit(INT_MAX, INT_MAX);
-+ #if GOOGLE_PROTOBUF_VERSION >= 3002000
-+ decoder.SetTotalBytesLimit(INT_MAX);
-+ #else
-+ decoder.SetTotalBytesLimit(INT_MAX, INT_MAX);
-+ #endif
-+
- if (!msg->ParseFromCodedStream(&decoder)) {
- result = Status(StatusCode::INTERNAL, msg->InitializationErrorString());
- }
diff --git a/net-libs/grpc/files/grpc-1.16.1-string-contatenation.patch b/net-libs/grpc/files/grpc-1.16.1-string-contatenation.patch
deleted file mode 100644
index 70fe3a8..0000000
--- a/net-libs/grpc/files/grpc-1.16.1-string-contatenation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: cmtice@google.com
-Date: 15-Sep-2020
-
-Clang has a new warning, -Wstring-contatenation, which fails without this
-patch (crosbug/1128147).
-
-diff --git a/src/core/lib/debug/stats_data.cc b/src/core/lib/debug/stats_data.cc
-index f8c27db..567b341 100644
---- a/src/core/lib/debug/stats_data.cc
-+++ b/src/core/lib/debug/stats_data.cc
-@@ -280,8 +280,8 @@ const char* grpc_stats_histogram_doc[GRPC_STATS_HISTOGRAM_COUNT] = {
- "Number of streams whose payload was written per TCP write",
- "Number of streams terminated per TCP write",
- "Number of flow control updates written per TCP write",
-- "How many completion queues were checked looking for a CQ that had "
-- "requested the incoming call",
-+ ("How many completion queues were checked looking for a CQ that had "
-+ "requested the incoming call"),
- };
- const int grpc_stats_table_0[65] = {
- 0, 1, 2, 3, 4, 5, 7, 9, 11, 14,
diff --git a/net-libs/grpc/files/grpc-1.43.0-Add-a-VsockResolverFactory.patch b/net-libs/grpc/files/grpc-1.43.0-Add-a-VsockResolverFactory.patch
deleted file mode 100644
index 5937b5b..0000000
--- a/net-libs/grpc/files/grpc-1.43.0-Add-a-VsockResolverFactory.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From b7a24916a37462afd8279086a65c63235cc914ec Mon Sep 17 00:00:00 2001
-From: James Ye <jamesye@google.com>
-Date: Wed, 31 Aug 2022 17:11:10 +1000
-Subject: Add a VsockResolverFactory
-
-Prevents vsock addresses from being resolved over DNS.
----
- .../resolver/sockaddr/sockaddr_resolver.cc | 19 +++++++++++++++++++
- src/core/lib/address_utils/parse_address.h | 2 +-
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
-index 46efbb06b2..f99ac16c4d 100644
---- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
-+++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
-@@ -175,6 +175,23 @@ class UnixAbstractResolverFactory : public ResolverFactory {
- };
- #endif // GRPC_HAVE_UNIX_SOCKET
-
-+class VsockResolverFactory : public ResolverFactory {
-+ public:
-+ bool IsValidUri(const URI& uri) const override {
-+ return ParseUri(uri, grpc_parse_vsock, nullptr);
-+ }
-+
-+ OrphanablePtr<Resolver> CreateResolver(ResolverArgs args) const override {
-+ return CreateSockaddrResolver(std::move(args), grpc_parse_vsock);
-+ }
-+
-+ std::string GetDefaultAuthority(const URI& /*uri*/) const override {
-+ return "localhost";
-+ }
-+
-+ const char* scheme() const override { return "vsock"; }
-+};
-+
- } // namespace
-
- } // namespace grpc_core
-@@ -190,6 +207,8 @@ void grpc_resolver_sockaddr_init() {
- grpc_core::ResolverRegistry::Builder::RegisterResolverFactory(
- absl::make_unique<grpc_core::UnixAbstractResolverFactory>());
- #endif
-+ grpc_core::ResolverRegistry::Builder::RegisterResolverFactory(
-+ absl::make_unique<grpc_core::VsockResolverFactory>());
- }
-
- void grpc_resolver_sockaddr_shutdown() {}
-diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h
-index 50ca4c3f84..cd26a77a6d 100644
---- a/src/core/lib/address_utils/parse_address.h
-+++ b/src/core/lib/address_utils/parse_address.h
-@@ -40,7 +40,7 @@ bool grpc_parse_unix_abstract(const grpc_core::URI& uri,
-
- /** Populate \a addr and \a len from \a uri, whose path is expected to contain a
- * vsock specification. Returns true upon success. */
--bool grpc_parse_vsock(const grpc_core::URI* uri,
-+bool grpc_parse_vsock(const grpc_core::URI& uri,
- grpc_resolved_address* resolved_addr);
-
- /** Populate \a resolved_addr from \a uri, whose path is expected to contain an
---
diff --git a/net-libs/grpc/files/grpc-1.43.0-build-codegen.patch b/net-libs/grpc/files/grpc-1.43.0-build-codegen.patch
deleted file mode 100644
index ca6de7b..0000000
--- a/net-libs/grpc/files/grpc-1.43.0-build-codegen.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Apply BUILD_CODEGEN state to grpc_plugin_support
-
-grpc_plugin_support was being included unconditionally, but it depends on
-libprotoc which is not being installed outside of the SDK so only include it
-whenever BUILD_CODEGEN is enabled, to fix cross compilation.
-
-Author: Allen Webb <allenwebb@google.com>
-https://github.com/grpc/grpc/issues/29370
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f632f26fd2..a5cd5822c1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3784,7 +3784,7 @@ if(gRPC_INSTALL)
- )
- endif()
-
--
-+if (gRPC_BUILD_CODEGEN)
- add_library(grpc_plugin_support
- src/compiler/cpp_generator.cc
- src/compiler/csharp_generator.cc
-@@ -3850,6 +3850,7 @@ if(gRPC_INSTALL)
- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
- )
- endif()
-+endif() # if (gRPC_BUILD_CODEGEN)
-
-
- # grpcpp_channelz doesn't build with protobuf-lite
diff --git a/net-libs/grpc/files/grpc-1.43.0-support-vsock.patch b/net-libs/grpc/files/grpc-1.43.0-support-vsock.patch
deleted file mode 100644
index e3dfdd8..0000000
--- a/net-libs/grpc/files/grpc-1.43.0-support-vsock.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-From 716cb35ab711efbd99a65c599b50f044e4912bd0 Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:22:59 -0700
-Subject: [PATCH 4/5] grpc-1.3.0: Support vsock
-
-Add support for vsock as a transport for client <-> server communication. Has
-not been sent upstream because upstream has not indicated whether they are
-interested in adding support for this transport. Also the patch in its current
-form is probably not upstream-able because it assumes that vsock is always
-available, which is definitely not the case for all the platforms that upstream
-supports.
-
-Rebased by: Allen Webb <allenwebb@google.com>
-Rebased on: 2018-12-28 (1.16.1)
-Rebased again on: 2022-04-08 (1.43.0) and added grpc_is_virtual_socket to fix
- peer().
-diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc
-index c254d2eb19..5014d28a5c 100644
---- a/src/core/lib/address_utils/parse_address.cc
-+++ b/src/core/lib/address_utils/parse_address.cc
-@@ -24,6 +24,8 @@
- #include <string.h>
- #ifdef GRPC_HAVE_UNIX_SOCKET
- #include <sys/un.h>
-+#include <sys/socket.h>
-+#include <linux/vm_sockets.h>
- #endif
- #ifdef GRPC_POSIX_SOCKET
- #include <errno.h>
-@@ -79,6 +81,21 @@ bool grpc_parse_unix_abstract(const grpc_core::URI& uri,
- return true;
- }
-
-+bool grpc_parse_vsock(const grpc_core::URI& uri,
-+ grpc_resolved_address* resolved_addr) {
-+ memset(resolved_addr, 0, sizeof(grpc_resolved_address));
-+ struct sockaddr_vm *vm =
-+ reinterpret_cast<struct sockaddr_vm *>(resolved_addr->addr);
-+
-+ if (sscanf(uri.path().c_str(), "%u:%u", &vm->svm_cid, &vm->svm_port) != 2) {
-+ return false;
-+ }
-+ vm->svm_family = AF_VSOCK;
-+
-+ resolved_addr->len = static_cast<socklen_t>(sizeof(*vm));
-+ return true;
-+}
-+
- namespace grpc_core {
-
- grpc_error_handle UnixSockaddrPopulate(absl::string_view path,
-@@ -306,6 +323,9 @@ bool grpc_parse_uri(const grpc_core::URI& uri,
- if (uri.scheme() == "ipv6") {
- return grpc_parse_ipv6(uri, resolved_addr);
- }
-+ if (uri.scheme() == "vsock") {
-+ return grpc_parse_vsock(uri, resolved_addr);
-+ }
- gpr_log(GPR_ERROR, "Can't parse scheme '%s'", uri.scheme().c_str());
- return false;
- }
-diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h
-index 92409b7e81..50ca4c3f84 100644
---- a/src/core/lib/address_utils/parse_address.h
-+++ b/src/core/lib/address_utils/parse_address.h
-@@ -38,6 +38,11 @@ bool grpc_parse_unix(const grpc_core::URI& uri,
- bool grpc_parse_unix_abstract(const grpc_core::URI& uri,
- grpc_resolved_address* resolved_addr);
-
-+/** Populate \a addr and \a len from \a uri, whose path is expected to contain a
-+ * vsock specification. Returns true upon success. */
-+bool grpc_parse_vsock(const grpc_core::URI* uri,
-+ grpc_resolved_address* resolved_addr);
-+
- /** Populate \a resolved_addr from \a uri, whose path is expected to contain an
- * IPv4 host:port pair. Returns true upon success. */
- bool grpc_parse_ipv4(const grpc_core::URI& uri,
-diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc
-index 33afba1d72..223bac89a9 100644
---- a/src/core/lib/address_utils/sockaddr_utils.cc
-+++ b/src/core/lib/address_utils/sockaddr_utils.cc
-@@ -226,7 +226,8 @@ std::string grpc_sockaddr_to_uri(const grpc_resolved_address* resolved_addr) {
- resolved_addr = &addr_normalized;
- }
- const char* scheme = grpc_sockaddr_get_uri_scheme(resolved_addr);
-- if (scheme == nullptr || strcmp("unix", scheme) == 0) {
-+ if (scheme == nullptr || strcmp("unix", scheme) == 0 ||
-+ strcmp("vsock", scheme) == 0) {
- return grpc_sockaddr_to_uri_unix_if_possible(resolved_addr);
- }
- std::string path =
-@@ -249,6 +250,8 @@ const char* grpc_sockaddr_get_uri_scheme(
- return "ipv6";
- case GRPC_AF_UNIX:
- return "unix";
-+ case AF_VSOCK:
-+ return "vsock";
- }
- return nullptr;
- }
-@@ -269,6 +272,9 @@ int grpc_sockaddr_get_port(const grpc_resolved_address* resolved_addr) {
- case GRPC_AF_INET6:
- return grpc_ntohs(
- (reinterpret_cast<const grpc_sockaddr_in6*>(addr))->sin6_port);
-+ case AF_VSOCK:
-+ return static_cast<int>(
-+ (reinterpret_cast<const struct sockaddr_vm *>(addr))->svm_port);
- default:
- if (grpc_is_unix_socket(resolved_addr)) {
- return 1;
-@@ -292,6 +298,10 @@ int grpc_sockaddr_set_port(grpc_resolved_address* resolved_addr, int port) {
- (reinterpret_cast<grpc_sockaddr_in6*>(addr))->sin6_port =
- grpc_htons(static_cast<uint16_t>(port));
- return 1;
-+ case AF_VSOCK:
-+ (reinterpret_cast<struct sockaddr_vm *>(addr))->svm_port =
-+ static_cast<unsigned int>(port);
-+ return 1;
- default:
- gpr_log(GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_set_port",
- addr->sa_family);
-diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc
-index 1427cbda96..363de7a368 100644
---- a/src/core/lib/iomgr/resolve_address_posix.cc
-+++ b/src/core/lib/iomgr/resolve_address_posix.cc
-@@ -50,6 +50,11 @@ static grpc_error_handle posix_blocking_resolve_address(
- size_t i;
- grpc_error_handle err;
-
-+ if (name[0] == 'v' && name[1] == 's' && name[2] == 'o' && name[3] == 'c' &&
-+ name[4] == 'k' && name[5] == ':' && name[6] != 0) {
-+ return grpc_resolve_vsock_address(name + 6, addresses);
-+ }
-+
- std::string host;
- std::string port;
- /* parse name, splitting it into host and port parts */
-diff --git a/src/core/lib/iomgr/sockaddr_posix.h b/src/core/lib/iomgr/sockaddr_posix.h
-index 3cedd9082d..f12f52e4da 100644
---- a/src/core/lib/iomgr/sockaddr_posix.h
-+++ b/src/core/lib/iomgr/sockaddr_posix.h
-@@ -50,6 +50,8 @@ typedef struct in6_addr grpc_in6_addr;
-
- #define GRPC_AI_PASSIVE AI_PASSIVE
-
--#endif
-+#endif /* GRPC_POSIX_SOCKET_SOCKADDR */
-+
-+#include <linux/vm_sockets.h> // Needs to come after sys/socket.h
-
- #endif /* GRPC_CORE_LIB_IOMGR_SOCKADDR_POSIX_H */
-diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc
-index 580a1f2cff..dff1f738f9 100644
---- a/src/core/lib/iomgr/tcp_server_posix.cc
-+++ b/src/core/lib/iomgr/tcp_server_posix.cc
-@@ -228,7 +228,7 @@ static void on_read(void* arg, grpc_error_handle err) {
-
- /* For UNIX sockets, the accept call might not fill up the member sun_path
- * of sockaddr_un, so explicitly call getsockname to get it. */
-- if (grpc_is_unix_socket(&addr)) {
-+ if (!grpc_is_virtual_socket(&addr) && grpc_is_unix_socket(&addr)) {
- memset(&addr, 0, sizeof(addr));
- addr.len = static_cast<socklen_t>(sizeof(struct sockaddr_storage));
- if (getsockname(fd, reinterpret_cast<struct sockaddr*>(addr.addr),
-diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc
-index dada84a86b..e8a8eabbb2 100644
---- a/src/core/lib/iomgr/unix_sockets_posix.cc
-+++ b/src/core/lib/iomgr/unix_sockets_posix.cc
-@@ -21,6 +21,7 @@
-
- #ifdef GRPC_HAVE_UNIX_SOCKET
-
-+#include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-@@ -60,10 +61,39 @@ grpc_error_handle grpc_resolve_unix_abstract_domain_address(
- return grpc_core::UnixAbstractSockaddrPopulate(name, (*addresses)->addrs);
- }
-
-+grpc_error* grpc_resolve_vsock_address(const char* name,
-+ grpc_resolved_addresses** addrs) {
-+ struct sockaddr_vm *vm;
-+ unsigned int cid;
-+ unsigned int port;
-+
-+ if (sscanf(name, "%u:%u", &cid, &port) != 2) {
-+ return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Failed to parse cid:port pair");
-+ }
-+
-+ *addrs = static_cast<grpc_resolved_addresses*>(
-+ gpr_malloc(sizeof(grpc_resolved_addresses)));
-+ (*addrs)->naddrs = 1;
-+ (*addrs)->addrs = static_cast<grpc_resolved_address*>(
-+ gpr_zalloc(sizeof(grpc_resolved_address)));
-+ vm = (struct sockaddr_vm *)(*addrs)->addrs->addr;
-+ vm->svm_family = AF_VSOCK;
-+ vm->svm_cid = cid;
-+ vm->svm_port = port;
-+ (*addrs)->addrs->len = sizeof(struct sockaddr_vm);
-+ return GRPC_ERROR_NONE;
-+}
-+
- int grpc_is_unix_socket(const grpc_resolved_address* resolved_addr) {
- const grpc_sockaddr* addr =
- reinterpret_cast<const grpc_sockaddr*>(resolved_addr->addr);
-- return addr->sa_family == AF_UNIX;
-+ return addr->sa_family == AF_UNIX || addr->sa_family == AF_VSOCK;
-+}
-+
-+int grpc_is_virtual_socket(const grpc_resolved_address* resolved_addr) {
-+ const grpc_sockaddr* addr =
-+ reinterpret_cast<const grpc_sockaddr*>(resolved_addr->addr);
-+ return addr->sa_family == AF_VSOCK;
- }
-
- void grpc_unlink_if_unix_domain_socket(
-@@ -91,6 +121,13 @@ std::string grpc_sockaddr_to_uri_unix_if_possible(
- const grpc_resolved_address* resolved_addr) {
- const grpc_sockaddr* addr =
- reinterpret_cast<const grpc_sockaddr*>(resolved_addr->addr);
-+ if (addr->sa_family == AF_VSOCK) {
-+ char *result;
-+ struct sockaddr_vm *vm = (struct sockaddr_vm*)addr;
-+ gpr_asprintf(&result, "vsock:%u:%u", vm->svm_cid, vm->svm_port);
-+ return result;
-+ }
-+
- if (addr->sa_family != AF_UNIX) {
- return "";
- }
-diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h
-index 823dd83274..de4623ebe3 100644
---- a/src/core/lib/iomgr/unix_sockets_posix.h
-+++ b/src/core/lib/iomgr/unix_sockets_posix.h
-@@ -38,8 +38,13 @@ grpc_error_handle grpc_resolve_unix_domain_address(
- grpc_error_handle grpc_resolve_unix_abstract_domain_address(
- absl::string_view name, grpc_resolved_addresses** addresses);
-
-+grpc_error* grpc_resolve_vsock_address(
-+ const char* name, grpc_resolved_addresses** addrs);
-+
- int grpc_is_unix_socket(const grpc_resolved_address* resolved_addr);
-
-+int grpc_is_virtual_socket(const grpc_resolved_address* resolved_addr);
-+
- void grpc_unlink_if_unix_domain_socket(
- const grpc_resolved_address* resolved_addr);
diff --git a/net-libs/grpc/grpc-1.43.0-r5.ebuild b/net-libs/grpc/grpc-1.43.0-r5.ebuild
deleted file mode 120000
index 8ef5340..0000000
--- a/net-libs/grpc/grpc-1.43.0-r5.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-grpc-1.43.0.ebuild
\ No newline at end of file
diff --git a/net-libs/grpc/grpc-1.43.0.ebuild b/net-libs/grpc/grpc-1.43.0.ebuild
deleted file mode 100644
index 8464994..0000000
--- a/net-libs/grpc/grpc-1.43.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cros-fuzzer cros-sanitizers cmake
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
-SLOT="0/21.143"
-KEYWORDS="*"
-IUSE="cros_host doc examples test"
-
-# look for submodule versions in third_party dir
-RDEPEND="
- >=dev-cpp/abseil-cpp-20211102.0:=
- >=dev-libs/re2-0.2021.11.01:=
- >=dev-libs/openssl-1.1.1:0=[-bindist(-)]
- >=dev-libs/protobuf-3.18.1:=
- dev-libs/xxhash
- >=net-dns/c-ares-1.15.0:=
- !net-libs/grpc:1.16.1
- sys-libs/zlib:=
-"
-
-DEPEND="${RDEPEND}
- test? (
- dev-cpp/benchmark
- dev-cpp/gflags
- )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-support-vsock.patch"
- "${FILESDIR}/${P}-build-codegen.patch"
- "${FILESDIR}/${P}-Add-a-VsockResolverFactory.patch"
-)
-
-# requires sources of many google tools
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-soversion_check() {
- local core_sover cpp_sover
- # extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION "1.37")'
- core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt | sed '/.*\"\(.*\)\".*/ s//\1/')"
- cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt | sed '/.*\"\(.*\)\".*/ s//\1/')"
- # remove dots, e.g. 1.37 -> 137
- core_sover="${core_sover//./}"
- cpp_sover="${cpp_sover//./}"
- [[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
- [[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # un-hardcode libdir
- sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
- sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
-
- soversion_check
-}
-
-src_configure() {
- # Suppress "-Wnon-c-typedef-for-linkage warning, https://crbug.com/1055907
- append-flags "-Wno-non-c-typedef-for-linkage"
- if use_sanitizers; then
- # grpc ebuild need to disable some features for building with
- # sanitizers, https://crbug.com/1015125 .
- append-flags "-fno-sanitize=vptr"
- append-flags "-Wno-frame-larger-than="
- fi
-
- local mycmakeargs=(
- -DgRPC_INSTALL=ON
- -DgRPC_ABSL_PROVIDER=package
- -DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
- -DgRPC_CARES_PROVIDER=package
- -DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
- -DgRPC_INSTALL_LIBDIR="$(get_libdir)"
- -DgRPC_PROTOBUF_PROVIDER=package
- -DgRPC_RE2_PROVIDER=package
- -DgRPC_SSL_PROVIDER=package
- -DgRPC_ZLIB_PROVIDER=package
- -DgRPC_BUILD_TESTS=$(usex test)
- -DCMAKE_CXX_STANDARD=17
- $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
-
- )
-
- # ChromeOS: Disable protoc plugins if cross-compiling since protoc is not
- # available on the target.
- if ! use cros_host; then
- mycmakeargs+=(
- -DgRPC_BUILD_CODEGEN=OFF
- -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF
- -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF
- -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF
- -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF
- -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF
- -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF
- -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF
- )
- fi
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use examples; then
- find examples -name '.gitignore' -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use doc; then
- find doc -name '.gitignore' -delete || die
- local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
- fi
-
- einstalldocs
-}
diff --git a/net-libs/grpc/grpc.bashrc b/net-libs/grpc/grpc.bashrc
deleted file mode 100644
index b5d3ed9..0000000
--- a/net-libs/grpc/grpc.bashrc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017 The ChromiumOS Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# We only want plugins on the build machine.
-if [[ $(cros_target) != "cros_host" ]]; then
- grpc_mask="
- /usr/bin/*plugin
- "
- PKG_INSTALL_MASK+=" ${grpc_mask}"
- INSTALL_MASK+=" ${grpc_mask}"
- unset grpc_mask
-fi
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
deleted file mode 100644
index 3114df3..0000000
--- a/net-libs/grpc/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>perfinion@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
- <upstream>
- <remote-id type="cpe">cpe:/a:grpc:grpc</remote-id>
- <remote-id type="github">grpc/grpc</remote-id>
- </upstream>
-</pkgmetadata>
