gentoo resync : 02.06.2019

9 files changed, 190 insertions, 22 deletions

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 3d8f951e6182..6f829083fd70 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -8,6 +8,7 @@ AUX 0006-grpc-1.12.1-allow-system-openssl.patch 2691 BLAKE2B 078ff854f90f5dea0b5
 AUX 0007-grpc-1.12.1-allow-system-zlib.patch 2069 BLAKE2B 60b70714eca54ba0befffd36409dc4cb3983393f478e54dc1922bf7acbbe8122a2a7b76003842952a9d693a04adf84d1f6b7243a7034d181a0084620fdfec587 SHA512 22c4bcd909ad19989e72f8063b7b44f8f63d58119a19a92661734ba2bf0c4150b2e870fae45c4bf8c6411e1ca32e8bf713536c3f60d98763210231a0ac4fedde
 AUX 0008-grpc-1.12.1-allow-system-cares.patch 2049 BLAKE2B 4f7e352f3efca21cbc918bf0a8510589c1f9a3b0ede344c83223cebfced42a65e5e3f2c5bebd1cf88d96dbc4d7f738f94b4484cfd23d5ebb1ff74a3370584d75 SHA512 3efffca62048d89430720237c8b51e82b2d2f02c067849d3a6506013b9c4fbda92037a70e3ff66e117465653ecb2a1db0d00857b6325c768ee1d2b122a44d26a
 AUX 0009-grpc-1.12.1-gcc8-fixes.patch 2420 BLAKE2B 05a0e92f38e877bfc2160d44aec598a67247dbd064efd03cea660444ecb3afe3095e2b7c1c67b2e83423762ad1580636039e27004fe34c8ff0c3bdc9862a3c54 SHA512 dfdafec8efc8fc0f4bbcdcbb036fb7ee746c917c8dfe18338dbd20be40efe8e1b3fe77c6f66f0b050f6d078aaff81a78477980b63ad81288cae474af8c723420
+AUX 1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
 AUX grpc-1.14.2-gcc8-fixes.patch 4258 BLAKE2B 211847b5f493076ecdc13eef9567f5f088dfb1f0e1b7c61b69b6daeaeafa638262aea525063ac5a4612e12cb378d1231d30eb1ed86d781b6ee43b20d4fb68353 SHA512 20279e231042fa01ad0dffbfd731e2ea17d9ff4240a21204f672f88a4dca7302f1e8a4f4dbffbb4a5c2d321f47f735ef0411a2e2a44472494b518741a044ac4f
 AUX grpc-1.15.0-fix-cpp-so-version.patch 4772 BLAKE2B 96efd477c385c7a4714025081288576f8ef4fbba691257e3638e85b850c20b1db9a72de6fb9f85a8b6b3f4f990dd4456ada838ce6ccd01d4bb5043071926eec9 SHA512 49c5da5883a6e8aac6d37fb1920b6b8af23ec9f45c1dd9c337e1a9455adb1eded0ed3763003818ab261fd367e38b705af0dd409d01b97060b1e5020228acef2c
 AUX grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch 3039 BLAKE2B 1da27e75874229261115b174b168e0b478add3c844c58e81a84bf74b699447310decda09e0cad89056a3f5d7fcc8d0bb1835889438ee8efab89471c66a77b69a SHA512 a6f59a3b518310c6150439fba5ad058048540f0f84152406f607873248e3e0d95cc0077b634164f4bdf391427c847614dd88e2ddac9feded0aa23044ea58c051
@@ -23,6 +24,7 @@ DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c
 DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
 DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7 SHA512 6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
+DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD grpc-1.12.0.ebuild 1533 BLAKE2B 8b5808b767a779c2e9d5baf53ba27e76ea78aa8433acf1b5c3254db134efbf82c0166963e9182111b1bd6dafdab8b7f6c66066e20676bf208aedb4b1286143e1 SHA512 2beaf3a5f7309fb756d3c90fa8444337fcea15ed7cc65adbce7951602a96e9d29d9389b540c5d92e6d4ef209b25b99b76328a52de7aef36b6c543bed10506017
@@ -31,9 +33,10 @@ EBUILD grpc-1.13.0-r1.ebuild 4367 BLAKE2B 60db5fa5681f2574b54b52fd06832f43f9de29
 EBUILD grpc-1.13.1.ebuild 4380 BLAKE2B 6fc9c25ff651bab7903c3550b3c3eaf6c8dab361273d9fe8480abe874b6d46d9315973dafefe054b92bc900f4fc9a6fde783f23277b05b2cbc895995078385aa SHA512 250bd2fe515d305d4c093deca0c22f8e81b63ee2bf3c86dc3b8b83ff1ee65b99856ef1aa035e9ab6a5802ecb86657c61256727c36491a2c5a3c1c446fb354a76
 EBUILD grpc-1.14.2.ebuild 4483 BLAKE2B 74abe8b6c1686a92faa257379fa7085ad13bd6222557a3ac7701503a82f19d82bf87a1dc9a01a2f825d2a87de42e6bf3ec333ea2feb381a373ce7aa904a4d4b5 SHA512 f4353999761d8c438f2a4fc9618aa12e214bd01799722c252d4bfcc4f63bd4f914979dba8f62ffe2ef34277ef6495e363b6a10af6123d6f45ba339a25926fdbb
 EBUILD grpc-1.15.0.ebuild 4478 BLAKE2B b27a529156dca8385d57bdb38076d0292e1409aa2e328a008fa15b2cbae20172e4baeec06fe978d736fc8c29549c8172ccf1d01167ba2f376802e246c8db91b6 SHA512 8eb8cd1e05c7ba06b06879221cf598546143e5c510322cc66abce42d502a214fd81f98c81d2031fda04404d3b4dcacbed32603cdb138fcd3e3b7f1c017b539a2
-EBUILD grpc-1.16.1.ebuild 2337 BLAKE2B ad5315e38f4f176a621de8eb1c792d4f6735d9ff078fb3516e0569e11b83f2e916340905dfd59754c45ceecbca4924464711cf94aa38bdc91ff587fa4c2658c9 SHA512 05e321adbe059e17882d35692760576d745476b872f3fa7859e364d7cb8a88488fa7adcca3183059b552f7fc8aca926d2a64fe1c2f85a285a46fe69e0010a1c9
-EBUILD grpc-1.17.1.ebuild 2361 BLAKE2B e05151676e946f5f4681799144db2610c6dca6c359abfa49bd29a02e059a79cd40e2b17810539c74d9ee26a4333654b1a237f5848b34008a296a28a6def14dd2 SHA512 8cc37a22dd53ee250c6c5f468d799373b8136df4e5e64232ba7337e37202bcd23be6cf51b0133618a3c8699b82c619a52d8ef44427f3a104cc7302ce18467998
-EBUILD grpc-1.18.0.ebuild 2361 BLAKE2B e05151676e946f5f4681799144db2610c6dca6c359abfa49bd29a02e059a79cd40e2b17810539c74d9ee26a4333654b1a237f5848b34008a296a28a6def14dd2 SHA512 8cc37a22dd53ee250c6c5f468d799373b8136df4e5e64232ba7337e37202bcd23be6cf51b0133618a3c8699b82c619a52d8ef44427f3a104cc7302ce18467998
-EBUILD grpc-1.19.0.ebuild 2328 BLAKE2B 24b0230a3ba17bbeff1504a27c1c0c01706cd7cc9c3f0660f411d7b57ba100fbf0c0bad8728c90836b4637abd007c68bce14b4f084df343e5a362754702deb07 SHA512 d638a76e179b729822d77b22f7653b68104c0c7b1a86568b3872675bf8926e6780833b2c2bd46c95208bc76f2fa5f3bfb7caa336b05a8737a4fb7f322c205be9
-EBUILD grpc-1.20.1.ebuild 2337 BLAKE2B 565cbec7ca067173e1296eb962dc6ac740df29ab23023c8340e88f4256c212b963d6bc7c33ad041f4ea1f55253d7e81eba9ae293184b3afbff8e249a9f1c101e SHA512 3199e0710cc18c73938d00a224435b9829c4c54be6a8d5e9303fe4b3245c5590f6dddfbd5abf7deb2dd92f7982ced0a99215acdc2aa10bb145a5b7262f514700
-MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
+EBUILD grpc-1.16.1.ebuild 2420 BLAKE2B ffe4395b757612ff3f7aefd0ec1f88a39fd4b41dba202ac255897847601d3884a1ca8041d973b4cc16bc0e6dcd7f98c98e9c45699d31fa3b31bebbf1d65e4911 SHA512 ee73eb435828c9ec466efb8da1ee3585dd97b8b05df9c55173b192683b7e263d06743446ce1897d71f8905d4dbd280a078ad4acc949d05962af8a53884158ad1
+EBUILD grpc-1.17.1.ebuild 2444 BLAKE2B bdd53da589d3bc782d30084c550f1a862d04e47e78d2b36758f7044a1f6c4e4171457ba75db79b4e2d263e1482889fe2c7fbb251bcf2bca5324d03e4461e2c3c SHA512 6060b94f74e4ca5cdcd4b2a756ec860ca6557b7fdc3e8aa726d29cbd3f4104e4d7b258888d3036b60e19022512843a8f3db8619405344cac4b967996bacf7e57
+EBUILD grpc-1.18.0.ebuild 2444 BLAKE2B bdd53da589d3bc782d30084c550f1a862d04e47e78d2b36758f7044a1f6c4e4171457ba75db79b4e2d263e1482889fe2c7fbb251bcf2bca5324d03e4461e2c3c SHA512 6060b94f74e4ca5cdcd4b2a756ec860ca6557b7fdc3e8aa726d29cbd3f4104e4d7b258888d3036b60e19022512843a8f3db8619405344cac4b967996bacf7e57
+EBUILD grpc-1.19.0.ebuild 2411 BLAKE2B 07dcdddf9de213e4a6304e25baaad18c55d0661bb2e7b280fb8e171b7fafcfa45fb156734ac3303c94c8cb9535bcefa0e67040016b0002adbafb578a905f5660 SHA512 11118c9854af50b3bda038388bf9174066c625a781bc8dc5f22a07f4d604fbc54537fbf65a4cacb8816e65800707f9290251e7421d0d7e783ff4018bd9e9c70d
+EBUILD grpc-1.20.1-r1.ebuild 2428 BLAKE2B 58420dd83cd4561dec2b1f22643c3fc77ce0cca3f6f47f7636029fa6a914df907206437618e44cca09733a5778f2247a8bcb103da66d794f53de7b22ea274cb4 SHA512 ca6357220aabc017a7bd2b0a22f8731c1a85967d7e4cb35e2390f5e9954771be26d254f96da474d213a1e2c3942a1dfe43f12a45cd544df746c2812444bb454d
+EBUILD grpc-1.21.1-r1.ebuild 2510 BLAKE2B 4682ad4a7b103c7a102cd9ad73d85331400b7216c572c8bf121001c5ccd0c32ab2e6c2f7c09e5245eb8c69011e55b3fc59b1d05e908e4a0a17af7b342705d3b1 SHA512 1cb0f897bf2d888e97df9208b9c30b6ceef08b29f08090457e65d903a810ca7ac09431e20835b722d84758bbdcd537437277504e492f05aef6d63fdf75ff3eb7
+MISC metadata.xml 738 BLAKE2B cff2b1998bc69661baad2d711e3f6b333b641c8ce287cafe4db88f8582b4a73082aee86d35bb8ed575941f813451af032d9e9aa4654984f344bc357817cce3b6 SHA512 acc602accf74b98f978a3cab6b46f70c4730718c49a7dd7869687c899b2b0f72eb70dd90f783151ba1bf0f44ed9de028cead4c1ddcc6051509a04d38a50df4fb
diff --git a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
new file mode 100644
index 000000000000..213a39a38438
--- /dev/null
+++ b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
@@ -0,0 +1,47 @@
+From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 22 May 2019 23:04:28 -0700
+Subject: [PATCH] Makefile: fix host ar handling
+
+picked lines from
+https://github.com/grpc/grpc/pull/11476
+---
+ Makefile | 236 ++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 119 insertions(+), 117 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 67495f2..e1c741c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -346,6 +346,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
+@@ -483,6 +484,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.
+
+@@ -7381,11 +7383,11 @@ $(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 $@"
++$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
++	$(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
diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
index 07af07cc1f53..f04778edda6d 100644
--- a/net-libs/grpc/grpc-1.16.1.ebuild
+++ b/net-libs/grpc/grpc-1.16.1.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	dev-libs/protobuf:=
-	dev-util/google-perftools
 	net-dns/c-ares:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -64,7 +64,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
index bbdf4092a7c5..2774a877762b 100644
--- a/net-libs/grpc/grpc-1.17.1.ebuild
+++ b/net-libs/grpc/grpc-1.17.1.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	dev-libs/protobuf:=
-	dev-util/google-perftools
 	net-dns/c-ares:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -68,7 +68,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
index bbdf4092a7c5..2774a877762b 100644
--- a/net-libs/grpc/grpc-1.18.0.ebuild
+++ b/net-libs/grpc/grpc-1.18.0.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	dev-libs/protobuf:=
-	dev-util/google-perftools
 	net-dns/c-ares:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -68,7 +68,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild
index dbbfa3954380..d944be59c386 100644
--- a/net-libs/grpc/grpc-1.19.0.ebuild
+++ b/net-libs/grpc/grpc-1.19.0.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	dev-libs/protobuf:=
-	dev-util/google-perftools
 	net-dns/c-ares:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -66,7 +66,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.20.1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild
index c17b91e18436..f34a772f7781 100644
--- a/net-libs/grpc/grpc-1.20.1.ebuild
+++ b/net-libs/grpc/grpc-1.20.1-r1.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	dev-util/google-perftools
+	>=dev-libs/protobuf-3.7.0:=
 	>=net-dns/c-ares-1.15.0:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -66,7 +66,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild
new file mode 100644
index 000000000000..f90bab18e1c5
--- /dev/null
+++ b/net-libs/grpc/grpc-1.21.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.7.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	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
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 5a11d0f4a2d3..3a3bfdc3d72d 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -12,6 +12,7 @@
 		A high performance, open-source universal RPC framework
 	</longdescription>
 	<use>
+		<flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="tools">Install gRPC python tools</flag>
 	</use>