diff --git a/dev-libs/quazip/quazip1-1.4.recipe b/dev-libs/quazip/quazip1_qt5-1.4.recipe
similarity index 64%
rename from dev-libs/quazip/quazip1-1.4.recipe
rename to dev-libs/quazip/quazip1_qt5-1.4.recipe
index 5ffdd5d4a..0321ed0fe 100644
--- a/dev-libs/quazip/quazip1-1.4.recipe
+++ b/dev-libs/quazip/quazip1_qt5-1.4.recipe
@@ -6,7 +6,7 @@ exactly the kind of tool you need."
 HOMEPAGE="https://github.com/stachenov/quazip"
 COPYRIGHT="2005-2020 Sergey A. Tachenov"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/stachenov/quazip/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="79633fd3a18e2d11a7d5c40c4c79c1786ba0c74b59ad752e8429746fe1781dd6"
 SOURCE_FILENAME="quazip1-v$portVersion.tar.gz"
@@ -19,32 +19,31 @@ libVersion="1.4.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	quazip1$secondaryArchSuffix = $portVersion
+	quazip1_qt5$secondaryArchSuffix = $portVersion
 	lib:libquazip1_qt5$secondaryArchSuffix = $libVersionCompat
-	lib:libquazip1_qt6$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	qt6_5compat$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt6Core$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+REPLACES="
+	quazip1$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	quazip1${secondaryArchSuffix}_devel = $portVersion
+	quazip1_qt5${secondaryArchSuffix}_devel = $portVersion
 	devel:libquazip1_qt5$secondaryArchSuffix = $libVersionCompat
-	devel:libquazip1_qt6$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	quazip1$secondaryArchSuffix == $portVersion base
+	quazip1_qt5$secondaryArchSuffix == $portVersion base
 	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt6Core$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	qt6_5compat${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
@@ -57,31 +56,24 @@ BUILD_PREREQUIRES="
 	cmd:qmake$secondaryArchSuffix >= 5
 	"
 
-defineDebugInfoPackage quazip1$secondaryArchSuffix \
-	"$libDir"/libquazip1-qt5.so.$libVersion \
-	"$libDir"/libquazip1-qt6.so.$libVersion
+defineDebugInfoPackage quazip1_qt5$secondaryArchSuffix \
+	"$libDir"/libquazip1-qt5.so.$libVersion
 
 BUILD()
 {
-	cmake -B build5 -S . \
-		$cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE=None
-	cmake --build build5
-
-	cmake -B build6 -S . \
+	cmake -B build -S . \
 		$cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=None \
-		-DQUAZIP_QT_MAJOR_VERSION=6
-	cmake --build build6
+		-DQUAZIP_ENABLE_TESTS=OFF
+	cmake --build build
 }
 
 INSTALL()
 {
-	make -C build5 install
-	make -C build6 install
+	make -C build install
 
 	# prepare develop/lib
-	prepareInstalledDevelLibs libquazip1-qt5 libquazip1-qt6
+	prepareInstalledDevelLib libquazip1-qt5
 	fixPkgconfig
 
 	# devel package
@@ -92,6 +84,6 @@ INSTALL()
 
 TEST()
 {
-	make -C build check
-	# There is no cmake compatible test.
+	# 0% tests passed, 1 tests failed out of 1
+	ctest --test-dir build --output-on-failure
 }
diff --git a/dev-libs/quazip/quazip1_qt6-1.4.recipe b/dev-libs/quazip/quazip1_qt6-1.4.recipe
new file mode 100644
index 000000000..563ec3f1c
--- /dev/null
+++ b/dev-libs/quazip/quazip1_qt6-1.4.recipe
@@ -0,0 +1,91 @@
+SUMMARY="C++ wrapper for Gilles Vollant's ZIP/UNZIP package"
+DESCRIPTION="QuaZIP is the C++ wrapper for Gilles Vollant's ZIP/UNZIP package (AKA Minizip) using \
+Trolltech's Qt library.
+If you need to write files to a ZIP archive or read files from one using QIODevice API, QuaZip is \
+exactly the kind of tool you need."
+HOMEPAGE="https://github.com/stachenov/quazip"
+COPYRIGHT="2005-2020 Sergey A. Tachenov"
+LICENSE="GNU LGPL v2.1"
+REVISION="2"
+SOURCE_URI="https://github.com/stachenov/quazip/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="79633fd3a18e2d11a7d5c40c4c79c1786ba0c74b59ad752e8429746fe1781dd6"
+SOURCE_FILENAME="quazip1-v$portVersion.tar.gz"
+SOURCE_DIR="quazip-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="1.4.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	quazip1_qt6$secondaryArchSuffix = $portVersion
+	lib:libquazip1_qt6$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Core5Compat$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+REPLACES="
+	quazip1$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	quazip1_qt6${secondaryArchSuffix}_devel = $portVersion
+	devel:libquazip1_qt6$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	quazip1_qt6$secondaryArchSuffix == $portVersion base
+	devel:libQt6Core$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Core5Compat$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:qmake6$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage quazip1_qt6$secondaryArchSuffix \
+	"$libDir"/libquazip1-qt6.so.$libVersion
+
+BUILD()
+{
+	cmake -B build -S . \
+		$cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=None \
+		-DQUAZIP_ENABLE_TESTS=OFF
+	cmake --build build
+}
+
+INSTALL()
+{
+	make -C build install
+
+	# prepare develop/lib
+	prepareInstalledDevelLib libquazip1-qt6
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$libDir/cmake
+}
+
+TEST()
+{
+	# 0% tests passed, 1 tests failed out of 1
+	ctest --test-dir build --output-on-failure
+}