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 <gyakovlev@gentoo.org>

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index daffd2305a64d630d26303d7869c7d2c329e833e..72a57adaabc26f6831c43a28b401cc9213249d2d 100644 (file)
--- 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 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

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 (file)
index 0000000..974d6fc
--- /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_CXX); do \
++      $(INSTALL) -D $$h $(prefix)/$$h ; \
++      done
+ 
+   install-static: install-static_c install-static_cxx
+ 

diff --git a/net-libs/grpc/grpc-1.22.0.ebuild b/net-libs/grpc/grpc-1.22.0.ebuild
new file mode 100644 (file)
index 0000000..04e137d
--- /dev/null
+++ b/net-libs/grpc/grpc-1.22.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 flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+       >=dev-libs/openssl-1.0.2:0=[-bindist]
+       >=dev-libs/protobuf-3.7.0:=
+       >=net-dns/c-ares-1.15.0:=
+       sys-libs/zlib:=
+       perftools? ( dev-util/google-perftools:= )
+       systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+       "${FILESDIR}/1.21.0-fix-host-ar-handling.patch"
+       "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+       "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+       "${FILESDIR}/1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+       rm -r third_party/cares || die
+       sed -i 's:-Werror::g' Makefile || die
+       sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+       default
+}
+
+src_compile() {
+       tc-export CC CXX PKG_CONFIG
+
+       local myemakeargs=(
+               V=1
+               prefix=/usr
+               INSTALL_LIBDIR="$(get_libdir)"
+               AR="$(tc-getAR)"
+               AROPTS="rcs"
+               CFLAGS="${CFLAGS}"
+               CXXFLAGS="${CXXFLAGS}"
+               LD="${CC}"
+               LDXX="${CXX}"
+               STRIP=/bin/true
+               HOST_AR="$(tc-getBUILD_AR)"
+               HOST_CC="$(tc-getBUILD_CC)"
+               HOST_CXX="$(tc-getBUILD_CXX)"
+               HOST_LD="$(tc-getBUILD_CC)"
+               HOST_LDXX="$(tc-getBUILD_CXX)"
+               HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+               HAS_SYSTEMTAP="$(usex systemtap true false)"
+       )
+
+       emake "${myemakeargs[@]}"
+}
+
+src_install() {
+       local myemakeargs=(
+               V=1
+               prefix="${ED}"/usr
+               INSTALL_LIBDIR="$(get_libdir)"
+               STRIP=/bin/true
+       )
+
+       emake "${myemakeargs[@]}" install
+
+       use static-libs || find "${ED}" -name '*.a' -delete
+
+       if use examples; then
+               find examples -name '.gitignore' -delete || die
+               dodoc -r examples
+               docompress -x /usr/share/doc/${PF}/examples
+       fi
+
+       if use doc; then
+               find doc -name '.gitignore' -delete || die
+               local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+       fi
+
+       einstalldocs
+}
+
+pkg_postinst() {
+       local v
+       for v in ${REPLACING_VERSIONS}; do
+               if ver_test "${v}" -lt 1.16.0; then
+                       ewarn "python bindings and tools moved to separate independent packages"
+                       ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+               fi
+       done
+
+}