From b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Jun 2021 14:47:38 +0100 Subject: gentoo resync : 24.06.2021 --- net-libs/grpc/Manifest | 9 +- .../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 ----------------- net-libs/grpc/grpc-1.38.0-r1.ebuild | 102 --------------------- net-libs/grpc/grpc-1.38.1.ebuild | 102 +++++++++++++++++++++ 6 files changed, 104 insertions(+), 293 deletions(-) delete mode 100644 net-libs/grpc/files/use-pkg-config-to-find-re2.patch delete mode 100644 net-libs/grpc/grpc-1.28.1-r2.ebuild delete mode 100644 net-libs/grpc/grpc-1.32.0-r1.ebuild delete mode 100644 net-libs/grpc/grpc-1.38.0-r1.ebuild create mode 100644 net-libs/grpc/grpc-1.38.1.ebuild (limited to 'net-libs/grpc') diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index 8bd1144ed37e..4f9910a8955f 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,10 +1,5 @@ -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 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7 -DIST grpc-1.38.0.tar.gz 8296425 BLAKE2B 2a317dbb1ab79a508a301d84ac6aa858f62accf057453b1536900654376d1a1b19549bb1efa52c5f0916c08c3616e9d1cd2efb4f8143ea923633cfc4ed6e04fb SHA512 6ce37b4b87f08c227995f8c8a9649a3d9a4d8622458772f5f32552ff5b00b920a6e57ba7208c2e8f67eb2ee4f503378320866905863598d08e21b226aa0cd1c5 -EBUILD grpc-1.28.1-r2.ebuild 1592 BLAKE2B 027fffc731b0923ef9d60a9617f02796d312f601fa7620bbb7b0ce1b65b89bacd02c1b899f52e7dc6e6d9599b42e7f4f883256b2a70c1699cb7f175b1a6f79d7 SHA512 c7aa0fe04804855bbf01a5f682b6652d0e3f05e8869074e87f987b54738c76378f1fabf033717ec5bd68f2c9b375ebcae92650fce7affc1e19dd78dfb37e5606 -EBUILD grpc-1.32.0-r1.ebuild 1935 BLAKE2B 8bf2be0bd25092b7d6ab2ac0ff8b36555604496272ed249bb38f3ae808ec0e62db1018c9f5ccc4211bc191561982d5f6034c321596f9d87b6eb7ed114b2a9dc5 SHA512 c7d711a3c55e5768c29b522ebee1e26f0e332e62216a0744b9630ef4fc03f571e2b01d8c2a977f5b36526615375a0e78be1444f2610ec8ae0b847117f51a9cd5 +DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2 EBUILD grpc-1.37.1-r2.ebuild 2717 BLAKE2B 4b806690625388aa29ce60f40ba918ebacd2e384db9021913dc5e1c61575bc8c5a2382ffd38bc02af8e004a5f4ddd7daa70ba72636d1f0b04bab8f8588f8204e SHA512 e9d838e67b7c8554fc53d74f97b15c431364107b2f50b9459687bd1bb90fa6e3f68a9358fe347011809597da3c5cd39ff195719881e3af8265e9d5da83705b14 -EBUILD grpc-1.38.0-r1.ebuild 2724 BLAKE2B 94125171cf31eef783067a666977e7b853f4003bd3f3eb1dbc49735bbc43ca17cbfbfe3abe16096f74ba69251d547efa64c9d4664b472c685d07512291f8b7bb SHA512 d7e442e456c57a85b747029114a217275e0da072566aba189e885ed849ea1b5b69bb08bec7cd578ba7a298655d9b97a2eafede32087134f8b4c9ec80a7e36f08 +EBUILD grpc-1.38.1.ebuild 2724 BLAKE2B 94125171cf31eef783067a666977e7b853f4003bd3f3eb1dbc49735bbc43ca17cbfbfe3abe16096f74ba69251d547efa64c9d4664b472c685d07512291f8b7bb SHA512 d7e442e456c57a85b747029114a217275e0da072566aba189e885ed849ea1b5b69bb08bec7cd578ba7a298655d9b97a2eafede32087134f8b4c9ec80a7e36f08 MISC metadata.xml 459 BLAKE2B e12d07ea4d2ecbaec9babc586e2417f1267067aff89d67debc7b4d5cd954bdffdd08f1cac4dbadbcde4dbdbc05147eea60f1dde419d207601bba123dfa59222f SHA512 f6c5483cf4bef3919ce69ca03d28cac0967b2b25d40a3c6d921764f8e451e191b60c5c769ab7554f536564b6b5bd4cb89abcac925d3a87779b0da10f94539bbe 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 33712d62ef01..000000000000 --- 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 -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 92abfe8d56e3..000000000000 --- 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 4d48690285c7..000000000000 --- 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 -} diff --git a/net-libs/grpc/grpc-1.38.0-r1.ebuild b/net-libs/grpc/grpc-1.38.0-r1.ebuild deleted file mode 100644 index 6f34a08a4986..000000000000 --- a/net-libs/grpc/grpc-1.38.0-r1.ebuild +++ /dev/null @@ -1,102 +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" -# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt -SLOT="0/16.138" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="doc examples test" - -# look for submodule versions in third_party dir -RDEPEND=" - =dev-cpp/abseil-cpp-20210324*:= - >=dev-libs/re2-0.2021.04.01:= - >=dev-libs/openssl-1.1.1:0=[-bindist(-)] - >=dev-libs/protobuf-3.15.8:= - dev-libs/xxhash - >=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 -} diff --git a/net-libs/grpc/grpc-1.38.1.ebuild b/net-libs/grpc/grpc-1.38.1.ebuild new file mode 100644 index 000000000000..6f34a08a4986 --- /dev/null +++ b/net-libs/grpc/grpc-1.38.1.ebuild @@ -0,0 +1,102 @@ +# 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/16.138" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="doc examples test" + +# look for submodule versions in third_party dir +RDEPEND=" + =dev-cpp/abseil-cpp-20210324*:= + >=dev-libs/re2-0.2021.04.01:= + >=dev-libs/openssl-1.1.1:0=[-bindist(-)] + >=dev-libs/protobuf-3.15.8:= + dev-libs/xxhash + >=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 +} -- cgit v1.2.3