[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/

[Georgy Yakovlev]

commit:     4400448333c4b50ef50e89c5c984849c1f88f4ea
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 23:33:12 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 23:33:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44004483

net-libs/grpc: drop 1.28.1-r2, 1.32.0-r1

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-libs/grpc/Manifest                             |  2 -
 .../grpc/files/use-pkg-config-to-find-re2.patch    | 26 -------
 net-libs/grpc/grpc-1.28.1-r2.ebuild                | 72 ------------------
 net-libs/grpc/grpc-1.32.0-r1.ebuild                | 86 ----------------------
 4 files changed, 186 deletions(-)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index b436c49344c..32327daee54 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,4 +1,2 @@
-DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
-DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2

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
deleted file mode 100644
index 33712d62ef0..00000000000
--- a/net-libs/grpc/files/use-pkg-config-to-find-re2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1f51d47b0ab2c0ac54c27b54f5e8e79910138a02 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@g.o>
-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.28.1-r2.ebuild b/net-libs/grpc/grpc-1.28.1-r2.ebuild
deleted file mode 100644
index 92abfe8d56e..00000000000
--- a/net-libs/grpc/grpc-1.28.1-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-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:=
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires git checkouts of google tools
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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_CARES_PROVIDER=package
-		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
-		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
-		-DgRPC_PROTOBUF_PROVIDER=package
-		-DgRPC_SSL_PROVIDER=package
-		-DgRPC_ZLIB_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
-}

diff --git a/net-libs/grpc/grpc-1.32.0-r1.ebuild b/net-libs/grpc/grpc-1.32.0-r1.ebuild
deleted file mode 100644
index 4d48690285c..00000000000
--- a/net-libs/grpc/grpc-1.32.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc examples 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:=
-	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
-"
-
-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
-}