diff --git a/dev-cpp/highway/highway-9999.ebuild b/dev-cpp/highway/highway-9999.ebuild
index 46b5278c37..9c990e08c4 100644
--- a/dev-cpp/highway/highway-9999.ebuild
+++ b/dev-cpp/highway/highway-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,6 @@ IUSE="test"
 
 DEPEND="test? ( dev-cpp/gtest )"
 
-PATCHES=( "${FILESDIR}/${PN}-shared-libraries.patch" )
 RESTRICT="!test? ( test )"
 
 src_configure() {
diff --git a/dev-libs/mtxclient/Manifest b/dev-libs/mtxclient/Manifest
index 2b6b53345f..819a159023 100644
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1 +1,2 @@
 DIST mtxclient-0.6.2.tar.gz 596675 BLAKE2B c796218849324222e94ecd82336f4bfed25f344c8d01f9de293f5220d43e9c3b2b3921dce5d0d9a0d850e85dcb2e2b74e26ab75000d1fa48601c433d646b90ba SHA512 91ac33b16fb2685f1aee3e76f3fe334a34e8403d11be8a065e10dac0181333131654f26886a8cf5b25ded1960010c06a259e7d2e5f195a28f7cc8041ca9dbff9
+DIST mtxclient-0.7.0.tar.gz 601042 BLAKE2B 05c390d7e3f48d5c02a74fb5783693d5380141b28738b064101f6aaa2fbddf30e0d4b95dc774e68fbad93c642592806d9417344fb9cdd6b01659ec874c3ba67f SHA512 fe015e6532a62fd1d1f5828c7aff08c181a4da1279afe54a502c09ba924a404099d23e74eb176841e774f67c6701e9c0ab666e239f486e4559aaea863ba8f5f9
diff --git a/dev-libs/mtxclient/mtxclient-0.7.0.ebuild b/dev-libs/mtxclient/mtxclient-0.7.0.ebuild
new file mode 100644
index 0000000000..a7a949bf13
--- /dev/null
+++ b/dev-libs/mtxclient/mtxclient-0.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
+HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
+SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}" # ABI may break even on patch version changes
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/olm
+	>=dev-libs/openssl-1.1.0
+	dev-libs/spdlog
+	>=dev-cpp/coeurl-0.1.1:=
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/0.6.0_remove_network_tests.patch"
+)
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DBUILD_LIB_TESTS="$(usex test)"
+		-DBUILD_LIB_EXAMPLES=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/net-im/nheko/Manifest b/net-im/nheko/Manifest
index 7ed0af0d58..4f9cc63f5b 100644
--- a/net-im/nheko/Manifest
+++ b/net-im/nheko/Manifest
@@ -1,2 +1,3 @@
 DIST nheko-0.9.0.tar.gz 1398941 BLAKE2B 353ac9a70282281ac9a9351df6f17e11ba06844b1116255ddf9a1135ecbfc5773ecf0e8a38944c398fb6d69db72d1819d8b86fb14ee69f4d0aed64f4b675b033 SHA512 277d322a2c5cf4631814bb57bf49e26bafdc0a048c17b821b02bbec19e9d12bff91697d307f5ebc2192e1fe0ebc394ba3342d4c3f0d4ad890d0aa9dc59c344a8
 DIST nheko-0.9.1.tar.gz 1374697 BLAKE2B 72ef8805c0fa59c4b5fa0a1c359028a19989003b61edf9e7ad714d7ee8006e4727c98b6acd3bea5ddafeaddde1ae6d323322d7dfaf146195ec084b0dfa482219 SHA512 a914265052e6c2e327f45ea490999ea2fd22dda3955117f7d92a13b56018bd2c6999318c730e0c03b0e62a5a692678d1655f5bc15e4947db8a3bb9c4cea90e73
+DIST nheko-0.9.2.tar.gz 1418814 BLAKE2B e3f2f9358dd39d648c219eddea93f48ff7574cd954189f6c08bc7ace0429602acd1b859bb4987b1a34c93e17f8e547f6b0fb3c2a113a3a8a060dec5e25adbcc5 SHA512 86c0b5bf8e767125cc9e78c3a898df35fae5b34277253c8c98777f1814fcab36ff558576fa5b71de05df63223a866671473674fb8250eeee905a979dd0c978a9
diff --git a/net-im/nheko/nheko-0.9.2.ebuild b/net-im/nheko/nheko-0.9.2.ebuild
new file mode 100644
index 0000000000..764dc346c5
--- /dev/null
+++ b/net-im/nheko/nheko-0.9.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature xdg
+
+DESCRIPTION="Native desktop client for Matrix using Qt"
+HOMEPAGE="https://github.com/Nheko-Reborn/nheko"
+SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X video voip"
+REQUIRED_USE="video? ( voip )"
+
+MY_GST_V="1.18"
+RDEPEND="
+	|| (
+		app-text/asciidoc
+		dev-ruby/asciidoctor
+	)
+	app-text/cmark
+	dev-cpp/qt-jdenticon
+	>=dev-db/lmdb++-1.0.0
+	>=dev-libs/mtxclient-0.7.0:=
+	>=dev-libs/qtkeychain-0.12.0
+	dev-libs/spdlog
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5[gif,jpeg,png]
+	dev-qt/qtimageformats
+	dev-qt/qtmultimedia:5[gstreamer,qml,widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsvg:5
+	voip? (
+		>=media-plugins/gst-plugins-dtls-${MY_GST_V}
+		media-plugins/gst-plugins-libnice
+		>=media-plugins/gst-plugins-meta-${MY_GST_V}[opus]
+		>=media-plugins/gst-plugins-srtp-${MY_GST_V}
+		>=media-plugins/gst-plugins-webrtc-${MY_GST_V}
+		video? (
+			>=media-libs/gst-plugins-base-${MY_GST_V}[opengl]
+			>=media-plugins/gst-plugins-meta-${MY_GST_V}[v4l,vpx]
+			>=media-plugins/gst-plugins-qt5-${MY_GST_V}
+			X? (
+				>=media-plugins/gst-plugins-ximagesrc-${MY_GST_V}
+				x11-libs/xcb-util-wm
+			)
+		)
+	)
+"
+DEPEND="
+	dev-cpp/nlohmann_json
+	${RDEPEND}
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+	local -a mycmakeargs=(
+		"-DVOIP=$(usex voip)"
+	)
+	if use video && use X; then
+		mycmakeargs+=("-DSCREENSHARE_X11=yes")
+	else
+		mycmakeargs+=("-DSCREENSHARE_X11=no")
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "audio & video file playback support" \
+			   "media-plugins/gst-plugins-meta[ffmpeg]"
+	optfeature "secrets storage support other than kwallet (gnome-keyring or keepassxc)" \
+			   "dev-libs/qtkeychain[gnome-keyring]"
+
+	xdg_pkg_postinst
+}
diff --git a/net-voip/discover-overlay/Manifest b/net-voip/discover-overlay/Manifest
index ec69008d0c..f7e0a997b7 100644
--- a/net-voip/discover-overlay/Manifest
+++ b/net-voip/discover-overlay/Manifest
@@ -1,2 +1,3 @@
 DIST discover-overlay-0.3.3.tar.gz 33364 BLAKE2B a29f64b42e93c88638a299922e17425e992dcb34fd64dc7c2e3bd3554fcb7c9c13b9b9b5937ba8c7b91d721512d2eace961b847f249b410580167321c8a333a9 SHA512 1e145b64d1d0ea4d094dc16fc7871d9177604fd72991c06c6067d08bb49c95b8b4e1e84121b61c6393ddd45bb307eb5796c8a83ce708e30ec2a93c9043e971a3
 DIST discover-overlay-0.4.0.tar.gz 49961 BLAKE2B 07661f72642712750f52538fe434a12fd6c8e9c3d782257c5356c893dc89799ff72a4b127f5bf742b4fc7853802e31a81314c924cf303cc8c7b7560a9de1a41f SHA512 a513cb9a9abbf4cf38aac3c5baac7aee9f2d6de5e33a18838a2add6a8f0913be828c8ea9fd4499f7a27a0b890522e19874851ff0de58aa6659293225bf91835b
+DIST discover-overlay-0.4.2.tar.gz 73860 BLAKE2B b6489112df1e1adc15d1ced37218a945858ba33376b1259b323cdcd9eec0ff60d9caaa8b233b8d6754f05b150a0c263d21e20a88a54ccdfa36cc47238ceb8acc SHA512 7ebd40dd910046ffc0dd915f20b20e6c7bb6acb9ec8b7b21fda8f53770c0fd4dc57dfb6840db94768e531337c042688b24fda4d0589a30ebb7262a8e32308e2d
diff --git a/net-voip/discover-overlay/discover-overlay-0.4.2.ebuild b/net-voip/discover-overlay/discover-overlay-0.4.2.ebuild
new file mode 100644
index 0000000000..1a7a39a4e8
--- /dev/null
+++ b/net-voip/discover-overlay/discover-overlay-0.4.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another Discord overlay for Linux written in Python using GTK3"
+HOMEPAGE="https://github.com/trigg/Discover"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pygobject-3.22[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/python-pidfile-3.0.0[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+"