public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/
Date: Fri, 30 Apr 2021 18:11:50 +0000 (UTC)	[thread overview]
Message-ID: <1619806291.67bb51f9fbd2de4ab9e68d9fc19cd0afcb9cb549.gyakovlev@gentoo> (raw)

commit:     67bb51f9fbd2de4ab9e68d9fc19cd0afcb9cb549
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 18:08:24 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 18:11:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67bb51f9

net-libs/grpc: revbump 1.37.1, add subslot, remove libressl flag

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../{grpc-1.37.1.ebuild => grpc-1.37.1-r1.ebuild}  | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/net-libs/grpc/grpc-1.37.1.ebuild b/net-libs/grpc/grpc-1.37.1-r1.ebuild
similarity index 70%
rename from net-libs/grpc/grpc-1.37.1.ebuild
rename to net-libs/grpc/grpc-1.37.1-r1.ebuild
index c63c9674025..167a3087587 100644
--- a/net-libs/grpc/grpc-1.37.1.ebuild
+++ b/net-libs/grpc/grpc-1.37.1-r1.ebuild
@@ -12,19 +12,19 @@ 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"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
+SLOT="0/15.137"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc examples libressl test"
+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:=
-	!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
 "
 
 DEPEND="${RDEPEND}
@@ -41,12 +41,26 @@ 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() {


             reply	other threads:[~2021-04-30 18:11 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-30 18:11 Georgy Yakovlev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-17 16:00 [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/ Sam James
2024-09-12 21:59 Sam James
2024-09-04  9:32 Sam James
2024-07-09 12:52 Sam James
2023-12-25 19:22 Conrad Kostecki
2023-08-21 18:22 Sam James
2023-08-21 17:31 Sam James
2023-08-21 17:31 Sam James
2023-08-21 17:31 Sam James
2023-08-21 16:35 Sam James
2023-08-21 15:23 Sam James
2023-05-26 20:21 Andreas Sturmlechner
2023-05-14  8:48 Sam James
2023-05-14  8:48 Sam James
2023-05-14  8:48 Sam James
2023-02-27  9:10 WANG Xuerui
2023-02-24 17:11 Arthur Zamarin
2023-02-20 21:29 Arthur Zamarin
2023-02-16  5:52 WANG Xuerui
2023-02-12 18:42 Jakov Smolić
2023-02-12 18:42 Jakov Smolić
2023-02-12 18:36 Jakov Smolić
2023-02-11  7:47 WANG Xuerui
2023-02-11  7:47 WANG Xuerui
2023-02-11  7:47 WANG Xuerui
2023-02-07  0:35 Georgy Yakovlev
2022-12-24 14:49 Andreas Sturmlechner
2022-12-20 23:57 Sam James
2022-10-27 23:46 Sam James
2022-10-20 10:52 Jakov Smolić
2022-08-17 21:13 Sam James
2021-12-20 12:09 Agostino Sarubbo
2021-12-20  9:20 Arthur Zamarin
2021-12-20  5:34 Georgy Yakovlev
2021-12-20  5:31 Georgy Yakovlev
2021-12-20  5:10 Georgy Yakovlev
2021-12-20  5:04 Georgy Yakovlev
2021-11-14  1:59 Georgy Yakovlev
2021-06-21 23:31 Georgy Yakovlev
2021-06-21 23:31 Georgy Yakovlev
2021-05-30  1:43 Georgy Yakovlev
2021-05-15  2:21 Sam James
2021-05-02 10:16 Mikle Kolyada
2021-04-29 23:35 Georgy Yakovlev
2021-04-29 11:46 Michał Górny
2021-04-29  8:29 Georgy Yakovlev
2020-04-24 20:02 Georgy Yakovlev
2020-04-23 16:27 Stefan Strogin
2020-04-20  7:28 Georgy Yakovlev
2020-02-22  1:30 Georgy Yakovlev
2020-01-17 10:22 Georgy Yakovlev
2020-01-17 10:22 Georgy Yakovlev
2019-12-22  3:28 Georgy Yakovlev
2019-10-26  0:11 Georgy Yakovlev
2019-08-17  3:00 Georgy Yakovlev
2019-08-17  3:00 Georgy Yakovlev
2019-08-17  3:00 Georgy Yakovlev
2019-08-17  3:00 Georgy Yakovlev
2019-07-27  9:07 Georgy Yakovlev
2019-07-27  9:07 Georgy Yakovlev
2019-07-27  9:07 Georgy Yakovlev
2019-07-27  9:07 Georgy Yakovlev
2019-07-27  9:07 Georgy Yakovlev
2019-07-27  9:07 Georgy Yakovlev
2019-05-31 19:26 Georgy Yakovlev
2019-05-28  6:49 Georgy Yakovlev
2019-05-07 19:00 Georgy Yakovlev
2019-05-07 19:00 Georgy Yakovlev
2019-04-30  4:42 Georgy Yakovlev
2019-02-27  4:20 Georgy Yakovlev
2019-01-16  0:52 Georgy Yakovlev
2019-01-16  0:52 Georgy Yakovlev
2018-12-15  6:00 Georgy Yakovlev
2018-12-10  4:50 Georgy Yakovlev
2018-11-15  3:21 Georgy Yakovlev
2018-11-15  3:21 Georgy Yakovlev
2018-07-16 19:32 Georgy Yakovlev
2018-07-15 22:20 Georgy Yakovlev
2018-07-15 22:20 Georgy Yakovlev
2018-07-15 22:20 Georgy Yakovlev
2018-07-08 15:29 Jason Zaman
2018-06-17  1:18 Georgy Yakovlev
2018-05-30 13:24 Jason Zaman
2018-05-30 13:24 Jason Zaman
2018-05-03  8:59 Jason Zaman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1619806291.67bb51f9fbd2de4ab9e68d9fc19cd0afcb9cb549.gyakovlev@gentoo \
    --to=gyakovlev@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox