gentoo auto-resync : 10:03:2025 - 01:49:12

3 files changed, 123 insertions, 5 deletions

diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 0ba319805e9b..3d372d7a475d 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,5 +1,7 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
+DIST qca-2.3.10.tar.xz 764844 BLAKE2B aeebf17629aec1aeaefd3a03c228edbac64c3a9289841f5ab0935b791bc8aee1b4f6123c38621e40926e206aa6bd99f75d3c0819c9f5879ea4c720a80b66eb26 SHA512 6b2295ac17de1d86b96ae8f8f11f96b9f9c3f7122ce51879a3268c0df0ad8e7647d193dbd12c1215c1a6467066f4eed18b85d1c09313b5ee06ee5782d0ad7de4
 DIST qca-2.3.9.tar.xz 765256 BLAKE2B 6f8015f45c252d4991dce9154f270d7450b94ec40156e91d537fbdbc17969873689f324032ee24e3fa1c7205a41c6da2870375bfafa308cf82f266bc89da8081 SHA512 025ef203c66e413a9c93d7e0e5449d8a23fb6bb27b2f1c4f137173e33b8c17ff6dec794c8349b6b37ee9d7fffe23875a2cf7cf6592efc373f1aac9230f83aa06
+EBUILD qca-2.3.10.ebuild 2527 BLAKE2B ffaaa9c50fbbcf7a70bfafbc794cd1fa6f9b598af45c0976b21197cbf8f9fbeaff85ebcee593b4848ce253ea190b37ad1b88249b85867671b0c4e64218477878 SHA512 2cc1fda6fecdcc34eb70927cc4c12700537b84b8a610d3dc67b21507577dbf8ba0e6c72b02412b73d94eacb9f089600b14f073234fc3112a09b1ecf74fa9bcc4
 EBUILD qca-2.3.9.ebuild 2561 BLAKE2B 9ebb164bf3591c1c4863617a2efe263083fd84640a72aff7a64d521cd93ead1b71499ef5533822115b3a1bf15d92f02cbfba2fc68cec3f85628450be80b2c39d SHA512 89f49d53d635dbe0dd0253fefacd3ea435096f8fcd8721d64d9e780ba7b242ce658848ae1e32b4486e0ffddfa349e9489425ff7109e2299ee2f7595263325361
-EBUILD qca-9999.ebuild 2414 BLAKE2B e319c6245cfe6abe5d911c1472661c9e618424f21477e43fb2105bc515d6d4f84520ed747d3434f62a5b22e7910c4916e6fa8580a6a270bd88413f8e8da2cfac SHA512 4f44c2d6a84b5fce842ca4db483d2a154c9362900b63f1742a4b03714f0cbe5e37125c58848854cc5a7fe4fcfe44007e8bb2adf95d8141f500ee6bfecd247cd1
+EBUILD qca-9999.ebuild 2405 BLAKE2B 9524d05bd6e4a105c2c3ee9e4b3d8cb0a12aee1b284ac3f4a35a68a7a1602ca20c4c1548d5568959accbc81ada5386fd528ec2ec0cdd069b4908cb18a347ba0b SHA512 b6e71cf701144020a073470893606edd85d038ef343e24d54ccc216d49401c35555151a35c2794b7dc2e06923412f2def0aa8e341bbd6b42d5292cfd78d72014
 MISC metadata.xml 781 BLAKE2B 048fe4155a9e47f36bab098734fcfcf661377d017d0616351b7a11a83dd57cdaa2eec370fafdf2f41e5806f01a3934811181972aa232c1d5332a00af1402912c SHA512 65328a1acfdc05ea3491d7fb46a3fa340e467d33c4b81001745e8923ad2aa300cc7a3dfcc29e01afe1882abd18dd024d8ecc4e2c31a2bf5319608589730a37c1
diff --git a/app-crypt/qca/qca-2.3.10.ebuild b/app-crypt/qca/qca-2.3.10.ebuild
new file mode 100644
index 000000000000..88220b9dfc14
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.10.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake kde.org multibuild out-of-source-utils qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 qt5 +qt6 sasl softstore +ssl test"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	botan? ( dev-libs/botan:3= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	gpg? ( app-crypt/gnupg )
+	nss? ( dev-libs/nss )
+	pkcs11? (
+		>=dev-libs/openssl-1.1
+		dev-libs/pkcs11-helper
+	)
+	qt5? ( dev-qt/qtcore:5 )
+	qt6? (
+		dev-qt/qtbase:6
+		dev-qt/qt5compat:6
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	ssl? ( >=dev-libs/openssl-1.1:= )
+"
+DEPEND="${RDEPEND}
+	test? (
+		qt5? (
+			dev-qt/qtnetwork:5
+			dev-qt/qttest:5
+		)
+		qt6? ( dev-qt/qtbase:6[network] )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		virtual/latex-base
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+
+qca_plugin_use() {
+	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
+			-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
+			$(qca_plugin_use botan)
+			$(qca_plugin_use gcrypt)
+			$(qca_plugin_use gpg gnupg)
+			$(qca_plugin_use logger)
+			$(qca_plugin_use nss)
+			$(qca_plugin_use pkcs11)
+			$(qca_plugin_use sasl cyrus-sasl)
+			$(qca_plugin_use softstore)
+			$(qca_plugin_use ssl ossl)
+			-DBUILD_TESTS=$(usex test)
+		)
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DBUILD_WITH_QT6=ON )
+		else
+			mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+	if use doc; then
+		multibuild_for_best_variant cmake_build doc
+	fi
+}
+
+src_test() {
+	mytest() {
+		local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+		cmake_src_test
+	}
+	multibuild_foreach_variant mytest
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+
+	if use doc; then
+		multibuild_for_best_variant run_in_build_dir dodoc -r apidocs/html
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild
index 3ccb568c5478..3b70f4576bc3 100644
--- a/app-crypt/qca/qca-9999.ebuild
+++ b/app-crypt/qca/qca-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ RDEPEND="
 		>=dev-libs/openssl-1.1
 		dev-libs/pkcs11-helper
 	)
-	qt5? ( >=dev-qt/qtcore-5.14:5 )
+	qt5? ( dev-qt/qtcore:5 )
 	qt6? (
 		dev-qt/qtbase:6
 		dev-qt/qt5compat:6
@@ -77,9 +77,9 @@ src_configure() {
 			-DBUILD_TESTS=$(usex test)
 		)
 		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-				mycmakeargs+=( -DBUILD_WITH_QT6=ON )
+			mycmakeargs+=( -DBUILD_WITH_QT6=ON )
 		else
-				mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
+			mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
 		fi
 		cmake_src_configure
 	}