From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- net-libs/grpc/Manifest | 16 --- .../files/grpc-1.13.0-fix-host-ar-handling.patch | 47 --------- .../files/grpc-1.15.0-fix-cpp-so-version.patch | 70 ------------- ...0-Prevent-shell-calls-longer-than-ARG_MAX.patch | 70 ------------- net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch | 46 --------- net-libs/grpc/grpc-1.16.1.ebuild | 103 ------------------- net-libs/grpc/grpc-1.17.1.ebuild | 107 -------------------- net-libs/grpc/grpc-1.18.0.ebuild | 107 -------------------- net-libs/grpc/grpc-1.19.0.ebuild | 105 ------------------- net-libs/grpc/grpc-1.20.1-r1.ebuild | 105 ------------------- net-libs/grpc/grpc-1.21.1-r1.ebuild | 112 --------------------- 11 files changed, 888 deletions(-) delete mode 100644 net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch delete mode 100644 net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch delete mode 100644 net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch delete mode 100644 net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch delete mode 100644 net-libs/grpc/grpc-1.16.1.ebuild delete mode 100644 net-libs/grpc/grpc-1.17.1.ebuild delete mode 100644 net-libs/grpc/grpc-1.18.0.ebuild delete mode 100644 net-libs/grpc/grpc-1.19.0.ebuild delete mode 100644 net-libs/grpc/grpc-1.20.1-r1.ebuild delete mode 100644 net-libs/grpc/grpc-1.21.1-r1.ebuild (limited to 'net-libs/grpc') diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index eb0758897b5e..7dae621b57b7 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,30 +1,14 @@ AUX grpc-1.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5 -AUX grpc-1.13.0-fix-host-ar-handling.patch 1654 BLAKE2B cb4172a31dbec91667661c1bbe4830a5485816f649f48637706de22502efc3f8d328a414e141b35c83b2b1f70b0b383d5e44caea8fc1de764d47671c064b8520 SHA512 67cd7832669b067e4acb85c01e46e9710a3e65523d84b5f932baed77c20c4bcf270bed77dd842610b7e0ceb36dbaa729912bd84e9496e172325714d9a55bc499 -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 -AUX grpc-1.16.0-gcc8-fixes.patch 2323 BLAKE2B ef938aee88c894314313749e070e443462005a0add69abf463e93f7d414360135d399dea3f7cbb282150f1e03a6e2df33ad9965327392aed32d76c2875f976c3 SHA512 ad46c4187604212d628004cc783a69d95e4378e83e2673fd99265f2929a000429a269abdb98936ad5611fe9d99df581ff5f122f51661227d13d9e7145ee0a40c AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493 AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5 AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e AUX grpc-1.25.0-pkgconfig-libdir.patch 2199 BLAKE2B 4625e03eeeab9235fa1615bdfc485a5a0f0304ce4613b3f0ec0d0edf0d12d04d48a34fd30e680ff48bc1a7a7838d1b1b51ce58921a20472b5be0ad60dbce23e2 SHA512 93077a0cd6fd48694238b42fc60c2c986232ff863b09d068aac3f813733de5a7b4d3ac32929ad4e58e93e2990d5903cdf0b7491a0ea924402262d04b75fdb57a AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be -DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d -DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e -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 grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b9e56f8012795000c30f20fa4d5c1bad37d117cf8ea54fb372b8b02702a866c027c6e0a467f276a752ee9d17c6 SHA512 086ceb7a4fc1439bd23a2cab8c90ba2542491d5a9c278a0ff6e1b3ad623cf7725b2a7310bb793d9b36882bd9394d02a3616331ac26c78d822e68b305c2ae27f6 DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0 DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61 DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb -EBUILD grpc-1.16.1.ebuild 2405 BLAKE2B 1f3e8e9383fcb1f4eb371abde99377f653aeac44dba6e268dcf760b3e2cf20015d08965f9a8b3a2ed1fc31626326239634977d6ecfea893b9e2ca5de2e2d6034 SHA512 695ea5cbd96bb1b49cd562677911d43cfdc78f9ca95240b9103e09f8027f75eb1effbf755adb0487f8a833cbd41d4b1c0ec2de31fe9069be049198b9c526c2d0 -EBUILD grpc-1.17.1.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04 -EBUILD grpc-1.18.0.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04 -EBUILD grpc-1.19.0.ebuild 2396 BLAKE2B 4a63200218f221390ec05f50699768c68110a460ae43d1b4122924a1c3ce1f16c0fdd0864592c45d423395cc5d4541692202aa05ea3341747eaea1cf5eb3ee2e SHA512 76dfe9ccb26eafcfa67fecf81d155fd35ccf390b46fa756a0475f3929c200d8a3e98af7e12d99f598f9a966505365194f6facb5cf38969d38dde307cb23e80f9 -EBUILD grpc-1.20.1-r1.ebuild 2413 BLAKE2B 283f25fd00b590bcf935841f3f8ebbb3d955dc7041e303b8ac45d9b9415bb2792e21086e6f8ea214498224f50b0f6aefc9dad75a3a8bba14fc502c1432f2e120 SHA512 8c43c88a01143466e5cdb11b224da94b544becf0d7b73e247554b371445a1fd8462af9889d7fe343a508e4a4cc2560828ebea02ca03b4c4781fcddd6a4401c96 -EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056356a8da4218a7c82489525563caa5b660ac23d4a7b45b35648d7d6c0d8cc3a1d36454c2595fbd294802115ca61 SHA512 e162969923aa7c9e9ef27ce35b22a57d93f1cea297b4b4fe4667a912cbf9a953738da5beb223e36c041648ee809e3073e26b41a37b0242179cdc61fa0bf1e64e EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4 EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0 diff --git a/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch deleted file mode 100644 index 926952f47f2a..000000000000 --- a/net-libs/grpc/files/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 -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/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 ba2ca651f0c3..000000000000 --- 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 -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 fd9f91419542..000000000000 --- 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 -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 0afd8254dec0..000000000000 --- 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 -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(target_window()); -+ static_cast(target_window()); - if ((writing_anyway || announced_window_ <= target_announced_window / 2) && - announced_window_ != target_announced_window) { - const uint32_t announce = static_cast GPR_CLAMP( - -From 5a03e7f10145c6591f313055907a9cf26ccb9234 Mon Sep 17 00:00:00 2001 -From: Tobias Jungel -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/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild deleted file mode 100644 index 6ab28ceba67a..000000000000 --- a/net-libs/grpc/grpc-1.16.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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" - -RDEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - dev-libs/protobuf:= - net-dns/c-ares:= - sys-libs/zlib:= - perftools? ( dev-util/google-perftools:= ) - systemtap? ( dev-util/systemtap ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" - "${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch" - "${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch" - "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" - default -} - -src_compile() { - tc-export CC CXX PKG_CONFIG - - emake \ - 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_CC="$(tc-getBUILD_CC)" \ - HOST_CXX="$(tc-getBUILD_CXX)" \ - HOST_LD="$(tc-getBUILD_CC)" \ - HOST_LDXX="$(tc-getBUILD_CXX)" \ - HOST_AR="$(tc-getBUILD_AR)" \ - HAS_SYSTEMTAP="$(usex systemtap true false)" \ - HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" -} - -src_install() { - emake \ - prefix="${ED}"/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - STRIP=/bin/true \ - 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 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/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild deleted file mode 100644 index a5959280313b..000000000000 --- a/net-libs/grpc/grpc-1.17.1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# 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" - -RDEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - dev-libs/protobuf:= - net-dns/c-ares:= - sys-libs/zlib:= - perftools? ( dev-util/google-perftools:= ) - systemtap? ( dev-util/systemtap ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -# requires network -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" - "${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch" - "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - 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 - - emake \ - 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_CC="$(tc-getBUILD_CC)" \ - HOST_CXX="$(tc-getBUILD_CXX)" \ - HOST_LD="$(tc-getBUILD_CC)" \ - HOST_LDXX="$(tc-getBUILD_CXX)" \ - HOST_AR="$(tc-getBUILD_AR)" \ - HAS_SYSTEMTAP="$(usex systemtap true false)" \ - HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" -} - -src_install() { - emake \ - prefix="${ED}"/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - STRIP=/bin/true \ - 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 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/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild deleted file mode 100644 index a5959280313b..000000000000 --- a/net-libs/grpc/grpc-1.18.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# 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" - -RDEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - dev-libs/protobuf:= - net-dns/c-ares:= - sys-libs/zlib:= - perftools? ( dev-util/google-perftools:= ) - systemtap? ( dev-util/systemtap ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -# requires network -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" - "${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch" - "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - 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 - - emake \ - 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_CC="$(tc-getBUILD_CC)" \ - HOST_CXX="$(tc-getBUILD_CXX)" \ - HOST_LD="$(tc-getBUILD_CC)" \ - HOST_LDXX="$(tc-getBUILD_CXX)" \ - HOST_AR="$(tc-getBUILD_AR)" \ - HAS_SYSTEMTAP="$(usex systemtap true false)" \ - HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" -} - -src_install() { - emake \ - prefix="${ED}"/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - STRIP=/bin/true \ - 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 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/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild deleted file mode 100644 index a0877fb616b1..000000000000 --- a/net-libs/grpc/grpc-1.19.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# 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" - -RDEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - dev-libs/protobuf:= - net-dns/c-ares:= - sys-libs/zlib:= - perftools? ( dev-util/google-perftools:= ) - systemtap? ( dev-util/systemtap ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -# requires network -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/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() { - 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 - - emake \ - 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_CC="$(tc-getBUILD_CC)" \ - HOST_CXX="$(tc-getBUILD_CXX)" \ - HOST_LD="$(tc-getBUILD_CC)" \ - HOST_LDXX="$(tc-getBUILD_CXX)" \ - HOST_AR="$(tc-getBUILD_AR)" \ - HAS_SYSTEMTAP="$(usex systemtap true false)" \ - HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" -} - -src_install() { - emake \ - prefix="${ED}"/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - STRIP=/bin/true \ - 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/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild deleted file mode 100644 index d8c812cd259b..000000000000 --- a/net-libs/grpc/grpc-1.20.1-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# 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" - -RDEPEND=" - >=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 ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -# requires network -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/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() { - 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 - - emake \ - 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_CC="$(tc-getBUILD_CC)" \ - HOST_CXX="$(tc-getBUILD_CXX)" \ - HOST_LD="$(tc-getBUILD_CC)" \ - HOST_LDXX="$(tc-getBUILD_CXX)" \ - HOST_AR="$(tc-getBUILD_AR)" \ - HAS_SYSTEMTAP="$(usex systemtap true false)" \ - HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" -} - -src_install() { - emake \ - prefix="${ED}"/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - STRIP=/bin/true \ - 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/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild deleted file mode 100644 index bf11250c29cb..000000000000 --- a/net-libs/grpc/grpc-1.21.1-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# 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}/grpc-1.21.0-fix-host-ar-handling.patch" - "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/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 - -} -- cgit v1.2.3