gentoo resync : 18.11.2019

3 files changed, 132 insertions, 0 deletions

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index e2ec7aec4198..c6f78b2531bb 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -6,6 +6,7 @@ AUX grpc-1.16.0-gcc8-fixes.patch 2323 BLAKE2B ef938aee88c894314313749e070e443462
 AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
 AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
 AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
+AUX grpc-1.25.0-pkgconfig-libdir.patch 2199 BLAKE2B 4625e03eeeab9235fa1615bdfc485a5a0f0304ce4613b3f0ec0d0edf0d12d04d48a34fd30e680ff48bc1a7a7838d1b1b51ce58921a20472b5be0ad60dbce23e2 SHA512 93077a0cd6fd48694238b42fc60c2c986232ff863b09d068aac3f813733de5a7b4d3ac32929ad4e58e93e2990d5903cdf0b7491a0ea924402262d04b75fdb57a
 AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
 DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d
 DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
@@ -16,6 +17,7 @@ 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
 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
@@ -25,4 +27,5 @@ EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056
 EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0
+EBUILD grpc-1.25.0.ebuild 2546 BLAKE2B c821d0232ec9ab111eafe4f5227fe694aac651459aa3acf17770482ef89931bb4779b2e1e4ca2e28da930f41b3754a28f814e10ef400d93dc87b024bdb56d620 SHA512 b8620d5390348ccf26637edd08f7f2b3d81d66d4fb8328d9c19d5dd58a213fbbec969325df7ac0693368bf06cc8803cf261fae3da9c6b23bdc0c978906f58c50
 MISC metadata.xml 737 BLAKE2B de7262f1cccfe21d55f3ae0f744e067d54912995520b46b9fd3107abfed3c057082f91854f4bc4c399606a31200f0f2da468218b1d677de1aca1155532395d60 SHA512 dbc3dc0370c809f0ea1ad5f88dcef44b0ca5a2bbde47606acf85ec6149892f19990608da9b5fd4417e77a5b565a34fc481a9c7b27b00e11a5c0015ef04800a7c
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 000000000000..28088713e5f8
--- /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 000000000000..0a1213a0a715
--- /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 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 ~ppc64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.8.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.25.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}"
+
+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
+
+}