gentoo resync : 04.05.2021

4 files changed, 111 insertions, 10 deletions

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index b8fef70f76ed..5c8a67231b19 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,6 +1,8 @@
 AUX use-pkg-config-to-find-re2.patch 730 BLAKE2B fb37a761c6aaf2ff00f3e9a6b791c58981ab9b5f16723a2057b83989fefc89496e9fa3d52260e221ba22142b7cd33d468fe4a63291308a0c7e8fcfbddfe3cdc7 SHA512 152ca478820d56065193cc47caedc00db17b069246f646546dc6e9ebb5d9023248ca6fc7a816bf2efd7a19e59309a1f0f6f4c508d80487b47e1e98734ecadf09
 DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
 DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed
-EBUILD grpc-1.28.1-r1.ebuild 1649 BLAKE2B feee01d962a31f7942b7673b9464f88542553ab8a4159cfac58e7158271979b13931d82cf19a7346d75b952637e16abc763904f4de239f44c4738ec67919c5b0 SHA512 533987b156f6dbd7f69c0eee45fd24de0f59ccd8babdcd0467d424137536a86afcb62584c3e6314e91f4e413c49f65faf9833f4940419b4bc5498016a0bc9e89
-EBUILD grpc-1.32.0.ebuild 1992 BLAKE2B d2d96a96e7b15e260c293ccbf91f9d146c29c7ed7e8051fe56f25fa9a3d1dcbd822c07b3868428b6a0bac76ac06347fb02590526801ea18b41aec06e94119efe SHA512 a77974e64742d830f1c26050c287efdadc625679eb2a758959652ac209b6ccefc56a2cb58ac70f91f755de110255ce464ad2e0290682dd8da95cb5b6f4e6e9cb
+DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
+EBUILD grpc-1.28.1-r1.ebuild 1589 BLAKE2B 8f45534c7e1f1ac0ac037a7a44279ba6919a15d0a4a1d587fad33e4d9ff12a3ace54488a9872d322fa0de22aa9ef934ee81ab17bdfa1edb76ea22e6e3ffb6be1 SHA512 de584b6dc05d75b1bca48adbbbbfb26a88e29287615dbdaa8e832eee097c1840763e1a71a119c49fd75e09209ed105d6edd250a739a93c4e5817cbc04d68d4bc
+EBUILD grpc-1.32.0.ebuild 1932 BLAKE2B b2c797c72c4e5c6da11a593ffc7a45d0d8b81ad24cbe3d778f813a676330e2620f5b12509fc94b4dc98af5e07bc24ff2cc0a76092e1a3416c968f2a82ceb06d9 SHA512 d895cb3981f6a0cf947e133aa0600c1e500a3d4a04899d13b3dcbe22f03dd7269b5530f13c8a2b15309e162bf828f980316ca9f9ee690a806c478e4a0c0a2cd0
+EBUILD grpc-1.37.1-r1.ebuild 2707 BLAKE2B 8259a6a1ab2869db83131e3dcdc57102cd70fde238224be2ded942a802b9824fbe3312983a4422d82cdefec69936d844ef69cf583bf9f5a305ebc7afc8b3a18d SHA512 e8a8c706f189654c49cfd83165afc023d4ea6bfaf430b66f9cc0673b411bf4cc3c7e80fe92ca39a790ebd9d73cc21ab441bd70adbba051bd5c9a3882fff90d5b
 MISC metadata.xml 459 BLAKE2B e12d07ea4d2ecbaec9babc586e2417f1267067aff89d67debc7b4d5cd954bdffdd08f1cac4dbadbcde4dbdbc05147eea60f1dde419d207601bba123dfa59222f SHA512 f6c5483cf4bef3919ce69ca03d28cac0967b2b25d40a3c6d921764f8e451e191b60c5c769ab7554f536564b6b5bd4cb89abcac925d3a87779b0da10f94539bbe
diff --git a/net-libs/grpc/grpc-1.28.1-r1.ebuild b/net-libs/grpc/grpc-1.28.1-r1.ebuild
index 3619635f8bca..f0cc36db8c2c 100644
--- a/net-libs/grpc/grpc-1.28.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.28.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,15 +14,14 @@ 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"
+IUSE="doc examples"
 
 DEPEND="
 	=dev-cpp/abseil-cpp-20200225*:=
 	>=dev-libs/protobuf-3.11.2:=
 	>=net-dns/c-ares-1.15.0:=
 	sys-libs/zlib:=
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
 "
 
 RDEPEND="${DEPEND}"
diff --git a/net-libs/grpc/grpc-1.32.0.ebuild b/net-libs/grpc/grpc-1.32.0.ebuild
index e76d53897806..e4306625c910 100644
--- a/net-libs/grpc/grpc-1.32.0.ebuild
+++ b/net-libs/grpc/grpc-1.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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"
+IUSE="doc examples test"
 
 RDEPEND="
 	=dev-cpp/abseil-cpp-20200225*:=
@@ -22,8 +22,7 @@ RDEPEND="
 	>=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= )
+	>=dev-libs/openssl-1.1.1:0=[-bindist]
 "
 
 DEPEND="${RDEPEND}
diff --git a/net-libs/grpc/grpc-1.37.1-r1.ebuild b/net-libs/grpc/grpc-1.37.1-r1.ebuild
new file mode 100644
index 000000000000..167a30875872
--- /dev/null
+++ b/net-libs/grpc/grpc-1.37.1-r1.ebuild
@@ -0,0 +1,101 @@
+# 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/15.137"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc examples test"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	=dev-cpp/abseil-cpp-20200923*:=[cxx17(+)]
+	>=dev-libs/re2-0.2021.04.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist]
+	>=dev-libs/protobuf-3.15.2:=
+	>=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_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)
+		-DCMAKE_CXX_STANDARD=17
+		$(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
+}