8 files changed, 137 insertions, 5 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5fc2bae7f6d4..8b05fbf51710 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest
index 4bd899c94600..1b9e9b814d8a 100644
--- a/net-libs/kdsoap-ws-discovery-client/Manifest
+++ b/net-libs/kdsoap-ws-discovery-client/Manifest
@@ -1,4 +1,6 @@
 AUX kdsoap-ws-discovery-client-0.2_pre20200317-no-install-docs.patch 467 BLAKE2B 1b972ba3ae3a6831d49c1c2986fae4ff75fa051964b1c39399b413d724c7c93fef6bc9e740a7e0f10860b64e228f1f18ad1f4836e887aec67d0b2addf7205892 SHA512 2370c1571dcee014b258f388a8a6401a331afc4a2ca0e3491e112ad686bc822cb780b155a1f74e4a8dbe315a65207cc22e088f2471ba621b645cc8e043829903
 DIST kdsoap-ws-discovery-client-0.2_pre20200927.tar.gz 37493 BLAKE2B c0dff21554bc56c4055c74a166a85186d67b0378f7bfbfcd3582ae7b992aaa71cefb6b794258fa07b37fcdd1d42ac2bf9fbfd7cd8142f8f77b1ba9791d683dae SHA512 86f8c4eee3fd484253ee91190092a9ae0dbd3d0c536ec25a6e3ec35be45d4a3d320cffbfc0ed2024d447788b43c9df88ca81181157720ce8942c9034d4eea49f
-EBUILD kdsoap-ws-discovery-client-0.2_pre20200927.ebuild 1277 BLAKE2B 79ac66953c04d73f5e9869cd94f1edc86664f1ee361a63a69699982ce0ffe3290ba56790a996353ebbc49dad6d89e32ab7d9b47ac387573e0a65564210dc2d99 SHA512 ba53cadc131be5465a56428cfa27e60b0664daf4d224806ea9727c15f19b6be6910dab5e49622bf2c194bead8ae1f60515e987ca75f4023b1c5473c2fb270338
-MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
+DIST kdsoap-ws-discovery-client-0.3.0.tar.xz 30948 BLAKE2B e8a9e0f0cb3eee9e942436b4a8d07d7b8ab6578fecd5b3d59aadee7af91268945c4b4c37619212fb0f54038de65d38b318c33717f3e0eff07b088a101a0d72c6 SHA512 24c437686fc7d6659f610d030b263cef33c35e4c4f4f8a750068d3b2dcd166142d32d21c3d15a14f6ec7eb87b28d883d1d1ba8e11497ea75a1328e29a256a5c8
+EBUILD kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild 1286 BLAKE2B e978f40eb31627f5bb1b040c26b0a559e49322251ec4d020891bd4e7ccc5b51de66880f57a513d2d6e94d54cd55b79987915090781da9b9f9a0c3e15424bf5b8 SHA512 875183c1a22535811e0deaaf96c2222c5146d2d22f4f2fb1bf6fb162f9d6f6162d75d58bb8356b0b0b8bce9c6a9caa163198d8528d09cbd6227812729d03e109
+EBUILD kdsoap-ws-discovery-client-0.3.0.ebuild 1103 BLAKE2B b7bdec5a36b215d13f94ea18b84405398c29f6d67f44fd25828cd354a84aa92e654576fc28929d2399eda0bb21247bc0a12ae4ae4b82947af261b22445f68c34 SHA512 e7ec3afc71d32e019dc083d796a24ff27fd7c86ed53aee9a024da511393a6852f75650e1536240e090bfc50ce6085a6770249a5b633ca0e9f455a498adf2bd8d
+MISC metadata.xml 355 BLAKE2B 837ce719b98553c8995bcf17d26eb6e6adb4679690029677487e14ae2026c4ad40ca1431a7133d026de65a27a74494b6be51dfa60e1e88dd06e3c86a55276a3d SHA512 138c43e593a78fa0983dd4d5abc1a32f50a33ef34f24adc45d64eb040eb30934325af7912f070348b4bd41cb1575f76740637100915f5baf1a45fc8bdcdf1972
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild
index 0076c30673a8..56cfe158fc12 100644
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,8 @@ RESTRICT="test"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5
-	>=net-libs/kdsoap-1.9.0:="
+	>=net-libs/kdsoap-1.9.0:=[qt5(+)]
+"
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qtxml:5 )
 "
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild
new file mode 100644
index 000000000000..96289b56c583
--- /dev/null
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+KFMIN=5.248.0
+inherit ecm kde.org
+
+DESCRIPTION="WS-Discovery client library based on KDSoap"
+HOMEPAGE="https://invent.kde.org/libraries/kdsoap-ws-discovery-client"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="CC0-1.0 GPL-3+"
+SLOT="0"
+IUSE="doc"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/qtbase:6[network]
+	>=net-libs/kdsoap-2.2.0[qt6]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qtbase:6[xml] )
+"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch )
+
+src_prepare() {
+	ecm_src_prepare
+	use test || ecm_punt_qt_module Xml
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package doc Doxygen)
+		-DBUILD_QCH=OFF # does not use ecm_add_qch from ECMAddQch
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	ecm_src_install
+}
diff --git a/net-libs/kdsoap-ws-discovery-client/metadata.xml b/net-libs/kdsoap-ws-discovery-client/metadata.xml
index 8641e5bdd399..d37afc46e13b 100644
--- a/net-libs/kdsoap-ws-discovery-client/metadata.xml
+++ b/net-libs/kdsoap-ws-discovery-client/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="kde-invent">libraries/kdsoap-ws-discovery-client</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
index ffa7a9bbcab3..9f50b30be687 100644
--- a/net-libs/kdsoap/Manifest
+++ b/net-libs/kdsoap/Manifest
@@ -1,3 +1,5 @@
 DIST kdsoap-2.1.1.tar.gz 948277 BLAKE2B 6daec26426bb6becc78400877ad221b929f0c30e45755644258eca864617d20b9d1269d8a964d38d40e9f5eb93ae213a95e05deb0a34dd3817261096178815a2 SHA512 12224f664dcae7ceb7395a7c3de48a208ae81c10f6fba4d0db233613472c6b9cdbea6375297c27b58fe7338d7db27a4447844f4e8f40a24ec1b4dd3fa38d20bb
+DIST kdsoap-2.2.0.tar.gz 11918875 BLAKE2B 0cce6af5ee08948d8029a2302174e0faa9cc06a7c813cb914a5395078a27b23d3c10ccc63f50831ecbd8f8958cb2eb5620b460d78cd6e63480e17580a331a8f9 SHA512 6ed5cd6a0d02a9faf6881facbd28391c553b3671512153ecd058ab53bfbe9d3f0afa3704d580e66010ddf6a3de7e578a632339f8c1ae7529c28f9d5fd7d1eb5f
 EBUILD kdsoap-2.1.1.ebuild 972 BLAKE2B bd9fbb53b5a1c2d85dc2b6e5e2b6cc91d226b159f17b86681a493d921bdba9ef899af1ea7ddcf6603a6ffbb56e5e890d0946218b380441d70ce6def9d7fe7b91 SHA512 dcebff4449f90bb3bd885c2ac6a2110b87c3d04b1543d04151796fcdab3e6cf8663057f0c1e557ad1bc9137c550eb42b65e26f044710e19e9ec247013e8d72cd
-MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
+EBUILD kdsoap-2.2.0.ebuild 1462 BLAKE2B c7198c2538727f26008e9e7b5fb68ebddddaf05362e3c18b9cb376ae053f3cfbdcd15227963775a08d8adac30df7b96ef9301e2c5a7835ac3734a2b5e1ef4255 SHA512 3606729f7d0ad7abc3849616c5e47488639b6cdba73b6e48c37a9cbbc9b89ec858c388dc84cf76037949975eae7cecfc39d9e252d9ce376da024c9a440d8d72c
+MISC metadata.xml 326 BLAKE2B c8d9770121ebd17e883891e2e101ddbe7ba0bd8c26b0fd6f3cd68069ad59f25e5407fff8c40781063c3d93902b29342e8f1e57b493194cf9d8bd08886deb7c26 SHA512 871bc07a24982421a397b0d53f51ecfc98a606bc276d98f20d6408e769c678dd39c925b86d5b393964937da97be2d4e3d6ff8a8a6df4848493a56aaacd999254
diff --git a/net-libs/kdsoap/kdsoap-2.2.0.ebuild b/net-libs/kdsoap/kdsoap-2.2.0.ebuild
new file mode 100644
index 000000000000..64e1ce941828
--- /dev/null
+++ b/net-libs/kdsoap/kdsoap-2.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+else
+	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
+	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
+	inherit git-r3
+fi
+inherit cmake multibuild
+
+DESCRIPTION="Qt-based client-side and server-side SOAP component"
+HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/"
+
+LICENSE="GPL-3 AGPL-3"
+SLOT="0/2"
+IUSE="+qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+	)
+	qt6? ( dev-qt/qtbase:6[network,xml] )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/install.*INSTALL_DOC_DIR/d" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DKDSoap_DOCS=OFF
+			-DKDSoap_EXAMPLES=OFF # no install targets
+			-DKDSoap_STATIC=OFF
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DKDSoap_QT6=ON )
+		else
+			mycmakeargs+=( -DKDSoap_QT6=OFF )
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/net-libs/kdsoap/metadata.xml b/net-libs/kdsoap/metadata.xml
index 8641e5bdd399..77493fa9cc4b 100644
--- a/net-libs/kdsoap/metadata.xml
+++ b/net-libs/kdsoap/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">KDAB/KDSoap</remote-id>
+	</upstream>
 </pkgmetadata>