[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2024-09-04 Thread Sam James 
commit: 8ca9fa4e05dea29e5e3f2685b54b09d600a8c2b2
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Wed Sep  4 08:32:42 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  4 08:39:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca9fa4e

net-libs/grpc: fix build against abseil-cpp-20240722.0

Closes: https://bugs.gentoo.org/939015
Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/38422
Signed-off-by: Sam James  gentoo.org>

 net-libs/grpc/files/grpc-1.65.0-vlog.patch | 17 +
 net-libs/grpc/grpc-1.65.1.ebuild   |  1 +
 2 files changed, 18 insertions(+)

diff --git a/net-libs/grpc/files/grpc-1.65.0-vlog.patch 
b/net-libs/grpc/files/grpc-1.65.0-vlog.patch
new file mode 100644
index ..e57c0ba222b3
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.65.0-vlog.patch
@@ -0,0 +1,17 @@
+
+Fix build with abseil-cpp-20240722.0 which no longer implicitly
+includes absl/log/vlog_is_on.h
+
+See: https://github.com/abseil/abseil-cpp/releases/tag/20240722.0
+Bug: https://bugs.gentoo.org/939015
+
+--- grpc-1.65.1/src/core/util/log.cc~  2024-07-17 00:53:49.0 +0200
 grpc-1.65.1/src/core/util/log.cc   2024-09-04 09:28:18.494476262 +0200
+@@ -19,6 +19,7 @@
+ #include 
+ 
+ #include "absl/log/log.h"
++#include "absl/log/vlog_is_on.h"
+ 
+ #include 
+ #include 

diff --git a/net-libs/grpc/grpc-1.65.1.ebuild b/net-libs/grpc/grpc-1.65.1.ebuild
index 448a008c7796..3fbe1dcd6309 100644
--- a/net-libs/grpc/grpc-1.65.1.ebuild
+++ b/net-libs/grpc/grpc-1.65.1.ebuild
@@ -56,6 +56,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-1.65.0-system-gtest.patch"
+   "${FILESDIR}/${PN}-1.65.0-vlog.patch"
 )
 
 python_check_deps() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2024-07-30 Thread Joonas Niilola 
commit: 84d5bb0c3d44c52ad0ad966799fe1c2b2eeb252a
Author: Paul Zander  gmail  com>
AuthorDate: Thu Jul 18 19:56:00 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jul 30 07:36:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d5bb0c

net-libs/grpc: add 1.65.1, drop 1.65.0

1.65.0 was yanked, move to 1.65.1

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37608
Signed-off-by: Joonas Niilola  gentoo.org>

 net-libs/grpc/Manifest |   2 +-
 net-libs/grpc/files/grpc-1.65.0-system-gtest.patch |  14 +-
 .../{grpc-1.65.0.ebuild => grpc-1.65.1.ebuild} | 164 +
 3 files changed, 146 insertions(+), 34 deletions(-)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 9f1f912d579f..15bd602fc31c 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -4,4 +4,4 @@ DIST grpc-1.56.1.tar.gz 11750628 BLAKE2B 
52ea088d3d19fa7c1d1dc44899cd67bfd0132df
 DIST grpc-1.57.0.tar.gz 17337863 BLAKE2B 
10c6fb35f606806aeb25cd55dd993d9af168eb8b1db64b4515830e2144dc44f35ce8f8329316a38d933b8032a0eff386591a0ddb87f2e405c5deaba012db2824
 SHA512 
b323de7c1f35b9de3fb7bf02ff4db6993abb0eee6860bbf2082818dda405fbe3a19fad91c5b48565cb65c6318de739bb91e47b5095801c078c6cbf3e8c73600c
 DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 
35cc0ea938deb848ca91e3d5f8879b85b80f94ac09b582600f05fee1f55c162ae98f2f744480f69d78e78da0c0f2d9e198f812101daaa1f1959869f26ba7d97a
 SHA512 
91c2406ed4198509ac0d5360b3da6898fa4f40f459eb6fff541faa44cc238eed98fd7489e7ef7a80a6f4a318bc5b9130eaa0ba1beaa358d1c074fc82825648ff
 DIST grpc-1.62.1.tar.gz 22384671 BLAKE2B 
134e40732e784e52d518cde6e518e4c08e2f67a025754d88b92a9a314f86e53bee33ee793395b9e225c0895c6ac8b9c036892c82c19d0fddf69909a22eac4b78
 SHA512 
3224ad2617c18156f90c54c1ebf1f2015e405a6f12546e8709e0c905f52508c9f1a13b4d5a6cc7a35abf58b429985b5b504c9062f50c0d3d6aa163180a61047a
-DIST grpc-1.65.0.tar.gz 22537894 BLAKE2B 
08b53b515b6e80c19aae6b9d3af969f79cc0f25413bc60106276030cd45df677bc67a94327da1439a2c469d49ed71043cf852f38e7fa5a36c2cb875a71bd3aa5
 SHA512 
18fbce2f77caca6bd21374db2234411ec37d27e5b171b1008aac6810f1a98e3f51826b9dc5e8bd29a746e4f2f31b2a87d6f1bbf988e72e321ca81e7b14f1a4b5
+DIST grpc-1.65.1.tar.gz 22539865 BLAKE2B 
f044305a1817c46d12b96d65a7d70e4342921d372bbeb127840ccbf5cda1f5a34daf7319cd8564a7d327f6abfbac67e4300f80cfe9e66dd49d65d77d30fd3402
 SHA512 
ca8ebe71fb88a0fc605706c3c81c349e79c40b347081a06795fa64550720bc745373ac5d167263d098e98553077cfda141e4f4be2eefa5f345ede9b0ddec4f54

diff --git a/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch 
b/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
index 47be90892893..878ce10f8ffd 100644
--- a/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
+++ b/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
@@ -1,14 +1,11 @@
-https://bugs.gentoo.org/927403
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a55616fb6..ee62502267 100644
+index d4d798f..824c4ed 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3442,79 +3442,6 @@ if(gRPC_INSTALL)
-   )
+@@ -3504,77 +3504,8 @@ if(gRPC_INSTALL)
  endif()
  
--if(gRPC_BUILD_TESTS)
+ if(gRPC_BUILD_TESTS)
 -
 -add_library(gtest
 -  third_party/googletest/googlemock/src/gmock-cardinalities.cc
@@ -80,7 +77,8 @@ index 7a55616fb6..ee62502267 100644
 -)
 -
 -
--endif()
++  find_package(GTest REQUIRED)
++  enable_testing()
+ endif()
  
  add_library(upb_base_lib
-   third_party/upb/upb/base/status.c

diff --git a/net-libs/grpc/grpc-1.65.0.ebuild b/net-libs/grpc/grpc-1.65.1.ebuild
similarity index 57%
rename from net-libs/grpc/grpc-1.65.0.ebuild
rename to net-libs/grpc/grpc-1.65.1.ebuild
index b5a31691fd7d..448a008c7796 100644
--- a/net-libs/grpc/grpc-1.65.0.ebuild
+++ b/net-libs/grpc/grpc-1.65.1.ebuild
@@ -54,7 +54,9 @@ BDEPEND="
)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.65.0-system-gtest.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-1.65.0-system-gtest.patch"
+)
 
 python_check_deps() {
if use test; then
@@ -83,21 +85,23 @@ src_prepare() {
# implicitly picked up and linked to the test binaries.  However 
removing
# the vendored gtest to use the system one also removes these 
dependencies,
# so we have to redeclare them as dependencies of the test binaries 
individually.
-   local extra_libs=("gtest"
-   "gmock"
-   "\${_gRPC_RE2_LIBRARIES}"
-   "absl::flat_hash_set"
-   "absl::failure_signal_handler"
-   "absl::stacktrace"
-   "absl::symbolize"
-   "absl::flags"
-   "absl::flags_parse"
-   "absl::flags_reflection"
-   "absl::flags_usage"
-   "absl::s

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2023-08-21 Thread Sam James 
commit: 785694f030cc5eeb3d919e37e606a046bac25584
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 21 19:52:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 21 19:52:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785694f0

net-libs/grpc: fix CMake module

Signed-off-by: Sam James  gentoo.org>

 net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch| 29 ++
 .../{grpc-1.57.0.ebuild => grpc-1.57.0-r1.ebuild}  |  4 +++
 2 files changed, 33 insertions(+)

diff --git a/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch 
b/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch
new file mode 100644
index ..1caa9e9bb8f8
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch
@@ -0,0 +1,29 @@
+https://github.com/grpc/grpc/pull/33361
+
+From 117dc80eb43021dd5619023ef6d02d0d6ec7ae7a Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlo...@users.noreply.github.com>
+Date: Wed, 7 Jun 2023 13:06:49 +0800
+Subject: [PATCH] [Build] fix `gRPCConfig.cmake`
+
+Without this change, calling `find_package(gRPC REQUIRED)` errors out
+with
+
+CMake Error at /opt/homebrew/lib/cmake/grpc/gRPCConfig.cmake:8 
(find_dependency):
+  Unknown CMake command "find_dependency".
+
+The issue is that `find_dependency` is provided by the
+`CMakeFindDependencyMacro` module[^1], so we need to `include` it before
+use.
+
+[^1]: https://cmake.org/cmake/help/v3.26/module/CMakeFindDependencyMacro.html
+--- a/cmake/protobuf.cmake
 b/cmake/protobuf.cmake
+@@ -86,6 +86,6 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")
+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
+   endif()
+ endif()
+-set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf CONFIG)")
++set(_gRPC_FIND_PROTOBUF 
"include(CMakeFindDependencyMacro)\nfind_dependency(Protobuf CONFIG)")
+   endif()
+ endif()
+

diff --git a/net-libs/grpc/grpc-1.57.0.ebuild 
b/net-libs/grpc/grpc-1.57.0-r1.ebuild
similarity index 98%
rename from net-libs/grpc/grpc-1.57.0.ebuild
rename to net-libs/grpc/grpc-1.57.0-r1.ebuild
index 77e08df80530..3b44163c341f 100644
--- a/net-libs/grpc/grpc-1.57.0.ebuild
+++ b/net-libs/grpc/grpc-1.57.0-r1.ebuild
@@ -43,6 +43,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.57.0-fix-cmake.patch
+)
+
 soversion_check() {
local core_sover cpp_sover
# extract quoted number. line we check looks like this: 
'set(gRPC_CPP_SOVERSION"1.37")'

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2021-10-08 Thread Arthur Zamarin 
commit: 6808a5a7420dfa7355ed17d81b0f88d6889f3894
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Oct  8 14:11:07 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Oct  8 18:18:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6808a5a7

net-libs/grpc: add 1.41.0

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-libs/grpc/Manifest |   1 +
 .../grpc/files/grpc-1.41.0-link-system-gtest.patch |  22 +
 net-libs/grpc/grpc-1.41.0.ebuild   | 102 +
 3 files changed, 125 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 32327daee54..9ae56077887 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,2 +1,3 @@
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B 
c306fbe60f5191fe957efb35c75574e00b194895e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85
 SHA512 
fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B 
dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7
 SHA512 
1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
+DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B 
e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6
 SHA512 
bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902

diff --git a/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch 
b/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch
new file mode 100644
index 000..4901678bfd6
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0e8fbdee8b..3662aabdfe 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -2309,6 +2309,7 @@ target_include_directories(grpc_test_util
+ ${_gRPC_ZLIB_INCLUDE_DIR}
+ )
+ target_link_libraries(grpc_test_util
++PRIVATE
+   ${_gRPC_ALLTARGETS_LIBRARIES}
+   absl::failure_signal_handler
+   absl::stacktrace
+@@ -2322,7 +2323,8 @@ endif()
+ 
+ endif()
+ if(gRPC_BUILD_TESTS)
+-
++find_package(GTest REQUIRED)
++target_link_libraries(grpc_test_util PUBLIC GTest::gtest GTest::gmock)
+ add_library(grpc_test_util_unsecure
+   test/core/util/cmdline.cc
+   test/core/util/fuzzer_util.cc

diff --git a/net-libs/grpc/grpc-1.41.0.ebuild b/net-libs/grpc/grpc-1.41.0.ebuild
new file mode 100644
index 000..e9f7052206f
--- /dev/null
+++ b/net-libs/grpc/grpc-1.41.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io";
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level 
CMakeLists.txt
+SLOT="0/19.141"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc examples test"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+   =dev-cpp/abseil-cpp-20210324*:=
+   >=dev-libs/re2-0.2021.04.01:=
+   >=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+   >=dev-libs/protobuf-3.17.3:=
+   dev-libs/xxhash
+   >=net-dns/c-ares-1.15.0:=
+   sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}
+   test? (
+   dev-cpp/benchmark
+   dev-cpp/gflags
+   )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+soversion_check() {
+   local core_sover cpp_sover
+   # extract quoted number. line we check looks like this: 
'set(gRPC_CPP_SOVERSION"1.37")'
+   core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt  | sed 
'/.*\"\(.*\)\".*/ s//\1/')"
+   cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt  | sed 
'/.*\"\(.*\)\".*/ s//\1/')"
+   # remove dots, e.g. 1.37 -> 137
+   core_sover="${core_sover//./}"
+   cpp_sover="${cpp_sover//./}"
+   [[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! 
should be ${core_sover}"
+   [[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! 
should be ${cpp_sover}"
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # un-hardcode libdir
+   sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
+   sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+   soversion_check
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DgRPC_INSTALL=ON
+   -DgRPC_ABSL_P

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2020-09-25 Thread Georgy Yakovlev 
commit: f594ce23eb9b3df1cc94eb382a5b0e9abb9ffc69
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Sep 25 23:32:52 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Sep 25 23:33:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f594ce23

net-libs/grpc: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev  gentoo.org>

 net-libs/grpc/Manifest |   2 -
 .../files/grpc-1.21.0-fix-host-ar-handling.patch   |  47 -
 ...grpc-1.22.0-cxx_arg_list_too_long_forloop.patch |  44 
 .../grpc/files/grpc-1.25.0-pkgconfig-libdir.patch  |  17 ---
 .../grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch |  53 --
 net-libs/grpc/grpc-1.26.0-r1.ebuild| 114 -
 net-libs/grpc/metadata.xml |   4 -
 7 files changed, 281 deletions(-)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 7eae7aec32b..486074e6e56 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,4 +1,2 @@
-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
 DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 
92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f
 SHA512 
5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
 DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 
4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069
 SHA512 
90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed

diff --git a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch 
b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
deleted file mode 100644
index 213a39a3843..000
--- a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev 
-Date: Wed, 22 May 2019 23:04:28 -0700
-Subject: [PATCH] Makefile: fix host ar handling
-
-picked lines from
-https://github.com/grpc/grpc/pull/11476

- Makefile | 236 ---
- 1 file changed, 119 insertions(+), 117 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 67495f2..e1c741c 100644
 a/Makefile
-+++ b/Makefile
-@@ -346,6 +346,7 @@ HOST_CC ?= $(CC)
- HOST_CXX ?= $(CXX)
- HOST_LD ?= $(LD)
- HOST_LDXX ?= $(LDXX)
-+HOST_AR ?= $(AR)
-
- CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
- CXXFLAGS += -std=c++11
-@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS)
- HOST_CXXFLAGS += $(CXXFLAGS)
- HOST_LDFLAGS += $(LDFLAGS)
- HOST_LDLIBS += $(LDLIBS)
-+HOST_AROPTS = $(AROPTS)
-
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-
-@@ -7381,11 +7383,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: 
protobuf_dep_error
-
- else
-
--$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) 
$(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
--  $(E) "[AR]  Creating $@"
-+$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) 
$(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+  $(E) "[HOSTAR]  Creating $@"
-   $(Q) mkdir -p `dirname $@`
-   $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
--  $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a 
$(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+  $(Q) $(HOST_AR) $(HOST_AROPTS) 
$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
- ifeq ($(SYSTEM),Darwin)
-   $(Q) ranlib -no_warning_for_no_symbols 
$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
- endif

diff --git 
a/net-libs/grpc/files/grpc-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
deleted file mode 100644
index 974d6fcc435..000
--- a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
+++ /dev/null
@@ -1,44 +0,0 @@
 a/Makefile 2018-06-26 11:07:45.948160976 +0200
-+++ b/Makefile 2019-06-26 11:04:25.798966336 +0200
-@@ -2820,13 +2820,15 @@
- 
- install-headers_c:
-   $

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2020-09-25 Thread Georgy Yakovlev 
commit: f4a04a5c28a13f2d5453847701a43572c5847d8f
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Sep 25 22:23:58 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Sep 25 22:55:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a04a5c

net-libs/grpc: bump to 1.32.0

Bug: https://bugs.gentoo.org/744730
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev  gentoo.org>

 net-libs/grpc/Manifest |  1 +
 .../grpc/files/use-pkg-config-to-find-re2.patch| 26 +++
 net-libs/grpc/grpc-1.32.0.ebuild   | 87 ++
 3 files changed, 114 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index d5b1a49aa2e..7eae7aec32b 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,3 +1,4 @@
 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
 DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 
92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f
 SHA512 
5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
+DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 
4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069
 SHA512 
90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed

diff --git a/net-libs/grpc/files/use-pkg-config-to-find-re2.patch 
b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch
new file mode 100644
index 000..33712d62ef0
--- /dev/null
+++ b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch
@@ -0,0 +1,26 @@
+From 1f51d47b0ab2c0ac54c27b54f5e8e79910138a02 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev 
+Date: Fri, 25 Sep 2020 15:10:26 -0700
+Subject: [PATCH] use pkg-config to find re2
+
+---
+ cmake/re2.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/re2.cmake b/cmake/re2.cmake
+index 3e83aae..94dfa5d 100644
+--- a/cmake/re2.cmake
 b/cmake/re2.cmake
+@@ -45,7 +45,8 @@ if(gRPC_RE2_PROVIDER STREQUAL "module")
+ set(gRPC_INSTALL FALSE)
+   endif()
+ elseif(gRPC_RE2_PROVIDER STREQUAL "package")
+-  find_package(re2 REQUIRED CONFIG)
++  find_package(PkgConfig REQUIRED)
++  pkg_check_modules(RE2 REQUIRED re2)
+ 
+   if(TARGET re2::re2)
+ set(_gRPC_RE2_LIBRARIES re2::re2)
+-- 
+2.28.0
+

diff --git a/net-libs/grpc/grpc-1.32.0.ebuild b/net-libs/grpc/grpc-1.32.0.ebuild
new file mode 100644
index 000..e76d5389780
--- /dev/null
+++ b/net-libs/grpc/grpc-1.32.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io";
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc examples libressl test"
+
+RDEPEND="
+   =dev-cpp/abseil-cpp-20200225*:=
+   dev-libs/re2:=
+   >=dev-libs/protobuf-3.13.0:=
+   >=net-dns/c-ares-1.15.0:=
+   sys-libs/zlib:=
+   !libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist] )
+   libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="${RDEPEND}
+   test? (
+   dev-cpp/benchmark
+   dev-cpp/gflags
+   )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}/use-pkg-config-to-find-re2.patch" )
+
+src_prepare() {
+   cmake_src_prepare
+
+   # un-hardcode libdir
+   sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
+   sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DgRPC_INSTALL=ON
+   -DgRPC_ABSL_PROVIDER=package
+   -DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
+   -DgRPC_CARES_PROVIDER=package
+   -DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+   -DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+   -DgRPC_PROTOBUF_PROVIDER=package
+

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2019-11-15 Thread Georgy Yakovlev 
commit: 7d234af969f1bd8037b498ddb44ceb2b516c68a9
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Nov 15 23:52:13 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Nov 16 00:20:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d234af9

net-libs/grpc: bump to 1.25.0

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Georgy Yakovlev  gentoo.org>

 net-libs/grpc/Manifest |   1 +
 .../grpc/files/grpc-1.25.0-pkgconfig-libdir.patch  |  17 
 net-libs/grpc/grpc-1.25.0.ebuild   | 112 +
 3 files changed, 130 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 1254f6798c1..c347eb0907d 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -7,3 +7,4 @@ DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B 
bed23af6606a69eb02a033d5dd6d92e3e080cc6
 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.25.0.tar.gz 16460163 BLAKE2B 
a581b1db459468e7c01af579da39cc111825931eee21d9af13833b1d65e448ee2024d86edb95e7acb705ad427f793d7911d6fb66418155e75f5e1f0e6116578a
 SHA512 
7d9e126eafdfefe9b5c2eacf9c082b972115f231a55cff53386305f2df68037e2593eedc3f27fe0eaeb7fbe78b28f6b87607cdeccf59929b9a9b33bf74ab5c92

diff --git a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch 
b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
new file mode 100644
index 000..28088713e5f
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
@@ -0,0 +1,17 @@
+--- a/Makefile 2018-05-28 17:59:34.631540261 +0800
 b/Makefile 2018-05-28 18:01:31.266936000 +0800
+@@ -460,11 +460,11 @@
+ CACHE_MK += HAS_PKG_CONFIG = true,
+ endif
+ 
+-CORE_PC_TEMPLATE = 
prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name:
 $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: 
-I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} 
$(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CORE_PC_TEMPLATE = 
prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name:
 $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: 
-I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} 
$(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+-CPP_PC_TEMPLATE = 
prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name:
 $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: 
-I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} 
$(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CPP_PC_TEMPLATE = 
prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name:
 $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: 
-I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} 
$(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+-CSHARP_PC_TEMPLATE = 
prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name:
 $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: 
-I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} 
$(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CSHARP_PC_TEMPLATE = 
prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name:
 $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: 
-I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} 
$(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+ ifeq ($(SYSTEM),MINGW32)
+ EXECUTABLE_SUFFIX = .exe

diff --git a/net-libs/grpc/grpc-1.25.0.ebuild b/net-libs/grpc/grpc-1.25.0.ebuild
new file mode 100644
index 000..0a1213a0a71
--- /dev/null
+++ b/net-libs/grpc/grpc-1.25.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2019-07-27 Thread Georgy Yakovlev 
commit: 904bf59fb19a2c1863d86f5f13c69823c538ac83
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Jul 27 09:06:41 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Jul 27 09:06:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904bf59f

net-libs/grpc: rename all patches

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev  gentoo.org>

 ...-pkgconfig-libdir.patch => grpc-1.11.0-pkgconfig-libdir.patch} | 0
 ...t-ar-handling.patch => grpc-1.13.0-fix-host-ar-handling.patch} | 0
 ...t-ar-handling.patch => grpc-1.21.0-fix-host-ar-handling.patch} | 0
 ...loop.patch => grpc-1.22.0-cxx_arg_list_too_long_forloop.patch} | 0
 ...n-t-run-ldconfig.patch => grpc-1.3.0-Don-t-run-ldconfig.patch} | 0
 net-libs/grpc/grpc-1.16.1.ebuild  | 6 +++---
 net-libs/grpc/grpc-1.17.1.ebuild  | 6 +++---
 net-libs/grpc/grpc-1.18.0.ebuild  | 6 +++---
 net-libs/grpc/grpc-1.19.0.ebuild  | 6 +++---
 net-libs/grpc/grpc-1.20.1-r1.ebuild   | 6 +++---
 net-libs/grpc/grpc-1.21.1-r1.ebuild   | 6 +++---
 net-libs/grpc/grpc-1.22.0.ebuild  | 8 
 12 files changed, 22 insertions(+), 22 deletions(-)

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
similarity index 100%
rename from net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
rename to 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
similarity index 100%
rename from net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
rename to net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch

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
similarity index 100%
rename from net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
rename to 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
similarity index 100%
rename from net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
rename to 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
similarity index 100%
rename from net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch
rename to net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch

diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
index f04778edda6..6ab28ceba67 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 2774a877762..a5959280313 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 2774a877762..a5959280313 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}/gr

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2019-07-13 Thread Georgy Yakovlev 
commit: 5ff24c4e16ffa9d4c145909ecd43dcd8b4830fc8
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Jul 14 01:01:00 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Jul 14 01:10:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff24c4e

net-libs/grpc: bump to 1.22.0

Closes: https://bugs.gentoo.org/688646
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev  gentoo.org>

 net-libs/grpc/Manifest |   1 +
 .../1.22.0-cxx_arg_list_too_long_forloop.patch |  44 
 net-libs/grpc/grpc-1.22.0.ebuild   | 112 +
 3 files changed, 157 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index daffd2305a6..72a57adaabc 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -10,5 +10,6 @@ DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B 
ec2992e3b80ca10f9d0250510930d4f2b5f7a95
 DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B 
b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7
 SHA512 
6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 
5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef
 SHA512 
e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f01d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
 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

diff --git a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch 
b/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
new file mode 100644
index 000..974d6fcc435
--- /dev/null
+++ b/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
@@ -0,0 +1,44 @@
+--- a/Makefile 2018-06-26 11:07:45.948160976 +0200
 b/Makefile 2019-06-26 11:04:25.798966336 +0200
+@@ -2820,13 +2820,15 @@
+ 
+ install-headers_c:
+   $(E) "[INSTALL] Installing public C headers"
+-  $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir 
$(h)) && ) exit 0 || exit 1
+-  $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) 
&& ) exit 0 || exit 1
++  $(Q) for h in $(PUBLIC_HEADERS_C); do \
++  $(INSTALL) -D $$h $(prefix)/$$h ; \
++  done
+ 
+ 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) for h in $(PUBLIC_HEADERS_CXX); do \
++  $(INSTALL) -D $$h $(prefix)/$$h ; \
++  done
+ 
+ install-static: install-static_c install-static_cxx
+ 
+--- a/templates/Makefile.template  2019-06-26 12:38:36.777292299 +0200
 b/templates/Makefile.template  2019-06-26 12:48:35.668550020 +0200
+@@ -1302,13 +1302,15 @@
+ 
+   install-headers_c:
+   $(E) "[INSTALL] Installing public C headers"
+-  $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir 
$(h)) && ) exit 0 || exit 1
+-  $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) 
&& ) exit 0 || exit 1
++  $(Q) for h in $(PUBLIC_HEADERS_C); do \
++  $(INSTALL) -D $$h $(prefix)/$$h ; \
++  done
+ 
+   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) for h in $(PUBLIC_HEADERS_

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2019-05-27 Thread Georgy Yakovlev 
commit: 0821706ecec5ef6e1d5d63597ade79fcc0715c07
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue May 28 04:46:19 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue May 28 04:52:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0821706e

net-libs/grpc: bump to 1.21.1

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev  gentoo.org>

 net-libs/grpc/Manifest |   1 +
 .../grpc/files/1.21.0-fix-host-ar-handling.patch   | 864 +
 net-libs/grpc/grpc-1.21.1.ebuild   | 112 +++
 net-libs/grpc/metadata.xml |   1 +
 4 files changed, 978 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 76c1f14d565..daffd2305a6 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -9,5 +9,6 @@ DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B 
ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c
 DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B 
ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120
 SHA512 
2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
 DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B 
b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7
 SHA512 
6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 
5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef
 SHA512 
e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f01d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
+DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B 
bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5
 SHA512 
b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B 
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
 SHA512 
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 
546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0
 SHA512 
1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839

diff --git a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch 
b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
new file mode 100644
index 000..174985097f4
--- /dev/null
+++ b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
@@ -0,0 +1,864 @@
+From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev 
+Date: Wed, 22 May 2019 23:04:28 -0700
+Subject: [PATCH] Makefile: fix host ar handling
+
+picked lines from
+https://github.com/grpc/grpc/pull/11476
+---
+ Makefile | 236 ---
+ 1 file changed, 119 insertions(+), 117 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 67495f2..e1c741c 100644
+--- a/Makefile
 b/Makefile
+@@ -346,6 +346,7 @@ HOST_CC ?= $(CC)
+ HOST_CXX ?= $(CXX)
+ HOST_LD ?= $(LD)
+ HOST_LDXX ?= $(LDXX)
++HOST_AR ?= $(AR)
+ 
+ CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
+ CXXFLAGS += -std=c++11
+@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS)
+ HOST_CXXFLAGS += $(CXXFLAGS)
+ HOST_LDFLAGS += $(LDFLAGS)
+ HOST_LDLIBS += $(LDLIBS)
++HOST_AROPTS = $(AROPTS)
+ 
+ # These are automatically computed variables.
+ # There shouldn't be any need to change anything from now on.
+@@ -2581,12 +2583,12 @@ $(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc: 
protoc_dep_error
+ $(GENDIR)/src/proto/grpc/channelz/channelz.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc: 
src/proto/grpc/channelz/channelz.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc: 
src/proto/grpc/channelz/channelz.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+   $(E) "[PROTOC]  Generating protobuf CC file from $<"
+   $(Q) mkdir -p `dirname $@`
+   $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/channelz/channelz.grpc.pb.cc: 
src/proto/grpc/channelz/channelz.proto 
$(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc $(PROTOBUF_DEP) 
$(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/channelz/channelz.grpc.pb.cc: 
src/proto/grpc/channelz/channelz.proto 
$(GENDIR)/src/proto/grpc

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2018-09-12 Thread Georgy Yakovlev 
commit: 7c3ea02725492bbb3d7ce9bdea1d4b44305c69d8
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Sep 12 18:38:44 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Sep 12 18:56:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c3ea027

net-libs/grpc: version bump to 1.15.0

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-libs/grpc/Manifest |   2 +
 .../files/grpc-1.15.0-fix-cpp-so-version.patch |  70 +
 net-libs/grpc/grpc-1.15.0.ebuild   | 173 +
 3 files changed, 245 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 2f11312e5db..565aa5cecfb 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -3,4 +3,6 @@ DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B 
d35706b553917d0f27e4474509f361ec7962b73
 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
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B 
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
 SHA512 
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 
546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0
 SHA512 
1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839

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
new file mode 100644
index 000..ba2ca651f0c
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
@@ -0,0 +1,70 @@
+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)
+

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2018-06-30 Thread Georgy Yakovlev 
commit: 20ebf5fa76c976d8ba2670277ee4c24e6cd3575c
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Jun 30 08:04:53 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Jun 30 08:06:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ebf5fa

net-libs/grpc: version bump to 1.13.0

Fix protobuf plugins not respecting CFLAGS

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-libs/grpc/Manifest |   1 +
 .../0001-grpc-1.13.0-fix-host-ar-handling.patch|  47 ++
 net-libs/grpc/grpc-1.13.0.ebuild   | 171 +
 3 files changed, 219 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index cd8bbcbf7ef..93ed53e4b94 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,3 +1,4 @@
 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 protobuf-3.5.2.tar.gz 4584659 BLAKE2B 
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
 SHA512 
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181

diff --git a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch 
b/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
new file mode 100644
index 000..926952f47f2
--- /dev/null
+++ b/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
@@ -0,0 +1,47 @@
+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/grpc-1.13.0.ebuild b/net-libs/grpc/grpc-1.13.0.ebuild
new file mode 100644
index 000..ff81aa55ff0
--- /dev/null
+++ b/net-libs/grpc/grpc-1.13.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,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="http://www.grpc.io";
+SRC_URI="
+   https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+   tools? ( 
https://g

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2018-06-11 Thread Jason Zaman 
commit: 3a42fbdae17de388d96fed660e15686b19473362
Author: Jason Zaman  gentoo  org>
AuthorDate: Tue Jun 12 06:52:14 2018 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Tue Jun 12 06:52:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a42fbda

net-libs/grpc: fix building with gcc8

Closes: https://bugs.gentoo.org/656166
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch   | 53 ++
 net-libs/grpc/grpc-1.12.1.ebuild   |  1 +
 2 files changed, 54 insertions(+)

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
new file mode 100644
index 000..a9168f165e1
--- /dev/null
+++ b/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
@@ -0,0 +1,53 @@
+--- a/tmp/alts_transport_security.cc.ORIG  2018-04-13 20:08:11.0 
+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.0 +0200
 b/src/core/ext/filters/client_channel/client_channel.cc2018-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.0 +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.0 +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(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(

diff --git a/net-libs/grpc/grpc-1.12.1.ebuild b/net-libs/grpc/grpc-1.12.1.ebuild
index 774c0518b1d..e57c672f483 100644
--- a/net-libs/grpc/grpc-1.12.1.ebuild
+++ b/net-libs/grpc/grpc-1.12.1.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${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() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

2018-06-11 Thread Jason Zaman 
commit: 5a5cce25d69125ae024db31aa2b8f37689876164
Author: Georgy Yakovlev  sysdump  net>
AuthorDate: Mon Jun 11 08:33:19 2018 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Tue Jun 12 06:33:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5cce25

net-libs/grpc: bump to 1.12.1, add python and more

Add python useflag and module installation.
Add tools useflag and grpc_tools installation.
Add google-perftools dep.
Add systemtap useflag to fix automagic dep.
Add doc useflag
Add examples useflag
Add myself to metadata, as discussed with perfinion

Closes: https://bugs.gentoo.org/590360

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/grpc/Manifest |   2 +
 .../0006-grpc-1.12.1-allow-system-openssl.patch|  65 +
 .../files/0007-grpc-1.12.1-allow-system-zlib.patch |  52 +++
 .../0008-grpc-1.12.1-allow-system-cares.patch  |  52 +++
 net-libs/grpc/grpc-1.12.1.ebuild   | 159 +
 net-libs/grpc/metadata.xml |  11 ++
 6 files changed, 341 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 99b7d82abd1..cd8bbcbf7ef 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1 +1,3 @@
 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 protobuf-3.5.2.tar.gz 4584659 BLAKE2B 
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
 SHA512 
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181

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
new file mode 100644
index 000..61fd830d64d
--- /dev/null
+++ b/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
@@ -0,0 +1,65 @@
+From 30ce693621d61efb8596503a0da212077a8c4daa Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold 
+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 @@
+   EXT