From edf5ccafd57bbcc05ea15c14f705f3314a5cd55c Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 3 May 2024 13:28:59 +0200
Subject: [PATCH] qcoro, bump version, cleanup (#10408)

---
 dev-qt/qcoro/qcoro-0.5.1.recipe               | 128 ------------------
 ...5-0.9.0.recipe => qcoro_qt5-0.10.0.recipe} |   4 +-
 ...6-0.9.0.recipe => qcoro_qt6-0.10.0.recipe} |   4 +-
 3 files changed, 4 insertions(+), 132 deletions(-)
 delete mode 100644 dev-qt/qcoro/qcoro-0.5.1.recipe
 rename dev-qt/qcoro/{qcoro_qt5-0.9.0.recipe => qcoro_qt5-0.10.0.recipe} (95%)
 rename dev-qt/qcoro/{qcoro_qt6-0.9.0.recipe => qcoro_qt6-0.10.0.recipe} (96%)

diff --git a/dev-qt/qcoro/qcoro-0.5.1.recipe b/dev-qt/qcoro/qcoro-0.5.1.recipe
deleted file mode 100644
index a46c79476..000000000
--- a/dev-qt/qcoro/qcoro-0.5.1.recipe
+++ /dev/null
@@ -1,128 +0,0 @@
-SUMMARY="Coroutines for Qt"
-DESCRIPTION="The QCoro library provides set of tools to make use of C++20 coroutines with Qt."
-HOMEPAGE="https://github.com/danvratil/qcoro/"
-COPYRIGHT="2015-2022 The Qt Company Ltd."
-LICENSE="GNU LGPL v2.1
-	GNU LGPL v3"
-REVISION="1"
-SOURCE_URI="https://github.com/danvratil/qcoro/archive/refs/tags/v$portVersion.tar.gz"
-CHECKSUM_SHA256="49c996797d101d8152dcd5a35005c274770d75ef18eabff78c12cdfba36e6a8f"
-SOURCE_DIR="qcoro-$portVersion"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	qcoro$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_qt5="
-	qcoro${secondaryArchSuffix}_qt5 = $portVersion
-	devel:libQCoro5Core$secondaryArchSuffix
-	devel:libQCoro5Network$secondaryArchSuffix
-	"
-REQUIRES_qt5="
-	qcoro$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	"
-
-PROVIDES_qt6="
-	qcoro${secondaryArchSuffix}_qt6 = $portVersion
-	devel:libQCoro6Core$secondaryArchSuffix
-	devel:libQCoro6Network$secondaryArchSuffix
-	"
-REQUIRES_qt6="
-	qcoro$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix
-	lib:libQt6Core$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt6Core$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:g++$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:ninja
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	cmake . $cmakeDirArgs \
-		-B build_qt5 -S $sourceDir -G Ninja \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DQCORO_BUILD_EXAMPLES=OFF \
-		-DQCORO_WITH_QTDBUS=OFF \
-		-DUSE_QT_VERSION=5
-
-	ninja -C build_qt5 $jobArgs
-
-	cmake . $cmakeDirArgs \
-		-B build_qt6 -S $sourceDir -G Ninja \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DQCORO_BUILD_EXAMPLES=OFF \
-		-DQCORO_WITH_QTDBUS=OFF \
-		-DUSE_QT_VERSION=6
-
-	ninja -C build_qt6 $jobArgs
-}
-
-INSTALL()
-{
-	# Qt5 install
-	ninja -C build_qt5 install
-
-	mkdir -p $dataDir/Qt5
-	mv $prefix/mkspecs $dataDir/Qt5
-
-	#fix cmake file
-	sed "s|$libDir|$developLibDir|g" \
-		-i $libDir/cmake/QCoro5Core/QCoro5CoreTargets-release.cmake
-	sed "s|$libDir|$developLibDir|g" \
-		-i $libDir/cmake/QCoro5Network/QCoro5NetworkTargets-release.cmake
-
-	prepareInstalledDevelLibs libQCoro5Core libQCoro5Network
-
-	packageEntries qt5 \
-		$includeDir/qcoro5 \
-		$libDir/cmake/QCoro5 \
-		$libDir/cmake/QCoro5Core \
-		$libDir/cmake/QCoro5Coro \
-		$libDir/cmake/QCoro5Network \
-		$developLibDir/libQCoro5Core.a \
-		$developLibDir/libQCoro5Network.a \
-		$dataDir/Qt5/mkspecs
-
-	# Qt6 install
-	ninja -C build_qt6 install
-
-	mkdir -p $dataDir/Qt6
-	mv $prefix/mkspecs $dataDir/Qt6
-
-	#fix cmake file
-	sed "s|$libDir|$developLibDir|g" \
-		-i $libDir/cmake/QCoro6Core/QCoro6CoreTargets-release.cmake
-	sed "s|$libDir|$developLibDir|g" \
-		-i $libDir/cmake/QCoro6Network/QCoro6NetworkTargets-release.cmake
-
-	prepareInstalledDevelLibs libQCoro6Core libQCoro6Network
-
-	packageEntries qt6 \
-		$includeDir/qcoro6 \
-		$libDir/cmake/QCoro6 \
-		$libDir/cmake/QCoro6Core \
-		$libDir/cmake/QCoro6Coro \
-		$libDir/cmake/QCoro6Network \
-		$developLibDir/libQCoro6Core.a \
-		$developLibDir/libQCoro6Network.a \
-		$dataDir/Qt6/mkspecs
-}
diff --git a/dev-qt/qcoro/qcoro_qt5-0.9.0.recipe b/dev-qt/qcoro/qcoro_qt5-0.10.0.recipe
similarity index 95%
rename from dev-qt/qcoro/qcoro_qt5-0.9.0.recipe
rename to dev-qt/qcoro/qcoro_qt5-0.10.0.recipe
index f672b51b4..2162102fe 100644
--- a/dev-qt/qcoro/qcoro_qt5-0.9.0.recipe
+++ b/dev-qt/qcoro/qcoro_qt5-0.10.0.recipe
@@ -4,9 +4,9 @@ HOMEPAGE="https://github.com/danvratil/qcoro/"
 COPYRIGHT="2015-2022 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/danvratil/qcoro/archive/refs/tags/v$portVersion.tar.gz"
-CHECKSUM_SHA256="cfaf6b778450f06adac4ce5e353eb6eae213a3b62b8c8740520d58cf9fe3ec1a"
+CHECKSUM_SHA256="b7c8f00273ad27d85814bf4ec93eb6922c75656800a61d11854d36355a4a1aec"
 SOURCE_DIR="qcoro-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
diff --git a/dev-qt/qcoro/qcoro_qt6-0.9.0.recipe b/dev-qt/qcoro/qcoro_qt6-0.10.0.recipe
similarity index 96%
rename from dev-qt/qcoro/qcoro_qt6-0.9.0.recipe
rename to dev-qt/qcoro/qcoro_qt6-0.10.0.recipe
index 9085a4851..a83e6f71f 100644
--- a/dev-qt/qcoro/qcoro_qt6-0.9.0.recipe
+++ b/dev-qt/qcoro/qcoro_qt6-0.10.0.recipe
@@ -4,9 +4,9 @@ HOMEPAGE="https://github.com/danvratil/qcoro/"
 COPYRIGHT="2015-2022 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/danvratil/qcoro/archive/refs/tags/v$portVersion.tar.gz"
-CHECKSUM_SHA256="cfaf6b778450f06adac4ce5e353eb6eae213a3b62b8c8740520d58cf9fe3ec1a"
+CHECKSUM_SHA256="b7c8f00273ad27d85814bf4ec93eb6922c75656800a61d11854d36355a4a1aec"
 SOURCE_DIR="qcoro-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"