8 files changed, 117 insertions, 63 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 19de91adcac7..084b1ab05924 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libomemo-c/Manifest b/net-libs/libomemo-c/Manifest
new file mode 100644
index 000000000000..7e21909e5a4b
--- /dev/null
+++ b/net-libs/libomemo-c/Manifest
@@ -0,0 +1,3 @@
+DIST libomemo-c-0.5.0.tar.gz 260987 BLAKE2B 68a2e7488e1f079e32ed16124fc73e84f28e1140c96e19e60accde3e1434e4bfea0d3323c7550b2dc4bf55ad493d9353e284486920375c2efc32a1b51f0965bf SHA512 2661ba0dea3eea308b1b71f1b46d7b8445fbe940bf52cc35f22eed110acdb8ee457841c1978e0fe9a53b9d9856c60d70c7f8f98ac182214c0ffb9ec3983240f0
+EBUILD libomemo-c-0.5.0.ebuild 627 BLAKE2B d1238d34f0a4cd1e02c493b858dcb236f82cf0398dd9b2fd5edfcd48f945bec5ab058bc3ca79a6cf67a3e4b4c5a1ea3c82bbc1bec736c5c0b669da2df75d555f SHA512 42b64db9405fd78411d36695b5d2ba2e511d899d5e9f615d3b4a5a90d3817ca4a65ee08838525be30af19a91c076ae04ef70acbe5ea0af6126d11a1273949209
+MISC metadata.xml 611 BLAKE2B 9e40e842acf2cd53212531e9e4a3c072458d2a62ab9f5cd9a5fee2d5cd46493bce808cde85ecad18ea21aa5a7b0732a634b855c75ba4d577dd1876530c9671f6 SHA512 b417961b9a81c1d63d1efeb54ba010f297ae226fbd886970e9258dcf22eec63f390e281d14ca6cc8689e2d9c6461aff7c5f502f8635416c9bb86a24d5a76fd6c
diff --git a/net-libs/libomemo-c/libomemo-c-0.5.0.ebuild b/net-libs/libomemo-c/libomemo-c-0.5.0.ebuild
new file mode 100644
index 000000000000..fe4aef013c8a
--- /dev/null
+++ b/net-libs/libomemo-c/libomemo-c-0.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="XMPP fork of Signal Protocol C Library supporting XEP-0384 OMEMO"
+HOMEPAGE="https://github.com/dino/libomemo-c/"
+SRC_URI="https://github.com/dino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-1 GPL-3 ISC"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/protobuf-c:="
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/check
+		dev-libs/openssl
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/libomemo-c/metadata.xml b/net-libs/libomemo-c/metadata.xml
new file mode 100644
index 000000000000..f21f02d1d3a5
--- /dev/null
+++ b/net-libs/libomemo-c/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna Vyalkova</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dino/libomemo-c</remote-id>
+		<bugs-to>https://github.com/dino/libomemo-c/issues</bugs-to>
+		<doc>https://github.com/dino/libomemo-c/blob/master/README.md</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 6fca2f90577a..8da12a8cf89e 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,4 +1,5 @@
 DIST qxmpp-1.4.0.tar.gz 313356 BLAKE2B a3a5c5cf3b16c319a6eddb3808f22af946040945eb8e66a641fe3117217b04eaf4e2b88dab8fa9cd2a3034d54884e1fa3563b0e775660645a5bdd6045469f9a5 SHA512 5a0cb72899314e47846b8b47340738df20a8d198c2db8cfe38c2cc31615166e9d86c6aaf6931be16078b2f9decca2d767497ad32e1d6dd0f6af888406c33fee9
+DIST qxmpp-1.5.5.tar.gz 606405 BLAKE2B 999dfcaa601f1d79df97febcd63bfcdcce87de9c0e68db6c1253407c89414003f326011a9a5e366031f78ddae084d06f04851ab3f4573ee53c59567770ae0edc SHA512 39774655fdb87dc54f32f7a018d4964c9ff8e9bebedd9cc94e6ad41288bd67365eec524525de09c5a3d2ea274e418fc6d5497ac2c1927946154cadaf7fc0d655
 EBUILD qxmpp-1.4.0.ebuild 1133 BLAKE2B 936b17149560dfa68abe80af3890db7ac7ca799b89f05d47b89734bf0e53f528e9503c28db6a39684e3d06155fdc93022282ecc65eb810298720f661b0faefdf SHA512 76cc4a6250823c71a4b9f1522877f57035fe0e41a87329bc1deda15dccd71e26d055ffbd406344256545c610ef77929f08567f9861b78996cc5b4b18283ae3e7
-EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
-MISC metadata.xml 741 BLAKE2B 104cc4e50ee039c49589746a4de7e075a561fc329c64435f0701d6e1cc59d24ad6d58a3ed056a503308d1b95757b170f5b485181f84c9943e12ed190f2791ab6 SHA512 b07d41c1341aeb7164c686c9d04878d185a3744b4f0e8b2ce4c8db370b74becd065eb0546c574a547865913def6997022bc90d9f83e0c4bf896f09d568f9cc3b
+EBUILD qxmpp-1.5.5.ebuild 1175 BLAKE2B 912296b8abeccb77788730de2944fef9751ea3dbe3d17ae66a62521a835a340b799513492bfebe76512bf4851438d90e350fad94c2fed9abd3ab7bcd04ced1e5 SHA512 7db3743ddc16c495e79c4752dc52eb0f29b28cb318a528ac3d5636fdbe2070200dc9beccc5e69154a695003e8c8d5de12c11fc9002c5c7ab71c27e403ae445af
+MISC metadata.xml 837 BLAKE2B 2578fe8e8306bdd4b82156d044366b9a379db45e86ed74948cc8e6984e7c4cdbf04933997d33f89f6bf1d5c4bc674d2d87ad146f941946bc030eb72deadb1b2e SHA512 06a87a926edf2a76cfb5c7228a19608475580a703716a1404becf13e1dfc7238b61c633c47c97f0ea9cdfd1efb203869a1b6b41304bc8c6876057768799c210f
diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
index 1af484a2057c..edf4f5064436 100644
--- a/net-libs/qxmpp/metadata.xml
+++ b/net-libs/qxmpp/metadata.xml
@@ -5,16 +5,20 @@
 		<email>0xd34df00d@gmail.com</email>
 		<name>Georg Rudoy</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna Vyalkova</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/qxmpp-project/qxmpp/issues</bugs-to>
-		<changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG</changelog>
+		<changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG.md</changelog>
 		<remote-id type="github">qxmpp-project/qxmpp</remote-id>
 	</upstream>
 	<use>
-		<flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
+		<flag name="omemo">Enable OMEMO encryption</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/qxmpp/qxmpp-1.5.5.ebuild b/net-libs/qxmpp/qxmpp-1.5.5.ebuild
new file mode 100644
index 000000000000..8f2dfc6cee67
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-1.5.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="https://github.com/qxmpp-project/qxmpp"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gstreamer omemo test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtxml:5
+	gstreamer? ( media-libs/gstreamer )
+	omemo? (
+		app-crypt/qca:2[qt5(+)]
+		net-libs/libomemo-c
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_INTERNAL_TESTS=$(usex test)
+		-DBUILD_OMEMO=$(usex omemo)
+		-DWITH_QCA=$(usex omemo)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DQT_VERSION_MAJOR=5
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# require network connection, bug #623708
+		-E "tst_(qxmpptransfermanager|qxmppiceconnection)"
+	)
+
+	cmake_src_test
+}
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
deleted file mode 100644
index 453364d6055c..000000000000
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 cmake
-
-DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
-HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
-EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug doc opus +speex test theora vpx"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtxml:5
-	opus? ( media-libs/opus )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	vpx? ( media-libs/libvpx:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	# requires network connection, bug #623708
-	sed \
-		-e "/qxmppiceconnection/d" \
-		-e "/qxmppserver/d" \
-		-e "/qxmpptransfermanager/d" \
-		-i tests/CMakeLists.txt \
-		|| die "failed to drop certain network tests"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_INTERNAL_TESTS=$(usex test)
-		-DWITH_OPUS=$(usex opus)
-		-DWITH_SPEEX=$(usex speex)
-		-DWITH_THEORA=$(usex theora)
-		-DWITH_VPX=$(usex vpx)
-	)
-
-	cmake_src_configure
-}