12 files changed, 53 insertions, 438 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 303445c9a61a..74ca9740338e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index cdbb847acdcd..893644dc7ae8 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,9 +1,3 @@
-DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
-DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902
-DIST grpc-1.41.1.tar.gz 8346512 BLAKE2B fbb453f7ab398ac843b19922b7e3f71121bc9ba44b3e0c558796dc519dbbc5d34e31d1059bfa7552fefdd7c05d5a8b03645f5c5257e73126ba14a73bec0b1fb1 SHA512 17d4c0867a51e33c029bcce86371f8e1d4680ba78fe4f02fb63b8614e9c5f7f6078c22b7c56c63c6ff461429a70d2ec87cb3c0d30c897a88321fe7f26de6e052
 DIST grpc-1.43.0.tar.gz 8540919 BLAKE2B dc78026129a5d23e864c92a210e8de845a4bad886071a76d527730108da155d290612f1e54cec15d69f55713f37f377e6bff844b16b5deef64c7d8bb31195652 SHA512 e0471aa355d311a40c9d29d7101bf8e22b89ac675d4914c38e617d3213b61107487ef20ca80d7cff8093b548f4a976526298e1f32959ae6ce3c088d45ecc9781
-EBUILD grpc-1.38.1.ebuild 2731 BLAKE2B ca17d04e0ad895020cf096eb98dfe01e53c312e8afd0ae868ecb10012cfa1c06749dd0031489996f0d5e7367e4a2e579d713199a31372062cd4bfe62712e118c SHA512 23e9cd3479cf10dd80ae704eda03d9004143bffedc3458904840fd36801d0aa33be1027b2447da02f2f93ee1dbf11112aa7a43aaf5c71eff9632ef0bda862f4c
-EBUILD grpc-1.41.0.ebuild 2731 BLAKE2B bef8c072cc2ba43ead5fb71e4be67d25a5c67cacff38c2cdf095b4a7b8b8b140c4ef08d5afb6b6f5cc5357cf704f99ee55489e1b6bc393127b31afaf97133f8f SHA512 1e776f2f77bca939bd266b7b09dc17f3be1f1a94dfee7840883e8cc6549162b9a78e87c17fd77557cf1ca290c6bcdb9304f2a38aea489784a421a6165fbc4c70
-EBUILD grpc-1.41.1.ebuild 2729 BLAKE2B 37976ad98ac36165558f1bb4c834a9da8f74ca8c5720a983eed0945c1f1dc70e05b3471dc01c64a6fe1977801399ffc5eada1ee730e287f4b5ef8f1c86f1b95e SHA512 4f8e248f9b1105d92eb4b3d16e7b09c66e8e60e8b49e607cb593c2c91a64b6fd52e56c1c95fe62ba688ebe9b1d09cf4f4d75e30c5f92167af1055ac8a6e4ec4d
 EBUILD grpc-1.43.0.ebuild 2684 BLAKE2B 0ae8a6757682d3ef8861f6ca1f27462a4341b537a75b55b443746339102bc7ac76360b924e2f76a7032b28f0469bab8c1d0d3709f04376b43775698f5614da5b SHA512 e6cc2f3dda42631beb3356b3699a0ea337268fd9f80e2d51bba6a89b165e64835edbae14d6bb62094460f9a8a3c48489a72a070f8b37baa7223f3146e954431c
 MISC metadata.xml 460 BLAKE2B 5cd969a5813d9d872d63cad0ebe0e02381cc8e97d0eb16ae9821f24de78c69f3670dfd6698388b17165d6a3c2029d213dd1f0e88ecda42215b0b3dfc64758657 SHA512 32148c45e964de16405ed7820c2066d5332f85047b3606f0189e9a306825b291478672dd108b0e1869086103e2f9a3a283b7a30379a883c79709cdf0fba18c4d
diff --git a/net-libs/grpc/grpc-1.38.1.ebuild b/net-libs/grpc/grpc-1.38.1.ebuild
deleted file mode 100644
index d8cb707cf8aa..000000000000
--- a/net-libs/grpc/grpc-1.38.1.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 ~riscv ~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.41.0.ebuild b/net-libs/grpc/grpc-1.41.0.ebuild
deleted file mode 100644
index e9f7052206f3..000000000000
--- a/net-libs/grpc/grpc-1.41.0.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/19.141"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~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.17.3:=
-	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.41.1.ebuild b/net-libs/grpc/grpc-1.41.1.ebuild
deleted file mode 100644
index 94fa8a8a5f63..000000000000
--- a/net-libs/grpc/grpc-1.41.1.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/19.141"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~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.17.3:=
-	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/libomemo/Manifest b/net-libs/libomemo/Manifest
index 33d27024bb47..0862deea8cdb 100644
--- a/net-libs/libomemo/Manifest
+++ b/net-libs/libomemo/Manifest
@@ -1,8 +1,4 @@
 AUX libomemo-0.7.1-so-symlinks.patch 1055 BLAKE2B 9dac207e32fb339f52e25571eb3381f2486f5427857dd238f619a841b01db34c9b79708119724af7d2aad2fe5f285925e3be174350f934b166dd3a4794585052 SHA512 d7bf4c51fde4de7e478e44cbc63b8f90f2d6fc357d66ac5d8e8999f03e411257a392284944164d5dfa5388a191c1aba11b8d551c611403a026f1ed0dacdfbca6
-DIST libomemo-0.7.1.tar.gz 23770 BLAKE2B a3909650e399075f62026bd048a667a276a6cd7197ac18ddf9e3c12f57e5fd9cb2f5532ba69d0836af87e1415a5ffdc1746cf90a596dcf255265a64e921f039d SHA512 e5769dee4db7be246853e47e29ded9eefad2f62422951ce5dd0c1acee3bb92131c0423f09bc716be0f55fb02c747f07a6d5b2c656bdfeee0ee148252c51a1050
-DIST libomemo-0.8.0.tar.gz 25743 BLAKE2B 9b13aaaa21f16425fcecf963e187c5b686986e6bb01255c78042ea64e48d2c75a06729d1ad6e6b26d62d191e7d99305b7a8f1e07078221c6d14a12f587bf0743 SHA512 ff90de81928754f56bd2c6f3fcc83c13bb87d346e9bbedd6327bec33aab61a79061a709d541082723840205eb631b1a5493a43a5824e9e87e257d370692a606b
 DIST libomemo-0.8.1.tar.gz 28648 BLAKE2B b75ad298946dff680705ba0927293ea30cb8bf616a417c6584cef9f84e0894c5581462782a4b1003bf9e530695eea10bba9f37ae94e957a0008a35c862f17f62 SHA512 452c7ff9eb809de37df24bd0857c30c1e1ed1d4638c8338bb101f6d5a31be700f174f4fe65fb8ccd5358a674f8397a0eb54d8e03abfdce57cea60bcd4959f40a
-EBUILD libomemo-0.7.1-r2.ebuild 1084 BLAKE2B d257336bba275514d635cede0eb7abab6fefc1e007cf4b401905be77edecd2b7da012f23d1ccf1604daeca715d83f04cbe3c884a754de6ab23929f5e551e7eae SHA512 13ac6984937e4f5281435d8992b99708fbc7115f61c22393058285d346467bd60d45bd569c38cc3c99d8163b0e1167589a1739779b8ff8e9bd57432cdd5ed260
-EBUILD libomemo-0.8.0.ebuild 1035 BLAKE2B dbf36bd07e5f88bf339869dfb03362e445dde0ccc7fe14379a44c1064430c89472e469d824e583d099b6324e38482b66b9260274ccf25bb275310d4676a21fe2 SHA512 371134fddd152dd0bdfbc25abd4c27ccc3a5b23aee302f1b44ff43df43d5e0685cd1d362655e7529036e8ca18858ae3e01e5b7089f67cde3afaf16e5df4abaae
 EBUILD libomemo-0.8.1.ebuild 673 BLAKE2B 3db16d877f9c91ebeb297d4de50fae599e1f07cd8e74ca877efa6656eff27a2b678b95d63c6ea4e247ad1d232b7852aa9ff797a2efc6e7e71aca73beb5d135f1 SHA512 5bc140f0acc38d66024b42ad29ca4dd61eafd3ebff363579968fec4342541b41f57ae5473eddd567538abb52e9e270e3dc8a77b3af14da1b2fed7be0ff7b0766
 MISC metadata.xml 328 BLAKE2B b3ce945e525d09f5758e7f02ec7bd3fab1f2efe88c13978c39a35849878a024e06e6d241246e7f4b366a99e18db043eb3e9384e708549438f08a9f00fd463c93 SHA512 aec0c078f974d9048c6a7eb0d3af2f59bc77a3c1fc5da4b672b849729c11c282ea15e7fb5a3f15a6c84207bdca491cafd4fe4d044d60267b1e85eb3d8da16120
diff --git a/net-libs/libomemo/libomemo-0.7.1-r2.ebuild b/net-libs/libomemo/libomemo-0.7.1-r2.ebuild
deleted file mode 100644
index 38d49c0e3988..000000000000
--- a/net-libs/libomemo/libomemo-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementation of OMEMO (XEP-0384) in C"
-HOMEPAGE="https://github.com/gkdr/libomemo"
-SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib
-	dev-libs/libgcrypt
-	dev-libs/mxml
-	"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/cmocka )
-	"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-so-symlinks.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_compile() {
-	emake PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	# Respect libdir other than /usr/lib, e.g. /usr/lib64
-	local libdir="$(get_libdir)"
-	if [[ ${libdir} != lib ]]; then
-		mv "${D}"/usr/{lib,${libdir}} || die
-		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
-				-i "${D}/usr/${libdir}/pkgconfig/libomemo.pc" || die
-	fi
-
-	einstalldocs
-
-	if ! use static-libs ; then
-		rm "${D}/usr/${libdir}/libomemo.a" || die
-	fi
-}
diff --git a/net-libs/libomemo/libomemo-0.8.0.ebuild b/net-libs/libomemo/libomemo-0.8.0.ebuild
deleted file mode 100644
index 14c96fe495e2..000000000000
--- a/net-libs/libomemo/libomemo-0.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementation of OMEMO (XEP-0384) in C"
-HOMEPAGE="https://github.com/gkdr/libomemo"
-SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib
-	dev-libs/libgcrypt
-	dev-libs/mxml
-	"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/cmocka )
-	"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_compile() {
-	emake PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	# Respect libdir other than /usr/lib, e.g. /usr/lib64
-	local libdir="$(get_libdir)"
-	if [[ ${libdir} != lib ]]; then
-		mv "${D}"/usr/{lib,${libdir}} || die
-		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
-				-i "${D}/usr/${libdir}/pkgconfig/libomemo.pc" || die
-	fi
-
-	einstalldocs
-
-	if ! use static-libs ; then
-		rm "${D}/usr/${libdir}/libomemo.a" || die
-	fi
-}
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index 7b7d3fb61400..5f94a23f658c 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -1,6 +1,4 @@
-DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d
 DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf983611d353616d418f308711665aae287ff86697f7586f20f2c52ac028f9e5ad8b6d39c80876b263654c620a541812917b4f44 SHA512 19d892e13fac32022658de5eaf1db8cec3226f5f3f37a4c1c33bfa9653126ecbc6350a1ab5624025f909803c2277b86321dbea7f64e9932883cae57b65f58112
-EBUILD libsignal-protocol-c-2.3.2.ebuild 344 BLAKE2B e35cd34f3dcc70bd0d785614f3e90513983c1a84c3c06025a5e207f5a58a8ea8b560cf7bfec4a26b39d1a9a47cd8df6f769ef517c83ae8b6f0cbc6033b22d15d SHA512 34c3fff52a30eb6d6131088fbc2761543718a6cc57abeb75815e9f83ee119a51754eade44c78e1828749b98e3c0942dd17276963951ce72c31246c7902145662
 EBUILD libsignal-protocol-c-2.3.3.ebuild 346 BLAKE2B cfa3bb04e96f7fb558250e8c97da2dfcc5d066370aefd966e734303531e9527a8772365cfd593f904547f5d16ca98268f537fb14f45032fcf677f5fb4817dd3b SHA512 e1153a01732b51c103d8efc23ca49c2bc2292ed64d7d9fe04e8c65819a211a6f35f42e7b4ea971a503a5cc85c6803d45c2a828e266052ff6bbdc2df6d186c57a
 EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B 17b9baf64a60146c55a2b525493a265eb5070a20a31b4a0dffe24c86e8a720f60a47c06f09e4473dcb2585c0a6f612d2b4df4b47944e927afe84e8ce29ab668f SHA512 6443aef8035cdb162e1681e0547411a1a1e157fb994b89e3e06cc61ed8f01c62419e02a3108e38044688de604342ff48e59a779b3b163cd9984ce3bc3c594659
 MISC metadata.xml 659 BLAKE2B f4a2ca5360a22ee74952638cfe61ef8b2d3351c5838ba130b5344d2362f946b2bdda5b58b2ed887fa8c5d2425c3d431e9d954752e7c3c36e7f0ae4d66a5bf706 SHA512 681673e2b407848e5abefaeb39159e0fa950720d6dc47992a6d11cfd8bb4d121995d4b247789afebf953d327a632bbaceccdd862232dac7f256e0f787ee6da5e
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
deleted file mode 100644
index 9c40ea1f66c9..000000000000
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Signal Protocol C Library"
-HOMEPAGE="https://www.whispersystems.org/"
-SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64"
-
-LICENSE="GPL-3"
-SLOT="0"
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 445490f1d56b..aed1191d4faf 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,6 +1,8 @@
 DIST ngtcp2-0.10.0.tar.xz 582248 BLAKE2B 11c7153742657afc2df3b339e95e66e1ebc657ac251e6f1c742fb091277a4f3364e57322994f7a947e97cb0fdaa786fb48635e35b33346f1c04ef3f73d9a8128 SHA512 40ace3188ad53293df80a0f3fb144ced21897089026a18f90f45fe2aaa0d0f18ad184666a08d96263942573ed96ffa65b5f1837a008bd348a9c68c82e7508310
 DIST ngtcp2-0.11.0.tar.xz 583024 BLAKE2B 761f248a4f5e12f75d018f5285b894d8294edf102547306cb44498f97533b3e8929192c6c3a36671a4543536881b1471dd788aafe976da2efce191901af14923 SHA512 f652cb0189c485d3d007dda93f8441ea6d9a4f95d658ab763bd6d3e2e46985c0800e7fc3291c6fb4e07a0e5e0d4117d19631214a53f687f40913485182202057
+DIST ngtcp2-0.12.0.tar.xz 582996 BLAKE2B f1182e712ad68671fea3a588e4b2f09a815395ac6551eeaed5a734a3c3210f035d5b19a99a2ff5c296305de38b6bae7983b4ef5e595dadc651a6ae4d25497186 SHA512 805697fedb0dc9178fd5a8eac2ee63a9fdadda6e439e509a21544d3af5c2cca76acde7b53a4ec450eef1dff17c60d57468b5b8518103de50ba00039c969a481d
 EBUILD ngtcp2-0.10.0.ebuild 1151 BLAKE2B b19b8a3d2abce3da7738de9ad1e909e79a4180425a88cd84c997bce996903b2e54b9e0409436a02062113832f92b676d99d2c9044a0e8908d63d25d434644c1c SHA512 b145322af786475471032ba20ed0d1efd6c84913f444d29efc2ece1948305981b3491692945be8256be1d90852c4cbb54009d450cef9d7582ade8489bde999b0
 EBUILD ngtcp2-0.11.0.ebuild 1146 BLAKE2B 62bcad714d1c03ed2da4db9ade795ad571d42a1144038dcec2c4fdfdc1108d1167d6a68ac26b3d864583dd2f346d71644d14d93c53e07f04b10023fb88f3babd SHA512 51662787f1b891fc09e3c100fd388940dd10e1984ca117bac8e646f7a071fa169fbf3aa2abce41dbcf969c151ae6e31d530ca6d674ad647c54d1bd9835aa1433
+EBUILD ngtcp2-0.12.0.ebuild 1146 BLAKE2B 62bcad714d1c03ed2da4db9ade795ad571d42a1144038dcec2c4fdfdc1108d1167d6a68ac26b3d864583dd2f346d71644d14d93c53e07f04b10023fb88f3babd SHA512 51662787f1b891fc09e3c100fd388940dd10e1984ca117bac8e646f7a071fa169fbf3aa2abce41dbcf969c151ae6e31d530ca6d674ad647c54d1bd9835aa1433
 EBUILD ngtcp2-9999.ebuild 1146 BLAKE2B 62bcad714d1c03ed2da4db9ade795ad571d42a1144038dcec2c4fdfdc1108d1167d6a68ac26b3d864583dd2f346d71644d14d93c53e07f04b10023fb88f3babd SHA512 51662787f1b891fc09e3c100fd388940dd10e1984ca117bac8e646f7a071fa169fbf3aa2abce41dbcf969c151ae6e31d530ca6d674ad647c54d1bd9835aa1433
 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/ngtcp2-0.12.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.12.0.ebuild
new file mode 100644
index 000000000000..707656ab86a7
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.12.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~hppa ~riscv"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+		openssl? (
+			>=dev-libs/openssl-1.1.1:0=
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
+		-DENABLE_BORINGSSL=OFF
+		-DENABLE_PICOTLS=OFF
+		-DENABLE_WOLFSSL=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}