Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/
Date: Fri, 30 Apr 2021 18:11:54
Message-Id: 1619806291.67bb51f9fbd2de4ab9e68d9fc19cd0afcb9cb549.gyakovlev@gentoo
1 commit: 67bb51f9fbd2de4ab9e68d9fc19cd0afcb9cb549
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 18:08:24 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 18:11:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67bb51f9
7
8 net-libs/grpc: revbump 1.37.1, add subslot, remove libressl flag
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 .../{grpc-1.37.1.ebuild => grpc-1.37.1-r1.ebuild} | 22 ++++++++++++++++++----
14 1 file changed, 18 insertions(+), 4 deletions(-)
15
16 diff --git a/net-libs/grpc/grpc-1.37.1.ebuild b/net-libs/grpc/grpc-1.37.1-r1.ebuild
17 similarity index 70%
18 rename from net-libs/grpc/grpc-1.37.1.ebuild
19 rename to net-libs/grpc/grpc-1.37.1-r1.ebuild
20 index c63c9674025..167a3087587 100644
21 --- a/net-libs/grpc/grpc-1.37.1.ebuild
22 +++ b/net-libs/grpc/grpc-1.37.1-r1.ebuild
23 @@ -12,19 +12,19 @@ HOMEPAGE="https://www.grpc.io"
24 SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
25
26 LICENSE="Apache-2.0"
27 -SLOT="0"
28 +# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
29 +SLOT="0/15.137"
30 KEYWORDS="~amd64 ~ppc64 ~x86"
31 -IUSE="doc examples libressl test"
32 +IUSE="doc examples test"
33
34 # look for submodule versions in third_party dir
35 RDEPEND="
36 =dev-cpp/abseil-cpp-20200923*:=[cxx17(+)]
37 >=dev-libs/re2-0.2021.04.01:=
38 + >=dev-libs/openssl-1.1.1:0=[-bindist]
39 >=dev-libs/protobuf-3.15.2:=
40 >=net-dns/c-ares-1.15.0:=
41 sys-libs/zlib:=
42 - !libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist] )
43 - libressl? ( dev-libs/libressl:0= )
44 "
45
46 DEPEND="${RDEPEND}
47 @@ -41,12 +41,26 @@ RESTRICT="test"
48
49 S="${WORKDIR}/${PN}-${MY_PV}"
50
51 +soversion_check() {
52 + local core_sover cpp_sover
53 + # extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION "1.37")'
54 + core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt | sed '/.*\"\(.*\)\".*/ s//\1/')"
55 + cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt | sed '/.*\"\(.*\)\".*/ s//\1/')"
56 + # remove dots, e.g. 1.37 -> 137
57 + core_sover="${core_sover//./}"
58 + cpp_sover="${cpp_sover//./}"
59 + [[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
60 + [[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
61 +}
62 +
63 src_prepare() {
64 cmake_src_prepare
65
66 # un-hardcode libdir
67 sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
68 sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
69 +
70 + soversion_check
71 }
72
73 src_configure() {