kdsoap_ws_discovery_client, bump version, add qt6 package, conflicts with qt5 package (#10412)

net-libs/kdsoap-ws-discovery-client/kdsoap_ws_discovery_client_qt5-0.4.0.recipe

@@ -7,11 +7,10 @@ HOMEPAGE="https://caspermeijn.gitlab.io/kdsoap-ws-discovery-client"
 COPYRIGHT="2019-2020 Casper Meijn"
 LICENSE="GNU GPL v3
 	CC0-1.0"
-REVISION="2"
+REVISION="1"
-srcGitRev="dcefb65c88e76f1f9eda8b0318006e93d15a0e1e"
+SOURCE_URI="https://download.kde.org/stable/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-$portVersion.tar.xz"
-SOURCE_URI="https://github.com/caspermeijn/kdsoap-ws-discovery-client/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="2cd247c013e75f410659bac372aff93d22d71c5a54c059e137b9444af8b3427a"
-CHECKSUM_SHA256="8b80ac16fe4b7a0c2cd319eaaa2fd2d03c8c01e15298f62c14574fe53925b8d8"
+SOURCE_DIR="kdsoap-ws-discovery-client-$portVersion"
-SOURCE_DIR="kdsoap-ws-discovery-client-$srcGitRev"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -23,11 +22,11 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="0.2"
+libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%.*}"
 
 PROVIDES="
-	kdsoap_ws_discovery_client$secondaryArchSuffix = $portVersion
+	kdsoap_ws_discovery_client_qt5$secondaryArchSuffix = $portVersion
 	lib:libKDSoapWSDiscoveryClient$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -40,18 +39,18 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	kdsoap_ws_discovery_client${secondaryArchSuffix}_devel = $portVersion
+	kdsoap_ws_discovery_client_qt5${secondaryArchSuffix}_devel = $portVersion
 	devel:libKDSoapWSDiscoveryClient$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	kdsoap_ws_discovery_client$secondaryArchSuffix == $portVersion base
+	kdsoap_ws_discovery_client_qt5$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	extra_cmake_modules$secondaryArchSuffix
 	devel:libkdsoap$secondaryArchSuffix
-	devel:libkdsoap_server$secondaryArchSuffix	
+	devel:libkdsoap_server$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Network$secondaryArchSuffix
 	devel:libQt5Xml$secondaryArchSuffix
@@ -59,7 +58,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix	
+	cmd:ld$secondaryArchSuffix
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
@@ -67,11 +66,10 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cmake -Bbuild S. $cmakeDirArgs \
+	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
 		-DBUILD_QCH=OFF
 	make -C build $jobArgs
 }
@@ -81,10 +79,17 @@ INSTALL()
 	make -C build install
 
 	# prepare develop/lib
-	prepareInstalledDevelLib libKDSoapWSDiscoveryClient
+	prepareInstalledDevelLib \
+		libKDSoapWSDiscoveryClient
 
 	# devel package
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
 }
+
+TEST()
+{
+	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
+	make -C build test
+}

net-libs/kdsoap-ws-discovery-client/kdsoap_ws_discovery_client_qt6-0.4.0.recipe

@@ -0,0 +1,99 @@
+SUMMARY="WS-Discovery client library based on KDSoap"
+DESCRIPTION="This project is trying to create a WS-Discovery client library \
+based on the KDSoap library. It uses modern C++ 11 and Qt 5. The initial \
+development is done for ONVIFViewer, a ONVIF camera viewer. However the \
+library is designed to be useful as a generic WS-Discovery client."
+HOMEPAGE="https://caspermeijn.gitlab.io/kdsoap-ws-discovery-client"
+COPYRIGHT="2019-2020 Casper Meijn"
+LICENSE="GNU GPL v3
+	CC0-1.0"
+REVISION="2"
+REVISION="1"
+SOURCE_URI="https://download.kde.org/stable/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-$portVersion.tar.xz"
+CHECKSUM_SHA256="2cd247c013e75f410659bac372aff93d22d71c5a54c059e137b9444af8b3427a"
+SOURCE_DIR="kdsoap-ws-discovery-client-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
+
+PROVIDES="
+	kdsoap_ws_discovery_client_qt6$secondaryArchSuffix = $portVersion
+	lib:libKDSoapWSDiscoveryClient$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libkdsoap_qt6$secondaryArchSuffix
+	lib:libkdsoap_server_qt6$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
+	lib:libQt6Xml$secondaryArchSuffix
+	"
+CONFLICTS="
+	kdsoap_ws_discovery_client_qt5$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	kdsoap_ws_discovery_client_qt6${secondaryArchSuffix}_devel = $portVersion
+	devel:libKDSoapWSDiscoveryClient$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	kdsoap_ws_discovery_client_qt6$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules$secondaryArchSuffix
+	devel:libkdsoap_qt6$secondaryArchSuffix
+	devel:libkdsoap_server_qt6$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Network$secondaryArchSuffix
+	devel:libQt6Xml$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:g++$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	cmake -Bbuild -S. $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_WITH_QT6=ON \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DBUILD_QCH=OFF
+	make -C build $jobArgs
+}
+
+INSTALL()
+{
+	make -C build install
+
+	# prepare develop/lib
+	prepareInstalledDevelLib \
+		libKDSoapWSDiscoveryClient
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$libDir/cmake
+}
+
+TEST()
+{
+	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
+	make -C build test
+}