commit: f4a04a5c28a13f2d5453847701a43572c5847d8f Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Fri Sep 25 22:23:58 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Fri Sep 25 22:55:05 2020 +0000 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 <gyakovlev <AT> 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 00000000000..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 <[email protected]> +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 00000000000..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 + -DgRPC_RE2_PROVIDER=package + -DgRPC_SSL_PROVIDER=package + -DgRPC_ZLIB_PROVIDER=package + -DgRPC_BUILD_TESTS=$(usex test) + $(usex test '-DgRPC_GFLAGS_PROVIDER=package' '') + $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '') + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi + + if use doc; then + find doc -name '.gitignore' -delete || die + local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. ) + fi + + einstalldocs +}
