summaryrefslogtreecommitdiff
path: root/net-libs/grpc
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/grpc')
-rw-r--r--net-libs/grpc/Manifest48
-rw-r--r--net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch58
-rw-r--r--net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch38
-rw-r--r--net-libs/grpc/files/0004-grpc-1.11.0-fix-cpp-so-version.patch49
-rw-r--r--net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch65
-rw-r--r--net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch52
-rw-r--r--net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch52
-rw-r--r--net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch53
-rw-r--r--net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch (renamed from net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch)0
-rw-r--r--net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch (renamed from net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch)0
-rw-r--r--net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch83
-rw-r--r--net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch (renamed from net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch)0
-rw-r--r--net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch (renamed from net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch)0
-rw-r--r--net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch (renamed from net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch)0
-rw-r--r--net-libs/grpc/grpc-1.12.0.ebuild66
-rw-r--r--net-libs/grpc/grpc-1.12.1-r1.ebuild162
-rw-r--r--net-libs/grpc/grpc-1.13.0-r1.ebuild173
-rw-r--r--net-libs/grpc/grpc-1.13.1.ebuild172
-rw-r--r--net-libs/grpc/grpc-1.14.2.ebuild173
-rw-r--r--net-libs/grpc/grpc-1.15.0.ebuild173
-rw-r--r--net-libs/grpc/grpc-1.16.1.ebuild6
-rw-r--r--net-libs/grpc/grpc-1.17.1.ebuild6
-rw-r--r--net-libs/grpc/grpc-1.18.0.ebuild6
-rw-r--r--net-libs/grpc/grpc-1.19.0.ebuild6
-rw-r--r--net-libs/grpc/grpc-1.20.1-r1.ebuild6
-rw-r--r--net-libs/grpc/grpc-1.21.1-r1.ebuild6
-rw-r--r--net-libs/grpc/grpc-1.22.0.ebuild8
-rw-r--r--net-libs/grpc/metadata.xml1
28 files changed, 35 insertions, 1427 deletions
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 97fbf6db2a2b..3474c9b84881 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,25 +1,11 @@
-AUX 0001-grpc-1.11.0-Fix-cross-compiling.patch 2178 BLAKE2B 2f3cb67581ccc276c17033a29795c58a83ce7786ce233bbd26a6ed16b8efaaad0f164e855ce82f0512c76fbe7326643805eca924c5559a82b36f6e849a614c5e SHA512 02a4c07c7d4556d7d2ff448c1a6a02fdf41dbeabcaa1d62103bbbf8198a891f26bf54d3bb921d6b2c0966d577c0b54dee0052f555493f499d7ed6aa680b7b113
-AUX 0001-grpc-1.13.0-fix-host-ar-handling.patch 1654 BLAKE2B cb4172a31dbec91667661c1bbe4830a5485816f649f48637706de22502efc3f8d328a414e141b35c83b2b1f70b0b383d5e44caea8fc1de764d47671c064b8520 SHA512 67cd7832669b067e4acb85c01e46e9710a3e65523d84b5f932baed77c20c4bcf270bed77dd842610b7e0ceb36dbaa729912bd84e9496e172325714d9a55bc499
-AUX 0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch 1227 BLAKE2B 2791f596cc2e9feb633807171647be1785fd62243b323b6412d85eb8c6a3e964118fecadf93dabb6e9f41d6c778b970445737fc9176fa7631d3b875ca094f227 SHA512 377708ee7385b5c00a3b71f89b482c7488efbcad42854f255df9e20206c2940a9c3b6ff934a95ffe683d6eb605eb30d99782ec3a93d85e5240c08f1ef5729ca2
-AUX 0003-grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
-AUX 0004-grpc-1.11.0-fix-cpp-so-version.patch 3700 BLAKE2B 4d198daaff28d5a69b52594fb3d430e7013c15623e4becd1f0fe402a30d48da191b2920b650da5d84a09a16b136049b66678b5a6aad3963bb6bd2d4f2866b900 SHA512 484e535bcf3d18b780e0ae7b3ab82c23cac3d296af215876f73a07b869fad68e484a3de1a006cbdf4ee302582970b47c08aa4a0b34f59442509134316b6b3f82
-AUX 0005-grpc-1.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5
-AUX 0006-grpc-1.12.1-allow-system-openssl.patch 2691 BLAKE2B 078ff854f90f5dea0b5866f387b6bb6f6582aba95bc262208229434a245a46a5082ad84290cf93901aa2bdee8169df3d4df52c667d5b670ae4df9a5898f1b31a SHA512 4979bb97325bb8f1179362bb3fcffffd922899dbc2eaa69630de4751ad54e0dc5e5f6b96c3a4aa1e267700bdf25d7a8e59fab3c7ae04d4cdd70e0173c1d9dca9
-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 1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
-AUX grpc-1.14.2-gcc8-fixes.patch 4258 BLAKE2B 211847b5f493076ecdc13eef9567f5f088dfb1f0e1b7c61b69b6daeaeafa638262aea525063ac5a4612e12cb378d1231d30eb1ed86d781b6ee43b20d4fb68353 SHA512 20279e231042fa01ad0dffbfd731e2ea17d9ff4240a21204f672f88a4dca7302f1e8a4f4dbffbb4a5c2d321f47f735ef0411a2e2a44472494b518741a044ac4f
+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
-DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
-DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
-DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
-DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356
-DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385
-DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06
+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.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
@@ -27,19 +13,11 @@ DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f7
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.0.tar.gz 15082718 BLAKE2B 679be0488fc02441d5ba555c9150532e6ceb00bbaee9fe8b22881bef8ab713f45f96283f123576738285cfe8d358eb458cac9252bac7766cfd8ee5ac6e97fda9 SHA512 e8181f01bc44dc7e7a9e8c74c0a9c3f25960bb9c88c239e7c75764105ca24ac173bab663130fb6349c7fa43cd57f35dd7927a369482b1e6a73224cb2174bd336
-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
-EBUILD grpc-1.12.1-r1.ebuild 4258 BLAKE2B 372198269d3e8422b0fcc7e1148066b9e0c4d5358d42e7e1ee0a1ac76221e40bd07b97f37a1abb3d70644b5054fdc3e5b6e99041f6c35d5c0932d3ad73c141c3 SHA512 e9aba2354c4f23e6d4b37f96570035f75c2ef719f42783127b785f6d6aefadd737e69c7f94d061301823b1f1f662c4bc977fd8d680eb1c9cbf3a5af84d5ec189
-EBUILD grpc-1.13.0-r1.ebuild 4367 BLAKE2B 60db5fa5681f2574b54b52fd06832f43f9de2902db43345d95541eb1e412a4a318c17f08b000ce6e7db0ffa9c749f0fe4a7c1ceca863e7e9414a4ef6cf5cbe06 SHA512 ee044858a4bd1b8c85cc021c329f8fae48511b99f23997b1af8ef3a26be7a8e3179d24c947d40ec7d1b510084a35618d86d928cf5e554e1d03b6eff7f41a46d2
-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 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
-EBUILD grpc-1.22.0.ebuild 2539 BLAKE2B 8d1cafe9b1b74403ece5c57b7064955c7c4b512742c3cecfd9bfdff0b632bc713fae61dbe24ec4773c49db175b0860f00ff0319298dd63c4dac344b770d6a63f SHA512 7fdb2c1eb9ad2d3d052e9cccc693870f800c030808245d68f179599c2e94b357f31746b7805535f8f002b7f05acf5928efd46e2781724a7e57da4681c1089165
-MISC metadata.xml 738 BLAKE2B cff2b1998bc69661baad2d711e3f6b333b641c8ce287cafe4db88f8582b4a73082aee86d35bb8ed575941f813451af032d9e9aa4654984f344bc357817cce3b6 SHA512 acc602accf74b98f978a3cab6b46f70c4730718c49a7dd7869687c899b2b0f72eb70dd90f783151ba1bf0f44ed9de028cead4c1ddcc6051509a04d38a50df4fb
+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.0.ebuild 2539 BLAKE2B a149c117b60e5aa6af33606ca989ca672030b054601c28d8d75437edbe444a5048126836056f8f19b5571251e1fad15f220124644a898d45337963ad9b86613a SHA512 700b4147f8490fd87a7039cf40dc438576a3caf5b9de7dad26e48fd7453c7a7b9678f347b9bc1c8dbc0e3efd5c47d0700543122eb5948baed0be7ac4838e3a51
+MISC metadata.xml 684 BLAKE2B e2a167f68e05a7dbcef3ad7fa58ebcbde529d28ee5d5ad5dd73b2ee66a1bf21bc5041bbde089c6439c5cd4e800ab77edf647d8cc629f051b1a489327cc000cac SHA512 d3a9fda12fc9009e675ac6ea5112b9f8c8c4a316a45623e8e536821144c886b48c9f28b1c7bcc6362bd7ae7d71d0eec36b442fed5360924d7424095b2afd38f7
diff --git a/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch b/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch
deleted file mode 100644
index 6c4767759b4d..000000000000
--- a/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch
+++ /dev/null
@@ -1,58 +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.
----
- Makefile | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 95de4f6530..4f0680e1d2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -329,6 +329,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)
- ifeq ($(HAS_CXX11),true)
-@@ -438,11 +439,12 @@ 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 -fPIC
-+HOST_CFLAGS = -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
-+HOST_CXXFLAGS = -std=c++11
-+HOST_LDFLAGS = -g -fPIC -Llibs/$(CONFIG)
-+HOST_LDLIBS = -lprotoc
-+HOST_AROPTS = $(AROPTS)
-
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-@@ -6838,10 +6840,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.14.0.rc0.284.gd933b75aa4-goog
-
diff --git a/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch b/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch
deleted file mode 100644
index e6bde1321a46..000000000000
--- a/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From bc139f5b7ce6a2a6d7c67480a04e029955aec0ab Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:21:27 -0700
-Subject: [PATCH 3/5] grpc-1.3.0: Fix unsecure .pc files
-
-The *_unsecure.pc files were still linking against the secure versions
-of the grpc libraries. Fix them to link against the unsecure versions.
-
-Sent upstream as https://github.com/grpc/grpc/pull/11448.
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4f0680e1d2..86bd66a5e0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -778,7 +778,7 @@ PC_DESCRIPTION = high performance general RPC framework without SSL
- PC_CFLAGS =
- PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC)
- PC_LIBS_PRIVATE = $(PC_LIBS_GRPC)
--PC_LIB = -lgrpc
-+PC_LIB = -lgrpc_unsecure
- GRPC_UNSECURE_PC_FILE := $(CORE_PC_TEMPLATE)
-
- PROTOBUF_PKG_CONFIG = false
-@@ -849,7 +849,7 @@ PC_DESCRIPTION = C++ wrapper for gRPC without SSL
- PC_CFLAGS =
- PC_REQUIRES_PRIVATE = grpc_unsecure $(PC_REQUIRES_GRPCXX)
- PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX)
--PC_LIB = -lgrpc++
-+PC_LIB = -lgrpc++_unsecure
- GRPCXX_UNSECURE_PC_FILE := $(CPP_PC_TEMPLATE)
-
- ifeq ($(MAKECMDGOALS),clean)
---
-2.14.0.rc0.284.gd933b75aa4-goog
-
diff --git a/net-libs/grpc/files/0004-grpc-1.11.0-fix-cpp-so-version.patch b/net-libs/grpc/files/0004-grpc-1.11.0-fix-cpp-so-version.patch
deleted file mode 100644
index 465520257cf6..000000000000
--- a/net-libs/grpc/files/0004-grpc-1.11.0-fix-cpp-so-version.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-It creates the symlinks with the wrong versions
-
---- a/Makefile.orig 2018-05-02 14:19:10.007775576 +0800
-+++ b/Makefile 2018-05-02 14:20:59.414089065 +0800
-@@ -2928,7 +2928,7 @@
- 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)"
-@@ -2937,7 +2937,7 @@
- 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)"
-@@ -2946,7 +2946,7 @@
- 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)"
-@@ -2955,7 +2955,7 @@
- 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)"
-@@ -2964,7 +2964,7 @@
- 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
- ifneq ($(SYSTEM),MINGW32)
diff --git a/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch b/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
deleted file mode 100644
index 61fd830d64d4..000000000000
--- a/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 30ce693621d61efb8596503a0da212077a8c4daa Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-Date: Thu, 24 May 2018 17:12:13 +0200
-Subject: [PATCH] Allow building the python module with system openssl
-
-When building the python module and using the new
-GRPC_PYTHON_BUILD_SYSTEM_OPENSSL env variable, the third party
-boringssl code is not compiled. Instead, the openssl shared library
-installed on the system is used during runtime.
-This is useful for distributions who don't want to include code copies
-but use shared libraries instead.
----
- setup.py | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 99d1a1c504e..3a5ed56c641 100644
---- a/setup.py
-+++ b/setup.py
-@@ -35,7 +35,7 @@
- PY3 = sys.version_info.major == 3
- PYTHON_STEM = os.path.join('src', 'python', 'grpcio')
- CORE_INCLUDE = ('include', '.',)
--BORINGSSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
-+SSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
- ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),)
- CARES_INCLUDE = (
- os.path.join('third_party', 'cares'),
-@@ -84,6 +84,12 @@
- # present, then it will still attempt to use Cython.
- BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
-
-+# Export this variable to use the system installation of openssl. You need to
-+# have the header files installed (in /usr/include/openssl) and during
-+# runtime, the shared libary must be installed
-+BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
-+ False)
-+
- # Environment variable to determine whether or not to enable coverage analysis
- # in Cython modules.
- ENABLE_CYTHON_TRACING = os.environ.get(
-@@ -148,8 +154,13 @@
- if "win32" in sys.platform:
- CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
-
-+if BUILD_WITH_SYSTEM_OPENSSL:
-+ CORE_C_FILES = filter(lambda x: 'third_party/boringssl' not in x, CORE_C_FILES)
-+ CORE_C_FILES = filter(lambda x: 'src/boringssl' not in x, CORE_C_FILES)
-+ SSL_INCLUDE = (os.path.join('/usr', 'include', 'openssl'),)
-+
- EXTENSION_INCLUDE_DIRECTORIES = (
-- (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE +
-+ (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
- CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
-
- EXTENSION_LIBRARIES = ()
-@@ -159,6 +170,8 @@
- EXTENSION_LIBRARIES += ('m',)
- if "win32" in sys.platform:
- EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
-+if BUILD_WITH_SYSTEM_OPENSSL:
-+ EXTENSION_LIBRARIES += ('ssl', 'crypto',)
-
- DEFINE_MACROS = (
- ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch b/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch
deleted file mode 100644
index 6964642b119d..000000000000
--- a/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3823d9048102bce79e165584c62a1a5b91810aeb Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-Date: Fri, 25 May 2018 06:52:23 +0200
-Subject: [PATCH] Allow building the python module with system zlib
-
-When building the python module and using the new
-GRPC_PYTHON_BUILD_SYSTEM_ZLIB env variable, the third party zlib code
-is not compiled. Instead, the zlib shared library installed on the
-system is used during runtime.
-This is useful for distributions who don't want to include code copies
-but use shared libraries instead.
----
- setup.py | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 3a5ed56c641..483d3ac1682 100644
---- a/setup.py
-+++ b/setup.py
-@@ -90,6 +90,12 @@
- BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
- False)
-
-+# Export this variable to use the system installation of zlib. You need to
-+# have the header files installed (in /usr/include/) and during
-+# runtime, the shared libary must be installed
-+BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
-+ False)
-+
- # Environment variable to determine whether or not to enable coverage analysis
- # in Cython modules.
- ENABLE_CYTHON_TRACING = os.environ.get(
-@@ -159,6 +165,10 @@
- CORE_C_FILES = filter(lambda x: 'src/boringssl' not in x, CORE_C_FILES)
- SSL_INCLUDE = (os.path.join('/usr', 'include', 'openssl'),)
-
-+if BUILD_WITH_SYSTEM_ZLIB:
-+ CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES)
-+ ZLIB_INCLUDE = (os.path.join('/usr', 'include'),)
-+
- EXTENSION_INCLUDE_DIRECTORIES = (
- (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
- CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
-@@ -172,6 +182,8 @@
- EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
- if BUILD_WITH_SYSTEM_OPENSSL:
- EXTENSION_LIBRARIES += ('ssl', 'crypto',)
-+if BUILD_WITH_SYSTEM_ZLIB:
-+ EXTENSION_LIBRARIES += ('z',)
-
- DEFINE_MACROS = (
- ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch b/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch
deleted file mode 100644
index c2e20f3994f4..000000000000
--- a/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 78a6e04ec1efc2dc839f0329dcff732940e27fd9 Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-Date: Fri, 25 May 2018 07:08:05 +0200
-Subject: [PATCH] Allow building the python module with system cares
-
-When building the python module and using the new
-GRPC_PYTHON_BUILD_SYSTEM_CARES env variable, the third party cares code
-is not compiled. Instead, the cares shared library installed on the
-system is used during runtime.
-This is useful for distributions who don't want to include code copies
-but use shared libraries instead.
----
- setup.py | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 483d3ac1682..43c25aafeb9 100644
---- a/setup.py
-+++ b/setup.py
-@@ -96,6 +96,12 @@
- BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
- False)
-
-+# Export this variable to use the system installation of cares. You need to
-+# have the header files installed (in /usr/include/) and during
-+# runtime, the shared libary must be installed
-+BUILD_WITH_SYSTEM_CARES = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_CARES',
-+ False)
-+
- # Environment variable to determine whether or not to enable coverage analysis
- # in Cython modules.
- ENABLE_CYTHON_TRACING = os.environ.get(
-@@ -169,6 +175,10 @@
- CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES)
- ZLIB_INCLUDE = (os.path.join('/usr', 'include'),)
-
-+if BUILD_WITH_SYSTEM_CARES:
-+ CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
-+ CARES_INCLUDE = (os.path.join('/usr', 'include'),)
-+
- EXTENSION_INCLUDE_DIRECTORIES = (
- (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
- CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
-@@ -184,6 +194,8 @@
- EXTENSION_LIBRARIES += ('ssl', 'crypto',)
- if BUILD_WITH_SYSTEM_ZLIB:
- EXTENSION_LIBRARIES += ('z',)
-+if BUILD_WITH_SYSTEM_CARES:
-+ EXTENSION_LIBRARIES += ('cares',)
-
- DEFINE_MACROS = (
- ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch b/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
deleted file mode 100644
index a9168f165e19..000000000000
--- a/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/tmp/alts_transport_security.cc.ORIG 2018-04-13 20:08:11.000000000 +0200
-+++ b/src/core/tsi/alts_transport_security.cc 2018-05-20 16:54:49.995787548 +0200
-@@ -45,7 +45,7 @@
- }
-
- void grpc_tsi_alts_init() {
-- memset(&g_alts_resource, 0, sizeof(alts_shared_resource));
-+ memset((void*)&g_alts_resource, 0, sizeof(alts_shared_resource));
- gpr_mu_init(&g_alts_resource.mu);
- gpr_cv_init(&g_alts_resource.cv);
- }
---- a/tmp/client_channel.cc.ORIG 2018-04-13 20:08:11.000000000 +0200
-+++ b/src/core/ext/filters/client_channel/client_channel.cc 2018-05-20 17:07:20.604746186 +0200
-@@ -416,7 +416,7 @@
- grpc_uri* uri = grpc_uri_parse(server_uri, true);
- GPR_ASSERT(uri->path[0] != '\0');
- service_config_parsing_state parsing_state;
-- memset(&parsing_state, 0, sizeof(parsing_state));
-+ memset((void*)&parsing_state, 0, sizeof(parsing_state));
- parsing_state.server_name =
- uri->path[0] == '/' ? uri->path + 1 : uri->path;
- service_config->ParseGlobalParams(parse_retry_throttle_params,
---- a/tmp/channel.cc.ORIG 2018-04-13 20:08:11.000000000 +0200
-+++ b/src/core/lib/surface/channel.cc 2018-05-20 16:58:01.632776988 +0200
-@@ -103,7 +103,7 @@
- return channel;
- }
-
-- memset(channel, 0, sizeof(*channel));
-+ memset((void*)channel, 0, sizeof(*channel));
- channel->target = target;
- channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type);
- size_t channel_tracer_max_nodes = 0; // default to off
-@@ -280,7 +280,7 @@
- }
-
- grpc_call_create_args args;
-- memset(&args, 0, sizeof(args));
-+ memset((void*)&args, 0, sizeof(args));
- args.channel = channel;
- args.parent = parent_call;
- args.propagation_mask = propagation_mask;
---- a/tmp/flow_control.cc.ORIG 2018-04-13 20:08:11.000000000 +0200
-+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc 2018-05-20 17:09:47.055738116 +0200
-@@ -187,7 +187,7 @@
- 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(
diff --git a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch
index 257bef8aa140..257bef8aa140 100644
--- a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
+++ b/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch
diff --git a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
index 926952f47f2a..926952f47f2a 100644
--- a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
+++ b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
diff --git a/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch b/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch
deleted file mode 100644
index cb61b5f26fee..000000000000
--- a/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 9c7db45da9a6ddc5d65cd19704539579eb31d2ce Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 12 Sep 2018 10:35:45 -0700
-Subject: [PATCH] Fix failures with gcc-8
-
-Based on this PR https://github.com/grpc/grpc/pull/15443
----
- src/core/ext/filters/client_channel/client_channel.cc | 2 +-
- .../client_channel/lb_policy/grpclb/load_balancer_api.cc | 3 ++-
- src/core/ext/transport/chttp2/transport/flow_control.cc | 2 +-
- src/core/lib/surface/channel.cc | 2 +-
- src/core/tsi/alts_transport_security.cc | 2 +-
- 5 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
-index d2bf4f388d..503fb1ac87 100644
---- a/src/core/ext/filters/client_channel/client_channel.cc
-+++ b/src/core/ext/filters/client_channel/client_channel.cc
-@@ -457,7 +457,7 @@ get_service_config_from_resolver_result_locked(channel_data* chand) {
- grpc_uri* uri = grpc_uri_parse(server_uri, true);
- GPR_ASSERT(uri->path[0] != '\0');
- service_config_parsing_state parsing_state;
-- memset(&parsing_state, 0, sizeof(parsing_state));
-+ memset(reinterpret_cast<void *>(&parsing_state), 0, sizeof(parsing_state));
- parsing_state.server_name =
- uri->path[0] == '/' ? uri->path + 1 : uri->path;
- service_config->ParseGlobalParams(parse_retry_throttle_params,
-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 f24281a5bf..74baf430f1 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] = '\0';
- return req;
- }
-
-diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
-index 53932bcb7f..4b1862735d 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(
-diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
-index 82635d3c21..f9d89657b3 100644
---- a/src/core/lib/surface/channel.cc
-+++ b/src/core/lib/surface/channel.cc
-@@ -100,7 +100,7 @@ grpc_channel* grpc_channel_create_with_builder(
- return channel;
- }
-
-- memset(channel, 0, sizeof(*channel));
-+ memset(reinterpret_cast<void *>(channel), 0, sizeof(*channel));
- channel->target = target;
- channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type);
- size_t channel_tracer_max_nodes = 0; // default to off
-diff --git a/src/core/tsi/alts_transport_security.cc b/src/core/tsi/alts_transport_security.cc
-index 2fd408103b..51f9e9e85b 100644
---- a/src/core/tsi/alts_transport_security.cc
-+++ b/src/core/tsi/alts_transport_security.cc
-@@ -45,7 +45,7 @@ void grpc_tsi_alts_signal_for_cq_destroy() {
- }
-
- void grpc_tsi_alts_init() {
-- memset(&g_alts_resource, 0, sizeof(alts_shared_resource));
-+ memset(reinterpret_cast<void *>(&g_alts_resource), 0, sizeof(alts_shared_resource));
- gpr_mu_init(&g_alts_resource.mu);
- gpr_cv_init(&g_alts_resource.cv);
- }
---
-2.18.0
-
diff --git a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
index 213a39a38438..213a39a38438 100644
--- a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
+++ b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
diff --git a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
index 974d6fcc4351..974d6fcc4351 100644
--- a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
+++ b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
diff --git a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
index d18063f2ef1b..d18063f2ef1b 100644
--- a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch
+++ b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
diff --git a/net-libs/grpc/grpc-1.12.0.ebuild b/net-libs/grpc/grpc-1.12.0.ebuild
deleted file mode 100644
index 89cc2c83087e..000000000000
--- a/net-libs/grpc/grpc-1.12.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit python-r1 toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- >=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-libs/protobuf-3:=
- net-dns/c-ares:=
- sys-libs/zlib:="
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch"
- "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
- "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
- "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
- "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-)
-
-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}" \
- LD="${CC}" \
- LDXX="${CXX}" \
- STRIP=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)"
-}
-
-src_install() {
- emake \
- prefix="${ED%/}"/usr \
- INSTALL_LIBDIR="$(get_libdir)" \
- STRIP=true \
- install
-}
diff --git a/net-libs/grpc/grpc-1.12.1-r1.ebuild b/net-libs/grpc/grpc-1.12.1-r1.ebuild
deleted file mode 100644
index 51e73dd8c9cc..000000000000
--- a/net-libs/grpc/grpc-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-PROTOBUF_VERSION="3.5.2"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap tools"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- tools? ( python )
-"
-
-DEPEND="
- >=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-libs/protobuf-3.5:=
- dev-util/google-perftools
- net-dns/c-ares:=
- sys-libs/zlib:=
- python? ( ${PYTHON_DEPS}
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/cython[${PYTHON_USEDEP}]
- >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/python-enum34[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- )
- )
- systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch"
- "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
- "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
- "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
- "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
- "${FILESDIR}/0006-grpc-1.12.1-allow-system-openssl.patch"
- "${FILESDIR}/0007-grpc-1.12.1-allow-system-zlib.patch"
- "${FILESDIR}/0008-grpc-1.12.1-allow-system-cares.patch"
- "${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
-)
-
-src_prepare() {
- sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
- default
- use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
- if use tools; then
- rm -r third_party/protobuf || die "removing empty protobuf dir failed"
- ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- # absolute symlinks will fail because out-of-source build
- # ./src -> ${S}/src
- ln -s ../../../../src ./ || die
- # ./third_party -> ${S}/third_party
- ln -s ../../../../third_party ./ || die
- # ./grpc_root -> ${S}
- ln -s ../../../../ ./grpc_root || die
- # https://bugs.gentoo.org/661244
- echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
- popd >/dev/null || die
- fi
-}
-
-src_compile() {
- tc-export CC CXX PKG_CONFIG
- emake \
- V=1 \
- prefix=/usr \
- INSTALL_LIBDIR="$(get_libdir)" \
- AR="$(tc-getAR)" \
- AROPTS="rcs" \
- CFLAGS="${CFLAGS}" \
- LD="${CC}" \
- LDXX="${CXX}" \
- STRIP=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)"
-
- use python && distutils-r1_src_compile
-}
-
-python_compile() {
- export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
- export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
- export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
- export GRPC_PYTHON_BUILD_WITH_CYTHON=1
- distutils-r1_python_compile
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_compile
- popd >/dev/null || die
- fi
-}
-
-python_compile_all() {
- if use doc; then
- esetup.py doc
- mv doc/build doc/html || die
- fi
-}
-
-src_install() {
- emake \
- prefix="${ED%/}"/usr \
- INSTALL_LIBDIR="$(get_libdir)" \
- STRIP=true \
- install
-
- if use examples; then
- docinto examples
- dodoc -r examples/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- use doc && local DOCS=( AUTHORS README.md doc/. )
- einstalldocs
-
- use python && distutils-r1_src_install
-}
-
-python_install() {
- distutils-r1_python_install
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_install
- popd >/dev/null || die
- fi
-}
diff --git a/net-libs/grpc/grpc-1.13.0-r1.ebuild b/net-libs/grpc/grpc-1.13.0-r1.ebuild
deleted file mode 100644
index 45bfa5343f47..000000000000
--- a/net-libs/grpc/grpc-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-# also should ~depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.5.2"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap static-libs tools"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- tools? ( python )
-"
-
-RDEPEND="
- >=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-libs/protobuf-${PROTOBUF_VERSION}:=
- dev-util/google-perftools
- net-dns/c-ares:=
- sys-libs/zlib:=
- python? ( ${PYTHON_DEPS}
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/cython[${PYTHON_USEDEP}]
- >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/python-enum34[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- )
- systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- python? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
- "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
- "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
- "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
- "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
- "${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
-)
-
-src_prepare() {
- sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
- default
- use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
- if use tools; then
- rm -r third_party/protobuf || die "removing empty protobuf dir failed"
- ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- # absolute symlinks will fail
- # ./src -> ${S}/src
- ln -s ../../../../src ./ || die
- # ./third_party -> ${S}/third_party
- ln -s ../../../../third_party ./ || die
- # ./grpc_root -> ${S}
- ln -s ../../../../ ./grpc_root || die
- # https://bugs.gentoo.org/661244
- echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
- popd >/dev/null || die
- fi
-}
-
-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)"
-
- use python && distutils-r1_src_compile
-}
-
-python_compile() {
- export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
- export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
- export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
- export GRPC_PYTHON_BUILD_WITH_CYTHON=1
- distutils-r1_python_compile
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_compile
- popd >/dev/null || die
- fi
-}
-
-python_compile_all() {
- if use doc; then
- esetup.py doc
- mv doc/build doc/html || die
- fi
-}
-
-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 doc/. )
- fi
-
- einstalldocs
-
- use python && distutils-r1_src_install
-
-}
-
-python_install() {
- distutils-r1_python_install
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_install
- popd >/dev/null || die
- fi
-}
diff --git a/net-libs/grpc/grpc-1.13.1.ebuild b/net-libs/grpc/grpc-1.13.1.ebuild
deleted file mode 100644
index 12364479d275..000000000000
--- a/net-libs/grpc/grpc-1.13.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-# also should ~depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.5.2"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap static-libs tools"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- tools? ( python )
-"
-
-RDEPEND="
- >=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-libs/protobuf-${PROTOBUF_VERSION}:=
- dev-util/google-perftools
- net-dns/c-ares:=
- sys-libs/zlib:=
- python? ( ${PYTHON_DEPS}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- virtual/python-enum34[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- tools? ( >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}] )
- )
- systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- python? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
- "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
- "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
- "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
- "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
- "${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
-)
-
-src_prepare() {
- sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
- default
- use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
- if use tools; then
- rm -r third_party/protobuf || die "removing empty protobuf dir failed"
- ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- # absolute symlinks will fail
- # ./src -> ${S}/src
- ln -s ../../../../src ./ || die
- # ./third_party -> ${S}/third_party
- ln -s ../../../../third_party ./ || die
- # ./grpc_root -> ${S}
- ln -s ../../../../ ./grpc_root || die
- # prevent above symlinks creating huge SOURCES.TXT files, bug #661244
- echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
- popd >/dev/null || die
- fi
-}
-
-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)"
-
- use python && distutils-r1_src_compile
-}
-
-python_compile() {
- export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
- export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
- export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
- export GRPC_PYTHON_BUILD_WITH_CYTHON=1
- distutils-r1_python_compile
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_compile
- popd >/dev/null || die
- fi
-}
-
-python_compile_all() {
- if use doc; then
- esetup.py doc
- mv doc/build doc/html || die
- fi
-}
-
-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 doc/. )
- fi
-
- einstalldocs
-
- use python && distutils-r1_src_install
-
-}
-
-python_install() {
- distutils-r1_python_install
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_install
- popd >/dev/null || die
- fi
-}
diff --git a/net-libs/grpc/grpc-1.14.2.ebuild b/net-libs/grpc/grpc-1.14.2.ebuild
deleted file mode 100644
index f3f61968210e..000000000000
--- a/net-libs/grpc/grpc-1.14.2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-# also should >=depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.5.2"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap static-libs tools"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- tools? ( python )
-"
-
-RDEPEND="
- >=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-libs/protobuf-${PROTOBUF_VERSION}:=
- dev-util/google-perftools
- net-dns/c-ares:=
- sys-libs/zlib:=
- python? ( ${PYTHON_DEPS}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- virtual/python-enum34[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- tools? ( >=dev-python/protobuf-python-${PROTOBUF_VERSION}:=[${PYTHON_USEDEP}] )
- )
- systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- python? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
- "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
- "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
- "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
- "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
- "${FILESDIR}/grpc-1.14.2-gcc8-fixes.patch"
-)
-
-src_prepare() {
- sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
- default
- use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
- if use tools; then
- rm -r third_party/protobuf || die "removing empty protobuf dir failed"
- ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- # absolute symlinks will fail
- # ./src -> ${S}/src
- ln -s ../../../../src ./ || die
- # ./third_party -> ${S}/third_party
- ln -s ../../../../third_party ./ || die
- # ./grpc_root -> ${S}
- ln -s ../../../../ ./grpc_root || die
- # prevent above symlinks creating huge SOURCES.TXT files, bug #661244
- echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
- popd >/dev/null || die
- fi
-}
-
-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)"
-
- use python && distutils-r1_src_compile
-}
-
-python_compile() {
- export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
- export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
- export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
- export GRPC_PYTHON_BUILD_WITH_CYTHON=1
- distutils-r1_python_compile
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_compile
- popd >/dev/null || die
- fi
-}
-
-python_compile_all() {
- if use doc; then
- esetup.py doc
- mv doc/build doc/html || die
- fi
-}
-
-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
-
- # only define DOCS array if requested, otherwise portage default is fine
- if use doc; then
- find doc -name '.gitignore' -delete || die
- local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
- fi
-
- einstalldocs
-
- use python && distutils-r1_src_install
-
-}
-
-python_install() {
- distutils-r1_python_install
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_install
- popd >/dev/null || die
- fi
-}
diff --git a/net-libs/grpc/grpc-1.15.0.ebuild b/net-libs/grpc/grpc-1.15.0.ebuild
deleted file mode 100644
index 54b506a2c3a7..000000000000
--- a/net-libs/grpc/grpc-1.15.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-# also should >=depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.6.1"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap static-libs tools"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- tools? ( python )
-"
-
-RDEPEND="
- >=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-libs/protobuf-${PROTOBUF_VERSION}:=
- dev-util/google-perftools
- net-dns/c-ares:=
- sys-libs/zlib:=
- python? ( ${PYTHON_DEPS}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- virtual/python-enum34[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- tools? ( >=dev-python/protobuf-python-${PROTOBUF_VERSION}:=[${PYTHON_USEDEP}] )
- )
- systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- python? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
- "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
- "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
- "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
- "${FILESDIR}/grpc-1.14.2-gcc8-fixes.patch"
- "${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
-)
-
-src_prepare() {
- sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
- default
- use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
- if use tools; then
- rm -r third_party/protobuf || die "removing empty protobuf dir failed"
- ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- # absolute symlinks will fail
- # ./src -> ${S}/src
- ln -s ../../../../src ./ || die
- # ./third_party -> ${S}/third_party
- ln -s ../../../../third_party ./ || die
- # ./grpc_root -> ${S}
- ln -s ../../../../ ./grpc_root || die
- # prevent above symlinks creating huge SOURCES.TXT files, bug #661244
- echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
- popd >/dev/null || die
- fi
-}
-
-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)"
-
- use python && distutils-r1_src_compile
-}
-
-python_compile() {
- export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
- export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
- export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
- export GRPC_PYTHON_BUILD_WITH_CYTHON=1
- distutils-r1_python_compile
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_compile
- popd >/dev/null || die
- fi
-}
-
-python_compile_all() {
- if use doc; then
- esetup.py doc
- mv doc/build doc/html || die
- fi
-}
-
-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
-
- # only define DOCS array if requested, otherwise portage default is fine
- if use doc; then
- find doc -name '.gitignore' -delete || die
- local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
- fi
-
- einstalldocs
-
- use python && distutils-r1_src_install
-
-}
-
-python_install() {
- distutils-r1_python_install
-
- if use tools; then
- pushd tools/distrib/python/grpcio_tools >/dev/null || die
- distutils-r1_python_install
- popd >/dev/null || die
- fi
-}
diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
index f04778edda6d..6ab28ceba67a 100644
--- a/net-libs/grpc/grpc-1.16.1.ebuild
+++ b/net-libs/grpc/grpc-1.16.1.ebuild
@@ -30,9 +30,9 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.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.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"
diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
index 2774a877762b..a5959280313b 100644
--- a/net-libs/grpc/grpc-1.17.1.ebuild
+++ b/net-libs/grpc/grpc-1.17.1.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.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.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"
)
diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
index 2774a877762b..a5959280313b 100644
--- a/net-libs/grpc/grpc-1.18.0.ebuild
+++ b/net-libs/grpc/grpc-1.18.0.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.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.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"
)
diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild
index d944be59c386..a0877fb616b1 100644
--- a/net-libs/grpc/grpc-1.19.0.ebuild
+++ b/net-libs/grpc/grpc-1.19.0.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.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.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}"
diff --git a/net-libs/grpc/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild
index f34a772f7781..d8c812cd259b 100644
--- a/net-libs/grpc/grpc-1.20.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.20.1-r1.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}/0001-grpc-1.13.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.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}"
diff --git a/net-libs/grpc/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild
index f90bab18e1c5..bf11250c29cb 100644
--- a/net-libs/grpc/grpc-1.21.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.21.1-r1.ebuild
@@ -32,9 +32,9 @@ BDEPEND="virtual/pkgconfig"
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.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"
)
diff --git a/net-libs/grpc/grpc-1.22.0.ebuild b/net-libs/grpc/grpc-1.22.0.ebuild
index 04e137d8d78c..4f597ba83570 100644
--- a/net-libs/grpc/grpc-1.22.0.ebuild
+++ b/net-libs/grpc/grpc-1.22.0.ebuild
@@ -32,10 +32,10 @@ BDEPEND="virtual/pkgconfig"
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}/1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+ "${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.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 3a3bfdc3d72d..ccbc56aeed7b 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -14,7 +14,6 @@
<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>
<upstream>
<remote-id type="github">grpc/grpc</remote-id>