gentoo resync : 14.07.2019

3 files changed, 159 insertions, 0 deletions

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 6f829083fd70..97fbf6db2a2b 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -9,6 +9,7 @@ AUX 0007-grpc-1.12.1-allow-system-zlib.patch 2069 BLAKE2B 60b70714eca54ba0befffd
 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.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
@@ -25,6 +26,7 @@ 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
 EBUILD grpc-1.12.0.ebuild 1533 BLAKE2B 8b5808b767a779c2e9d5baf53ba27e76ea78aa8433acf1b5c3254db134efbf82c0166963e9182111b1bd6dafdab8b7f6c66066e20676bf208aedb4b1286143e1 SHA512 2beaf3a5f7309fb756d3c90fa8444337fcea15ed7cc65adbce7951602a96e9d29d9389b540c5d92e6d4ef209b25b99b76328a52de7aef36b6c543bed10506017
@@ -39,4 +41,5 @@ EBUILD grpc-1.18.0.ebuild 2444 BLAKE2B bdd53da589d3bc782d30084c550f1a862d04e47e7
 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
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 000000000000..974d6fcc4351
--- /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
index 000000000000..04e137d8d78c
--- /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
+
+}