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

9 files changed, 123 insertions, 164 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 13fa9eb21200..a0a6bddd27e6 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest
index 6dd717270506..c0d83982baa3 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -1,7 +1,5 @@
-DIST keysmith-24.08.3.tar.xz 171432 BLAKE2B 3849b02928b0aff80e28cc09d208ff543cf930e8e997a5c2c139325e1ce1785c5e569604eb64217f02b2ca99ae5b5edd651069f601a5a01ed59aaf65202ffedf SHA512 bfb67ea99c1435bee49e3a5170c9ca102f9d6ffe81ca66c1fa97e8c86fdf4464abb8a1c945cb7ffa2d89bfa995dda3ef7d20a512476642d38b9483789163b8eb
 DIST keysmith-24.12.2.tar.xz 174036 BLAKE2B 117a97f260be434354575915ca91576a63bc0002d6701186af73820eaa658c32933437a5e40855505e7630e4a36b3d40db3b5cb7bc5d80f5c421948b917ae01e SHA512 c16575cef83b55bddea0a3039e8a080790df9463784e5b8a8ddeea3991b6ff29845a07ac6229df591d3186e320d23616411421cc59607e9deaefcd4ed69f436b
 DIST keysmith-24.12.3.tar.xz 174084 BLAKE2B 00b670c7407d22ff8be66a67d87e74ee0843f7ac85901d0ad9d836d2ce3be754ca8e24ed7f2a97e294b57f0567259e0b529080b77e0c8a89bb95324504959317 SHA512 43ae405bd37dd1ab4cac62221fefd35987d5ae8f1eafcc2ea4357dfcb05e94050dd1ca93584c80dfc21fa841b3b426016654f0639304c42fb3d031d06acd7377
-EBUILD keysmith-24.08.3.ebuild 847 BLAKE2B de6b50e6b8748802879f80b65ac6910f9cb6bbbb9d6ae0c066dbd539db0e8a09669c06916539423d1b118bb126d57081eb8d27e74fd4c9081cab3e0dfd5eb5a3 SHA512 ec36ed5e237e349cc7a56ef3c0ffa1ccb53d6268ad0302e2fe38dc8cf3efae1cc693ba3cd6109e2f6743120f4e2dd8f69752aba29e4e15f3ef8187996a84f659
 EBUILD keysmith-24.12.2.ebuild 888 BLAKE2B cb51f33c83b407a8fdf25cb18cbc1acb222a3cb1b0599769c52370c427374d32d92393d5faf8046abfcd02d1ab64a85c0d96de154415bd1912b0d482c2769023 SHA512 8ed974cbd0a7318dcd2c57b62d0af1db04dd84c97c233ce1a180239ac70f476e40e966c8719d0c53f9018189ea2e9064b3f6cccab5d0a5457be64bcf0d22e121
 EBUILD keysmith-24.12.3.ebuild 890 BLAKE2B 703fdd6ed21ddcdf4128707a459d33583977d35240bec61e2e0cb98e56c67082f8f98086334603ceff154e99656e41fc74fe3af1bfad55831aab6eddbffccf49 SHA512 1f25ac6f524def74bec13bee1a8dc07ad85dc5e61630368ff129fa0825f74d92b4671372d31b6b0d6a24cceed1bb0c834c6d15a5d3bed192f7bc123f4dbd0dc3
 MISC metadata.xml 380 BLAKE2B 110b310586031ac53056b1502648607210ee0256858efee1d54e756e130b4e331202f8571c96f5064ccee7d63bce9c4af2b92c40389d2c7b06a4fad70be8656d SHA512 10365587bc7347003e99f0684c92fa7c7154576643eaee09e79b1bddf5aed12b6062dc426b07343c6cfbcd423ab3e77e245b3659919f75e4a4183fb56fa2fa0e
diff --git a/app-crypt/keysmith/keysmith-24.08.3.ebuild b/app-crypt/keysmith/keysmith-24.08.3.ebuild
deleted file mode 100644
index fc881a98a8b5..000000000000
--- a/app-crypt/keysmith/keysmith-24.08.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="OTP client for Plasma Mobile and Desktop"
-HOMEPAGE="https://apps.kde.org/keysmith/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/kirigami-addons:6
-	dev-libs/libsodium:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-"
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
 	}
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index a2c0747ef359..5dead2b0dd78 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,6 +1,3 @@
-AUX rhash-1.4.4-prefix.patch 836 BLAKE2B 9c3b953e5249c4ee0be5d23cb595ed1c84611ce6299b29b2b3fd38b7de1f891fb5a8f6a4a5fed3e3b8862fff9f8623f310a0d436ab4eab44e42ff79e0b1f99f5 SHA512 3740a2ea78d28fa916533af27740011c2dd520eb2bc18a6a19fc530a0414a8eb7bd911a7a39ddd0a1a2fec5def20b61ed1731349880346c413d7d6000569bf32
-DIST rhash-1.4.4-src.tar.gz 435691 BLAKE2B f3d42f333ad9a82fe4a8ef5af5d8008abf526c05c06a00c7033881d5a27ba663c3cc5cefb73ea8157ac24cb10a50a4e500706d489e61a03dbaee74a4735d1722 SHA512 00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f
 DIST rhash-1.4.5-src.tar.gz 444526 BLAKE2B 11021119e8af28e12491eabd55232e24a056bce79b624c970e4806c28fe707ea1395eb390572dba3453900d4512e5896d70642370d0c9340359e2fee95d62c8d SHA512 49bd6aa2497efc4871ae31eaca51d2dc78ceb7126311557d5280b14fafe9355eaecad37f0f78f865e4e1dd1aeb506d3301989cd2f9fff7b0091c81978e8c2f2e
-EBUILD rhash-1.4.4-r1.ebuild 2310 BLAKE2B e5f2d4dd82a1ef6d327457b0ab84360852caa4f640e828a2d2cc0b1a488386c6602ae3e0cd4b188401ef3092e6ffba095f2fada1c5416e08d8227b27ab37dda1 SHA512 3cb22c2991b48dd0df2a64c1d10781950bd32b6847e2e45508df8ebe2bcd8efb643e86dba2290b382c8aa03bb45e773480c1d344210d0aa9af159dedb9d8f768
 EBUILD rhash-1.4.5.ebuild 2263 BLAKE2B 5b56ed2868c7738f67d88892cd545e51e135473bc2e5df1c34ea1e0765d4f01d98c096ccd3f6dd6b39ea92fa48e34bbf4755961ca847d9071438666ab30ae36b SHA512 0b028b1bc566160e57a9ebf703ea6237996aa16d807b9d5a80896f21c6de9a3afc4eae3fd8ef7ba9b65152e9fdbc5e29bf2f9c90bc50ba2adb0a00b7f4e63af4
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/files/rhash-1.4.4-prefix.patch b/app-crypt/rhash/files/rhash-1.4.4-prefix.patch
deleted file mode 100644
index ce2e72bf149e..000000000000
--- a/app-crypt/rhash/files/rhash-1.4.4-prefix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c804982d1b24c6533118b3068d2cfdca685076f3 Mon Sep 17 00:00:00 2001
-From: Aleksey Kravchenko <rhash.admin@gmail.com>
-Date: Mon, 7 Aug 2023 01:00:37 +0300
-Subject: [PATCH] Fix #243: Incorrect assigment in the configure script
-
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 39ef8c1b..63cbd8d0 100755
---- a/configure
-+++ b/configure
-@@ -877,7 +877,7 @@ if test "$OPT_STATIC" = "no"; then
-   RHASH_TEST_OPTIONS=--shared
-   test "$INSTALL_LIB_SHARED" = "auto" && INSTALL_LIB_SHARED=yes
-   test "$INSTALL_LIB_STATIC" = "yes"  && RHASH_BUILD_TARGETS="$RHASH_BUILD_TARGETS \$(LIBRHASH_STATIC)"
--  RHASH_LDFLAGS=$RHASH_LDFLAGS $GETTEXT_LDFLAGS
-+  RHASH_LDFLAGS=$(join_params $RHASH_LDFLAGS $GETTEXT_LDFLAGS)
- else
-   LIBRHASH_TYPE=static
-   LIBRHASH_PATH="\$(LIBRHASH_STATIC)"
diff --git a/app-crypt/rhash/rhash-1.4.4-r1.ebuild b/app-crypt/rhash/rhash-1.4.4-r1.ebuild
deleted file mode 100644
index 0c1b26eeb3f8..000000000000
--- a/app-crypt/rhash/rhash-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="https://rhash.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz"
-
-LICENSE="0BSD"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug nls ssl static-libs"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-)"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/RHash-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-prefix.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		# we lack posix_memalign
-		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
-			librhash/util.h || die
-	fi
-
-	# upstream fix for BSD and others, but was only applied for BSD
-	# we need support for Solaris, where we use a GNU toolchain, so use
-	# the original hack, hopefully next release has this fixed
-	# https://github.com/rhash/RHash/issues/238
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/^elif linux; then/else/' configure || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	set -- \
-		./configure \
-		--target="${CHOST}" \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-openssl-runtime \
-		--disable-static \
-		--enable-lib-shared \
-		$(use_enable debug) \
-		$(use_enable nls gettext) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs lib-static)
-
-	echo "${@}"
-	"${@}" || die "configure failed"
-}
-
-multilib_src_compile() {
-	emake all \
-		$(multilib_is_native_abi && use nls && echo compile-gmo)
-}
-
-multilib_src_install() {
-	# -j1 needed due to race condition.
-	emake DESTDIR="${D}" -j1 \
-		install{,-lib-headers,-pkg-config} \
-		$(multilib_is_native_abi && use nls && echo install-gmo) \
-		install-lib-so-link
-}
-
-multilib_src_test() {
-	emake test
-}