From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F086D1382C5 for ; Fri, 30 Apr 2021 18:11:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 234E6E0855; Fri, 30 Apr 2021 18:11:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0636CE0855 for ; Fri, 30 Apr 2021 18:11:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5431C340CD6 for ; Fri, 30 Apr 2021 18:11:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB383673 for ; Fri, 30 Apr 2021 18:11:50 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1619806291.67bb51f9fbd2de4ab9e68d9fc19cd0afcb9cb549.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/grpc/grpc-1.37.1-r1.ebuild net-libs/grpc/grpc-1.37.1.ebuild X-VCS-Directories: net-libs/grpc/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 67bb51f9fbd2de4ab9e68d9fc19cd0afcb9cb549 X-VCS-Branch: master Date: Fri, 30 Apr 2021 18:11:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 35020d44-5d16-4ea4-8140-7fb3152f2c42 X-Archives-Hash: 3ec794a54f3dcf6f108a0079903b6f19 commit: 67bb51f9fbd2de4ab9e68d9fc19cd0afcb9cb549 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Apr 30 18:08:24 2021 +0000 Commit: Georgy Yakovlev gentoo 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 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() {