diff --git a/app-crypt/qca/qca2.3_qt5-2.3.8.recipe b/app-crypt/qca/qca_qt5-2.3.9.recipe
similarity index 72%
rename from app-crypt/qca/qca2.3_qt5-2.3.8.recipe
rename to app-crypt/qca/qca_qt5-2.3.9.recipe
index 2767d7df4..fe7797fb8 100644
--- a/app-crypt/qca/qca2.3_qt5-2.3.8.recipe
+++ b/app-crypt/qca/qca_qt5-2.3.9.recipe
@@ -9,17 +9,20 @@ application!"
 HOMEPAGE="http://delta.affinix.com/qca/"
 COPYRIGHT="2003-2015 Justin Karneges"
 LICENSE="GNU LGPL v2.1"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="http://download.kde.org/stable/qca/$portVersion/qca-$portVersion.tar.xz"
-CHECKSUM_SHA256="48759ca86a0202461d908ba66134380cc3bb7d20fed3c031b9fc0289796a8264"
+CHECKSUM_SHA256="c555d5298cdd7b6bafe2b1f96106f30cfa543a23d459d50c8a91eac33c476e4e"
 SOURCE_DIR="qca-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
-	qca2.3_qt5$secondaryArchSuffix = $portVersion
-	lib:libqca_qt5$secondaryArchSuffix = $portVersion compat >= 2
+	qca_qt5$secondaryArchSuffix = $portVersion
+	lib:libqca_qt5$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -35,36 +38,39 @@ REQUIRES="
 	lib:libssl$secondaryArchSuffix >= 3
 	lib:libssl3$secondaryArchSuffix
 	"
+REPLACES="
+	qca2.3_qt5$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	qca2.3_qt5${secondaryArchSuffix}_devel = $portVersion
-	devel:libqca_qt5$secondaryArchSuffix = $portVersion compat >= 2
+	qca_qt5${secondaryArchSuffix}_devel = $portVersion
+	devel:libqca_qt5$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	qca2.3_qt5$secondaryArchSuffix == $portVersion base
+	qca_qt5$secondaryArchSuffix == $portVersion base
 	"
 CONFLICTS_devel="
 	qca${secondaryArchSuffix}_devel
 	"
 
 PROVIDES_tools="
-	qca2.3_qt5${secondaryArchSuffix}_tools
+	qca_qt5${secondaryArchSuffix}_tools
 	cmd:mozcerts_qt5$secondaryArchSuffix = $portVersion
 	cmd:qcatool_qt5$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_tools="
-	qca2.3_qt5$secondaryArchSuffix == $portVersion
+	qca_qt5$secondaryArchSuffix == $portVersion
 	haiku$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix >= 3
 	devel:libgsasl$secondaryArchSuffix
 	devel:libnss3$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix >= 3
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -99,8 +105,8 @@ INSTALL()
 {
 	make -Cbuild install
 
-	prepareInstalledDevelLib libqca-qt5
-	fixPkgconfig
+	prepareInstalledDevelLib \
+		libqca-qt5
 
 	packageEntries tools \
 		$binDir \
@@ -115,6 +121,8 @@ INSTALL()
 
 TEST()
 {
-	# 96% tests passed, 1 tests failed out of 25
-	QCA_PLUGIN_PATH="$sourceDir/lib/qca" make -Cbuild test
+#	96% tests passed, 1 tests failed out of 25
+#	FAIL!  : FileWatchUnitTest::filewatchTest() 'spy.wait(2000)' returned FALSE. ()
+#	Loc: [/sources/qca-2.3.9/unittest/filewatchunittest/filewatchunittest.cpp(67)]
+	QCA_PLUGIN_PATH="$sourceDir/lib/qca" ctest --test-dir build --output-on-failure
 }
diff --git a/app-crypt/qca/qca2.3_qt6-2.3.8.recipe b/app-crypt/qca/qca_qt6-2.3.9.recipe
similarity index 69%
rename from app-crypt/qca/qca2.3_qt6-2.3.8.recipe
rename to app-crypt/qca/qca_qt6-2.3.9.recipe
index e80802bc6..02a548d41 100644
--- a/app-crypt/qca/qca2.3_qt6-2.3.8.recipe
+++ b/app-crypt/qca/qca_qt6-2.3.9.recipe
@@ -9,22 +9,25 @@ application!"
 HOMEPAGE="http://delta.affinix.com/qca/"
 COPYRIGHT="2003-2015 Justin Karneges"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://download.kde.org/stable/qca/$portVersion/qca-$portVersion.tar.xz"
-CHECKSUM_SHA256="48759ca86a0202461d908ba66134380cc3bb7d20fed3c031b9fc0289796a8264"
+CHECKSUM_SHA256="c555d5298cdd7b6bafe2b1f96106f30cfa543a23d459d50c8a91eac33c476e4e"
 SOURCE_DIR="qca-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
-	qca2.3_qt6$secondaryArchSuffix = $portVersion
-	lib:libqca_qt6$secondaryArchSuffix = $portVersion compat >= 2
+	qca_qt6$secondaryArchSuffix = $portVersion
+	lib:libqca_qt6$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	ca_root_certificates
-	lib:libcrypto$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix >= 3
 	lib:libnspr4$secondaryArchSuffix
 	lib:libnss3$secondaryArchSuffix
 	lib:libnssutil3$secondaryArchSuffix
@@ -34,41 +37,39 @@ REQUIRES="
 	lib:libQt6Core5Compat$secondaryArchSuffix
 	lib:libsmime3$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
-	lib:libssl3$secondaryArchSuffix
+	lib:libssl3$secondaryArchSuffix >= 3
+	"
+REPLACES="
+	qca2.3_qt6$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	qca2.3_qt6${secondaryArchSuffix}_devel = $portVersion
-	devel:libqca_qt6$secondaryArchSuffix = $portVersion compat >= 2
+	qca_qt6${secondaryArchSuffix}_devel = $portVersion
+	devel:libqca_qt6$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	qca2.3_qt6$secondaryArchSuffix == $portVersion base
-	"
-CONFLICTS_devel="
-	qca${secondaryArchSuffix}_devel
-	qca2.3_qt5${secondaryArchSuffix}_devel
+	qca_qt6$secondaryArchSuffix == $portVersion base
 	"
 
 PROVIDES_tools="
-	qca2.3_qt6${secondaryArchSuffix}_tools
+	qca_qt6${secondaryArchSuffix}_tools
 	cmd:mozcerts_qt6$secondaryArchSuffix = $portVersion
-	cmd:qcatool2$secondaryArchSuffix = $portVersion
 	cmd:qcatool_qt6$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_tools="
-	qca2.3_qt6$secondaryArchSuffix == $portVersion
+	qca_qt6$secondaryArchSuffix == $portVersion
 	haiku$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix >= 3
 	devel:libgsasl$secondaryArchSuffix
 	devel:libnss3$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Core5Compat$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix >= 3
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -92,8 +93,7 @@ BUILD()
 		-DQCA_PRIVATE_INCLUDE_INSTALL_DIR=$includeDir \
 		-DQCA_DOC_INSTALL_DIR=$docDir \
 		-DQCA_MAN_INSTALL_DIR=$manDir \
-		-DBUILD_TESTS=1 \
-		-DPKGCONFIG_INSTALL_PREFIX=$developLibDir/pkgconfig
+		-DBUILD_TESTS=1
 
 	make -Cbuild $jobArgs
 }
@@ -102,7 +102,8 @@ INSTALL()
 {
 	make -Cbuild install
 
-	prepareInstalledDevelLib libqca-qt6
+	prepareInstalledDevelLib \
+		libqca-qt6
 
 	packageEntries tools \
 		$binDir \
@@ -116,6 +117,8 @@ INSTALL()
 
 TEST()
 {
-	# 96% tests passed, 1 tests failed out of 25
-	QCA_PLUGIN_PATH="$sourceDir/lib/qca" make -Cbuild test
+#	96% tests passed, 1 tests failed out of 25
+#	FAIL!  : FileWatchUnitTest::filewatchTest() 'spy.wait(2000)' returned FALSE. ()
+#	Loc: [/sources/qca-2.3.9/unittest/filewatchunittest/filewatchunittest.cpp(67)]
+	QCA_PLUGIN_PATH="$sourceDir/lib/qca" ctest --test-dir build --output-on-failure
 }