5 files changed, 108 insertions, 7 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3d0b6b08e11a..87ec641ab1cd 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 9720b8fa899c..8cc6a0f8d6d5 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -12,5 +12,5 @@ DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
 DIST uw-imap_2007f~dfsg-7.debian.tar.xz 44960 BLAKE2B 836dfd9a5922cd3043278a89c87276c974c8e91c5831a94caef6e73b2839d246bda879f67bdad88ae59888b5dc8b6ca366aa48b6d197508cd10cdc68f1e7027f SHA512 3a903062c782c942d4c7a1122be686e301ea4d4c6f6ff1dbc78ae29c7ee7b8e02fb25a903401e6a7047ddccaf6bcceba953f6cad1c1890cd6410ea909b014af6
 EBUILD c-client-2007f-r8.ebuild 4682 BLAKE2B 112dc23a462b3bb2c6655e7a76250346de062dfa59edd0112c3bc410a1195f6e80e81d535c3bacd786b9c1965e2a60ba5464236e714d900390a30c7844214d20 SHA512 c076573cc0df3983119f0a0b30cf25206d2072091d7ba108b68681c4a3650cd5d726b468183c17ab429ac083ecf1cdbc248332d24830989d916a35d0997e9f05
-EBUILD c-client-2007f_p7.ebuild 4773 BLAKE2B 4066c62a8d663e8e8c9655c99cb2d2114bd2380ac6a15b0d48e9ea52a0d8cd4fa3bc996b1fc81bc407b80ea522f833bb5fcc36074fad51d0d6ecfadd71b9c386 SHA512 1855a5fa17bd33dc4c93c74d0ddbe559373de393b08c37df0baf5e7792491773b4407c7ecb85651bb24bbdbb7a05a669dc2addba1583b371d2d9b105f19ed671
+EBUILD c-client-2007f_p7.ebuild 4601 BLAKE2B 6cb4dfccfe02835ae8793d165dc01d285460ae82c1d9121d8bc8a642e507f5af2732f3cf98c49109b2ba692c6b51d8fb910f38cf83883b915e4e19d1fce0f67f SHA512 ae1c345a1e306722fef20ba804fef4d76c2cb4f98594c7d1d467d231aed7e516083692e86a66a405ecde8680991da1f3b596ac100168ed7cbd41936f7b3760a2
 MISC metadata.xml 481 BLAKE2B c10dea9f32197ea0f48c7d4c4de5d082640bbb424be1e8e371668bcaebfdbd878b21dbe1a43dda5d347f186874c119047485f27ea067495f2eb2d7fa7fbbdb5d SHA512 b153757f61ebba9aa79b1a57b52e3c5e7a3299c17f9ccb2b0f815b2799469c5b29dd4a598f923f9037c6804175f2014c2ec3803cd092a9b21f470b0e5e764c53
diff --git a/net-libs/c-client/c-client-2007f_p7.ebuild b/net-libs/c-client/c-client-2007f_p7.ebuild
index c3fd74b4a8a9..6182b543a4fb 100644
--- a/net-libs/c-client/c-client-2007f_p7.ebuild
+++ b/net-libs/c-client/c-client-2007f_p7.ebuild
@@ -8,20 +8,18 @@ inherit flag-o-matic libtool toolchain-funcs
 MY_PN=imap
 MY_P="${MY_PN}-${PV}"
 
-CHAPPA_PL=115
 DESCRIPTION="UW IMAP c-client library"
 HOMEPAGE="http://www.washington.edu/imap/"
 SRC_URI="
 	ftp://ftp.cac.washington.edu/imap/${MY_PN}-$(ver_cut 1-2).tar.Z
 	mirror://debian/pool/main/u/uw-${MY_PN}/uw-${MY_PN}_${PV/_p/"~dfsg-"}.debian.tar.xz
-	chappa? ( mirror://gentoo/${PN}-$(ver_cut 1-2)-chappa-${CHAPPA_PL}-all.patch.gz )
 "
 S="${WORKDIR}"/${MY_PN}-$(ver_cut 1-2)
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc +ipv6 kerberos pam ssl static-libs topal chappa"
+IUSE="doc +ipv6 kerberos pam ssl static-libs topal"
 
 RDEPEND="
 	ssl? (
@@ -55,12 +53,10 @@ PATCHES=(
 )
 
 src_prepare() {
-	use topal && PATCHES+=( "${FILESDIR}/${P}-topal.patch" )
+	use topal && PATCHES+=( "${FILESDIR}/${PN}-2007f-topal.patch" )
 
 	default
 
-	use chappa && eapply -p2 "${WORKDIR}/${P}-chappa-${CHAPPA_PL}-all.patch"
-
 	# Tarball packed with bad file perms
 	chmod -R u+rwX,go-w . || die "failed to fix permissions"
 
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 893644dc7ae8..3ebe888f4a76 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,3 +1,5 @@
 DIST grpc-1.43.0.tar.gz 8540919 BLAKE2B dc78026129a5d23e864c92a210e8de845a4bad886071a76d527730108da155d290612f1e54cec15d69f55713f37f377e6bff844b16b5deef64c7d8bb31195652 SHA512 e0471aa355d311a40c9d29d7101bf8e22b89ac675d4914c38e617d3213b61107487ef20ca80d7cff8093b548f4a976526298e1f32959ae6ce3c088d45ecc9781
+DIST grpc-1.51.1.tar.gz 8550112 BLAKE2B 83ba622222e941a6a0fa33f4878e9a10f4165d29ade36fb58201bc76dad9b075d1cc5474c2a8e48f63b63a7b2d0e169f58af88fff837973ae03315833f2c2eb7 SHA512 1bc8e7a5a15b2dca88527d111cde398b0dc1921bbc945c6df8225b4225b8ac0b43155bcf743230ce7b5962d1ab948e9363229c98a879b1befc7a939a290fb888
 EBUILD grpc-1.43.0.ebuild 2684 BLAKE2B 0ae8a6757682d3ef8861f6ca1f27462a4341b537a75b55b443746339102bc7ac76360b924e2f76a7032b28f0469bab8c1d0d3709f04376b43775698f5614da5b SHA512 e6cc2f3dda42631beb3356b3699a0ea337268fd9f80e2d51bba6a89b165e64835edbae14d6bb62094460f9a8a3c48489a72a070f8b37baa7223f3146e954431c
+EBUILD grpc-1.51.1.ebuild 2740 BLAKE2B 74a33f24de03dd03676ecb382d79d866b34e6f79f57f2a7661e66f2386eb0d24eb020c2ee20fb08242dcaf932d024d5598c64d7f4f4276c0c35c2f80f115db5b SHA512 f18096efce026a063a27847cf97c895931bdb42024d87c34bdc36bdbf53e328e60c68d58c41aebe4ebbe63c60cfc568a052faafb88061494869e167b1e28af47
 MISC metadata.xml 460 BLAKE2B 5cd969a5813d9d872d63cad0ebe0e02381cc8e97d0eb16ae9821f24de78c69f3670dfd6698388b17165d6a3c2029d213dd1f0e88ecda42215b0b3dfc64758657 SHA512 32148c45e964de16405ed7820c2066d5332f85047b3606f0189e9a306825b291478672dd108b0e1869086103e2f9a3a283b7a30379a883c79709cdf0fba18c4d
diff --git a/net-libs/grpc/grpc-1.51.1.ebuild b/net-libs/grpc/grpc-1.51.1.ebuild
new file mode 100644
index 000000000000..f3edebd3268c
--- /dev/null
+++ b/net-libs/grpc/grpc-1.51.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/29.151"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc examples test"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	=dev-cpp/abseil-cpp-20220623.1*:=
+	>=dev-libs/re2-0.2021.11.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+	>=dev-libs/protobuf-3.18.1:=
+	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@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+	# suppress network access, package builds fine without the submodules
+	mkdir "${S}/third_party/opencensus-proto/src" || 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_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
+}