From 205abec8c1e973a2d4a81e77af1a8da2c1971b98 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 6 Apr 2023 12:08:37 +0200
Subject: [PATCH] kdsoap, cleanup, use libVersionCompat (#8292)

---
 net-libs/kdsoap/kdsoap-2.0.0.recipe | 33 ++++++++++++-----------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/net-libs/kdsoap/kdsoap-2.0.0.recipe b/net-libs/kdsoap/kdsoap-2.0.0.recipe
index 446e0a412..b5ee57c69 100644
--- a/net-libs/kdsoap/kdsoap-2.0.0.recipe
+++ b/net-libs/kdsoap/kdsoap-2.0.0.recipe
@@ -10,14 +10,11 @@ KDSoap also supports writing SOAP servers easily.
 KD Soap targets C++ programmers who use Qt in their applications."
 HOMEPAGE="https://github.com/KDAB/KDSoap"
 COPYRIGHT="KDAB"
-LICENSE="
-	GNU GPL v3
-	GNU LGPL v3
-	"
-REVISION="1"
+LICENSE="GNU GPL v3
+	GNU LGPL v3"
+REVISION="2"
 SOURCE_URI="https://github.com/KDAB/KDSoap/releases/download/kdsoap-$portVersion/kdsoap-$portVersion.tar.gz"
 CHECKSUM_SHA256="d18963104fa6f7d02b044631cddbe78f18f70e06c607af680c7ace04d6cf04ee"
-SOURCE_DIR="kdsoap-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -29,11 +26,14 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	kdsoap$secondaryArchSuffix = $portVersion	
-	lib:libkdsoap$secondaryArchSuffix = $portVersion
-	lib:libkdsoap_server$secondaryArchSuffix = $portVersion
 	cmd:kdwsdl2cpp$commandSuffix = $portVersion
+	lib:libkdsoap$secondaryArchSuffix = $libVersionCompat
+	lib:libkdsoap_server$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -44,8 +44,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	kdsoap${secondaryArchSuffix}_devel = $portVersion
-	devel:libkdsoap$secondaryArchSuffix = $portVersion
-	devel:libkdsoap_server$secondaryArchSuffix = $portVersion
+	devel:libkdsoap$secondaryArchSuffix = $libVersionCompat
+	devel:libkdsoap_server$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	kdsoap$secondaryArchSuffix == $portVersion base
@@ -68,22 +68,17 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build
-	cd build
-
-	cmake .. $cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE=Release \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs
-
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
 	mv $dataDir/mkspecs/features $dataDir/Qt5/mkspecs
 	rm -rf $dataDir/mkspecs $docDir