11 files changed, 72 insertions, 348 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4f087cbd25c4..11805b72102b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cxxopts/Manifest b/dev-libs/cxxopts/Manifest
index 89663a433f4e..638154b9402b 100644
--- a/dev-libs/cxxopts/Manifest
+++ b/dev-libs/cxxopts/Manifest
@@ -1,7 +1,9 @@
+AUX cxxopts-3.2.1-gcc15.patch 541 BLAKE2B e547f76e46f7b4dd87dd955ee382726d5bf06f4764cd4b176612c5496fd022bdbe5b89a0e429d2097c803528187788ba487b3d4d7a5a2d4ec1a5cc2c41538676 SHA512 71469f33d150f26e1246174c5380f57fc4bd5dcf60bb46e27ae586d3f117ec69a75db9fb7fd70b50ddc22903c784863e76be279976a73ebc34f756591cb213d5
 DIST cxxopts-3.0.0.tar.gz 97020 BLAKE2B 129b055dd03ce9e4a146d36587063f7155b47456d81e395ae6eeab8012e8d6cfcb410c305353f2ac2ec66a2f3e8d6169e1a0d27c53dcb35388b967d3c9cc86f1 SHA512 239479a3b35ddef6fc380ac9371e1cf7e3aea066f03e1ea538151fa2fff4296838daa976d55e988d8f87f40c0ae027767bcb214754177499413af1081315565c
 DIST cxxopts-3.2.0.tar.gz 160534 BLAKE2B b6fead8930e83b4af089631e584bec0777da2e7b58aeb5e44b03a1655795dd3aff3923a245699e936bef7e0e871da2c86dd5639d44a839f1ac305a694e811feb SHA512 7265de66b92591255488d01bc26ca874423c75223e2e157a99f14fdd3e92e8d2669b72732acac3ce835190f1a09c13a994c480f0513f229eba8aa008e3d98955
 DIST cxxopts-3.2.1.tar.gz 160606 BLAKE2B 891657d5c00213ae79a1f7600627829f114cf17c3f5c332b1a1c2dcdf2ba7c4a46826f5e0bdff2c09803396fdf133c12d35f6d76b01e473c83bc0fc130821ad4 SHA512 7841fb3e6c3c2a057917c962e29fc0090e6ed06f5515aaa5e2a868fef59071a9a99b74d81c32cf613ecf10a68a4d96d6ad07805f48c7c3951ded096a2317dc3d
 EBUILD cxxopts-3.0.0-r1.ebuild 805 BLAKE2B 7897fdc52056628bd54f85b2e2bffb329d7ca2dd6298c5286fbf84930a6909d44861c0fc87b4d86789d7315b4b8893f77a8b33e5a5d1ccdf0320a668b9317887 SHA512 e607295f6c7a64598b9734d37a26ff95dbf2e102ae4044f53407928bf8048096e8e5e1d6930286c2d33c7932eefb979a5fac6befc9d3f223364ea5095cbe0a03
 EBUILD cxxopts-3.2.0-r1.ebuild 808 BLAKE2B 5305662d32362fc10c7e2bc2c4ce49c8b4ddffa4e290d0aa6a483301ad29affb035f13829bb4f38a3b927f47af0196b026f1ab612f19a1b32a1a56082fe3567c SHA512 dee138b421b3d728ed48a51a8c2697b8fff34f84abee901d72b954bda9b7844d7ded2c40861e08fc17730281e9254fe16d90fba9a152be0c12c6723d4aef7ab6
+EBUILD cxxopts-3.2.1-r1.ebuild 1059 BLAKE2B 2702050c0262ccc8ca3f664e44087b74419720328724b3b4b76d7d07c0def32f1d8d1db82e9100e2d598c18cb6eb9bf388efe0712b854772aaab6bd42a44b720 SHA512 d3451d46e60b4636060e1e64f68c46281384729251d44c2a5a3590aca79d4499b70be687a0f72be28a7510b30970c38cc24aca53d9c814bc583b0ff41b30e388
 EBUILD cxxopts-3.2.1.ebuild 813 BLAKE2B c433dfec928d5606fcfd0b48ee7d4d5672c55adc9176f1096923a4edebbf5efca35aebc6ce35964df020d9bb04b7d940acb968bb61b50284fa6c385206fe2519 SHA512 70f0a93e378e26427270d9d401a8517b0c6eaf3bcea62a54f7c92a8b30e3faf10884df23c1ec530923c52122d101a64101f9c02548d9f8d7a6f44b3b7dc4baa2
 MISC metadata.xml 332 BLAKE2B e47af6e92da0d3bccbcda0d260bd264ce18f6473bbb217009f37d783a6df95c43ab1d7d786e28fe9e22a2105bcaa2c1b0045cc0977f87e5ecd9abe89b5a2fc34 SHA512 bc33deaa248a2e0fe36a64c173ed808ab02e2b894897b74afc369be5e0bbc09e60da8e278bb78ee38c7a2e40b1c9caed4668b259ab31b9ecc988d95fe5e725ef
diff --git a/dev-libs/cxxopts/cxxopts-3.2.1-r1.ebuild b/dev-libs/cxxopts/cxxopts-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..738734154e08
--- /dev/null
+++ b/dev-libs/cxxopts/cxxopts-3.2.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Lightweight C++ command line option parser"
+HOMEPAGE="https://github.com/jarro2783/cxxopts"
+SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="icu test"
+
+RESTRICT="
+	!test? ( test )
+"
+
+DOCS=(
+	README.md
+	CHANGELOG.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc15.patch
+)
+
+src_prepare() {
+	sed -r -e 's:-Werror[[:space:]]*::' -i cmake/cxxopts.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# bug #938824, bug #940222
+	sed -i -e '/set.*CMAKE_CXX_STANDARD/s:11:17:' \
+		test/{add-subdirectory,find-package}-test/CMakeLists.txt || die
+
+	local mycmakeargs=(
+		# bug #938824, bug #940222
+		-DCXXOPTS_CXX_STANDARD=17
+		-DCXXOPTS_BUILD_EXAMPLES:BOOL=OFF
+		-DCXXOPTS_BUILD_TESTS:BOOL=$(usex test)
+		-DCXXOPTS_ENABLE_INSTALL:BOOL=ON
+		-DCXXOPTS_USE_UNICODE_HELP:BOOL=$(usex icu)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/cxxopts/files/cxxopts-3.2.1-gcc15.patch b/dev-libs/cxxopts/files/cxxopts-3.2.1-gcc15.patch
new file mode 100644
index 000000000000..288de016ea21
--- /dev/null
+++ b/dev-libs/cxxopts/files/cxxopts-3.2.1-gcc15.patch
@@ -0,0 +1,18 @@
+https://github.com/jarro2783/cxxopts/commit/63d1b65a694cfceafc20863afa75df49dfbe6b2a
+
+From 63d1b65a694cfceafc20863afa75df49dfbe6b2a Mon Sep 17 00:00:00 2001
+From: pastalian <28638872+pastalian@users.noreply.github.com>
+Date: Wed, 28 Aug 2024 20:31:42 +0900
+Subject: [PATCH] Add missing header for gcc-15 (#438)
+
+--- a/include/cxxopts.hpp
++++ b/include/cxxopts.hpp
+@@ -27,6 +27,7 @@ THE SOFTWARE.
+ #ifndef CXXOPTS_HPP_INCLUDED
+ #define CXXOPTS_HPP_INCLUDED
+ 
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstring>
+ #include <exception>
+
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 33628c60e83a..e4ac6daddd72 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,4 +1,4 @@
 DIST libpwquality-1.4.5.tar.bz2 433961 BLAKE2B f5326996ab607bf9d24de446d9714987ad259fd2222bc54983769abc298969e2e9a4cee78f2a5c5d963bd0e5f57ea3aa346b0ce108b465a8da82810486b37e36 SHA512 91a6febbf40047e553b6051df727857df7932c816638f15118a46b8286527a80446ca4f6a050d2b1f4e33335bf4b75290751ce358fa477cb9d06fe89a450d647
 EBUILD libpwquality-1.4.5-r1.ebuild 1715 BLAKE2B fac066f0e37e934c464800776b787da98f860023fa694a35c6cb12cab6b1efe4a8653ebab7535f9b8c870e3e296bfca7cc6a53ab233514fe55c522b5bd6de2cf SHA512 15759bfc28556e8f9ac507c4cffe8e19d8c3cb35d3f112501644ea53d0a355d073378f0ad27281cbfe816634867786562b4a0dca4e5ef11bdf276230e654b14f
-EBUILD libpwquality-1.4.5-r2.ebuild 1720 BLAKE2B 27f72d134f9324c36dbaf490aee88830e21c8f98ea4710e6a1587db8bab305447e103ada8b421aafba802a6e49658d4c904ef519238d590f45ff65bb90fa9551 SHA512 e64110da65f9a7cf607760058186393d84416b83a2452a9057ddb50d61dc5920c2ae17aca706d89e4f6a75a7e25385e70d88e8e25ed847d65fa825faa8d6afff
+EBUILD libpwquality-1.4.5-r2.ebuild 1720 BLAKE2B 476c49d4fa3c5a8b1f27ef4d8715e25c5c18bab096ec829dbf1b517c3a68c7d3a43b22b6559bd45f6c9a4848913e91d3b2f63d0e1bbd0a88217ce1dab5460405 SHA512 ffef2be4fd736011b2024e30da902783329356e8145973bd9658c57715f78de17e94b213313823f2d4e45356e025ee63c4c4af360a52589f6415c2be39c906e4
 MISC metadata.xml 354 BLAKE2B c7c1c6aad6af351f12d42c720fe4372aa0966601624454febad3d0ac2c40b069acfaae7f1c77c41546c701a8ad1e242bd715f421ed2103e9c48cc5a63d7e44fa SHA512 41ecf39d00ced11f91831aa04bbca66d0a409367ae87aab765c94dbcdfc4dd8900f707b767e2fe76ad1eaa62c33e2e571027c7e5112e799104029bb773d812df
diff --git a/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild
index e94f89094414..e02790d22d26 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 9347b79da003..d69a4db52c7a 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,12 +1,7 @@
 AUX quazip-1.2-cmake.patch 2978 BLAKE2B 3125b2b84e9316f3db9afbbfc91b379933dec602e288cbfffbc58cd422ea3f26653075d9bce731671e375127c937c6fcc2ff9cf217884be67057c9ecdd43115d SHA512 033c63a46ec0b1ea82f713dc807faf30c266e4bf385b4e9c0b1e6320c12f7c2093d1388a06e65ea32cfe27374324f00eb08baca9a2648bac8d0801a783b19fa7
-AUX quazip-1.3-cmake.patch 3166 BLAKE2B 5288e1120302ac14e8d912f0fe11288f8911184abbc926019c140e9e42a5c754e4266a5861910d752e5981bebdb4cf081a34d5c776cccc81e7f3f0f28e28edcc SHA512 1aa17b746b1a88ea600650816ef75cd02736beccf0abeef51d039bb4574262f20517d7fea1721adafeac3f0a5cbd988476b1aa4d754dce85d004811e2dcddff4
 AUX quazip-1.4-cmake.patch 2780 BLAKE2B 8e7d7f40db2df74e4cce38c140ff30356e914bd7b994a161d3113f16d4d683fc1895b8718184577079747a102c04c51d08ff7d90227da3bc65b29ed6fa44087f SHA512 c574981e4effd63adf181679481b6ee91541245e23f72982cfde80e4a25af2de7c7815d4b35321d5a3f8f074c68dafbee0b78307b10a10da950bf1b59ff90cd5
 DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
-DIST quazip-1.3.tar.gz 156138 BLAKE2B a9002bdfab39fc1516160b0073fd3d59a65a66eda98240b9a2936d4423b21b40dd9360122950a54dc18236bc2aaf4e1e2d761ba145f6dbd5014cf72a287fbb3b SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2
 DIST quazip-1.4.tar.gz 157819 BLAKE2B bb0ec2ebd31d6ce5e2a19fc1b13570d57aa1438ff192621543ab6aec4e85f76677863d37efbe0bc59e3530ce023586440081cd47f069b4dcbac55118d12f8668 SHA512 38ce3aa77df1fd92229454e56b7290c066d1e319afa36a9f8ec8477004ae94df682e8f454f13cdaf586a1d0b0e033fe698081033a19536ecd53dd1e4b0204af9
 EBUILD quazip-1.2.ebuild 941 BLAKE2B fdfbd8cc0cb2a17409081c4de485bd573a1ff3145778c71d57e618dcf860638b8bc85923a624e3ef36b1f865b576c65183ed82229dc0cd378f159372b8c80fb6 SHA512 bde570eb2fd7d7944db9cad35fe888044c26c602ddbf31ce4782161e85620db781b46ba951d499519409a00464fdcb84e63c4e6c1e76818ad886fced3fddf46c
-EBUILD quazip-1.3-r2.ebuild 1695 BLAKE2B af2209f84693bf4b38cc4bd89cc24ef9f80349498dda023df0b35eecceee666129c8214937c1672a7f6544b8a6791600c7fc11a580eb8e5a41d32b8e6d7b3b90 SHA512 f98cb7714bb0f50c7cfa842112c25c8786a65357af17ea66fd48ca592c1e0f0ef9a7e6c618d1a22670f7beb8e17fd99eb5abffaed1e81b5d04a675f97ddfc6ce
-EBUILD quazip-1.3-r3.ebuild 1693 BLAKE2B c7d34fa393f8acad6aea5532f5f5b3b00cf1f0830ac338eed5379aed8a8c803bd34554fc876ae73b068bc53d8faeeccfba4d56c3125d12d2ce19bbf82283956b SHA512 1f184c2246038786a8cf5bca5d05021ed2350434af5d7c92ee8d5be4c1aef556a301aab5a0cf4dbbfc849df0c524805e4f7186cd85292382cd061775147e6eca
 EBUILD quazip-1.4-r1.ebuild 1825 BLAKE2B eb9c2175c32be1b9ade40dab20410000cf93e9daaa005a1ad59e0d2785ac9599336b36222c6c2d5e851e97b4f1d2b0f6f2e2b1df3143b1d15f86d9cb630b11b1 SHA512 44d3f4b558fc5f90aa59176e2615a14d1e4e4e3f4e2e63ec955e64973b8af447e1fb68c9821f44648be4c6696bf10fb1d82c10e994e8d14fb269d213a932f88f
-EBUILD quazip-1.4.ebuild 1785 BLAKE2B 95806098fa03d5cc2f46af6127cf047c27e40ae8cefd8a3121900752b721b66c858db0d8b52bdbb0c1bbab32e416bbcf8420404493ce1c2274cd4288d8caa793 SHA512 cb37d5ab2e51017424cc556f242f4e43d82c47cd599689c68bab49a6f296f77f66dbb2c12c90fb105d5ec5671361335bc8675e3bbeef891e6affc5f8b9d96f4f
 MISC metadata.xml 461 BLAKE2B 24ee9745d2baa54233f3cea1e7ec426e83ddbf458e63e679f204014ba4d8dd971c0da5876db9adf2b41fbda1239ff89752eebd30fe6a8da179f34274501507cc SHA512 d6d54cd6e2a16ab151dc987dd75772d996f733f7e5212cce7a73d9ed2b75721230b9295476bf6c5680343e9ce02cfafa7d2b667afc5597d770c66c96a8474956
diff --git a/dev-libs/quazip/files/quazip-1.3-cmake.patch b/dev-libs/quazip/files/quazip-1.3-cmake.patch
deleted file mode 100644
index 016bd97f1dc0..000000000000
--- a/dev-libs/quazip/files/quazip-1.3-cmake.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 9d9e4e7c2076f0ab1a482ae32203aa336dc4ba9b Mon Sep 17 00:00:00 2001
-From: Thiago Donato Ferreira <flowlnlnln@gmail.com>
-Date: Mon, 18 Apr 2022 12:08:55 -0300
-Subject: [PATCH] Add CTest patch
-
-Signed-off-by: Thiago Donato Ferreira <flowlnlnln@gmail.com>
----
- CMakeLists.txt | 32 +++++++++++++++++++-------------
- 1 file changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3eaf1a..71f2748 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,6 @@ set(QUAZIP_LIB_SOVERSION 1.3.0)
- option(BUILD_SHARED_LIBS "" ON)
- option(QUAZIP_INSTALL "" ON)
- option(QUAZIP_USE_QT_ZLIB "" OFF)
--option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
- 
- # Set the default value of `${QUAZIP_QT_MAJOR_VERSION}`.
- # We search quietly for Qt6, Qt5 and Qt4 in that order.
-@@ -34,6 +33,8 @@ endif()
- 
- set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}")
- 
-+include(CTest)
-+
- if(NOT CMAKE_BUILD_TYPE)
- 	set(CMAKE_BUILD_TYPE RELEASE)
- endif()
-@@ -50,23 +51,29 @@ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
- set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
- 
- if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
--	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
--                         OPTIONAL_COMPONENTS Network Test)
-+	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
- 	set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat)
--	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
- 	set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core")
-+    if (BUILD_TESTING)
-+		find_package(Qt6 REQUIRED COMPONENTS Network Test)
-+		set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
-+	endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
--	find_package(Qt5 REQUIRED COMPONENTS Core
--                         OPTIONAL_COMPONENTS Network Test)
-+	find_package(Qt5 REQUIRED COMPONENTS Core)
- 	set(QUAZIP_LIB_LIBRARIES Qt5::Core)
--	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
--	set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
-+    set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
-+	if (BUILD_TESTING)
-+		find_package(Qt5 REQUIRED COMPONENTS Network Test)
-+		set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
-+	endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
--	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
--                           OPTIONAL_COMPONENTS QtNetwork QtTest)
-+	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
- 	set(QUAZIP_LIB_LIBRARIES Qt4::QtCore)
--	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
- 	set(QUAZIP_PKGCONFIG_REQUIRES "zlib, QtCore")
-+    if (BUILD_TESTING)
-+		find_package(Qt4 REQUIRED COMPONENTS Network Test)
-+		set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
-+	endif()
- else()
- 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
- endif()
-@@ -88,8 +95,7 @@ endif()
- 
- add_subdirectory(quazip)
- 
--if(QUAZIP_ENABLE_TESTS)
-+if(BUILD_TESTING)
-     message(STATUS "Building QuaZip tests")
--    enable_testing()
-     add_subdirectory(qztest)
- endif()
--- 
-2.35.1
-
diff --git a/dev-libs/quazip/quazip-1.3-r2.ebuild b/dev-libs/quazip/quazip-1.3-r2.ebuild
deleted file mode 100644
index e329c1fc93d9..000000000000
--- a/dev-libs/quazip/quazip-1.3-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="https://stachenov.github.io/quazip/"
-SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
-SLOT="0/1.3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	qt5? ( dev-qt/qtcore:5 )
-	qt6? ( dev-qt/qtbase:6 )
-	sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		qt5? (
-			dev-qt/qtnetwork:5
-			dev-qt/qttest:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,network]
-			dev-qt/qt5compat:6
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!=dev-libs/quazip-1.1-r0:1
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			-DBUILD_TESTING=$(usex test)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(
-				-DQUAZIP_QT_MAJOR_VERSION=5
-			)
-		elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
-			mycmakeargs+=(
-				-DQUAZIP_QT_MAJOR_VERSION=6
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	my_src_compile() {
-		cmake_src_compile
-		use test && cmake_build qztest
-	}
-
-	multibuild_foreach_variant my_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/quazip/quazip-1.3-r3.ebuild b/dev-libs/quazip/quazip-1.3-r3.ebuild
deleted file mode 100644
index d67c1fb6e2f6..000000000000
--- a/dev-libs/quazip/quazip-1.3-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="https://stachenov.github.io/quazip/"
-SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
-SLOT="0/1.3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	qt5? ( dev-qt/qtcore:5 )
-	qt6? (
-		dev-qt/qtbase:6
-		dev-qt/qt5compat:6
-	)
-	sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		qt5? (
-			dev-qt/qtnetwork:5
-			dev-qt/qttest:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[network]
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!=dev-libs/quazip-1.1-r0:1
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			-DBUILD_TESTING=$(usex test)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(
-				-DQUAZIP_QT_MAJOR_VERSION=5
-			)
-		elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
-			mycmakeargs+=(
-				-DQUAZIP_QT_MAJOR_VERSION=6
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	my_src_compile() {
-		cmake_src_compile
-		use test && cmake_build qztest
-	}
-
-	multibuild_foreach_variant my_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/quazip/quazip-1.4.ebuild b/dev-libs/quazip/quazip-1.4.ebuild
deleted file mode 100644
index 8ad656566a6c..000000000000
--- a/dev-libs/quazip/quazip-1.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="https://stachenov.github.io/quazip/"
-SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-# SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
-SLOT="0/1.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	bzip2? ( app-alternatives/bzip2 )
-	qt5? ( dev-qt/qtcore:5 )
-	qt6? (
-		dev-qt/qtbase:6
-		dev-qt/qt5compat:6
-	)
-	sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		qt5? (
-			dev-qt/qtnetwork:5
-			dev-qt/qttest:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[network]
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	# Use CTest module provided BUILD_TESTING
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			-DBUILD_TESTING=$(usex test)
-			-DQUAZIP_BZIP2=$(usex bzip2)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(
-				-DQUAZIP_QT_MAJOR_VERSION=5
-			)
-		elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
-			mycmakeargs+=(
-				-DQUAZIP_QT_MAJOR_VERSION=6
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	my_src_compile() {
-		cmake_src_compile
-		use test && cmake_build qztest
-	}
-
-	multibuild_foreach_variant my_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}