8 files changed, 80 insertions, 43 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 1ab5ed58674e..e3d23d4c8c56 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest
index c0d83982baa3..24b375ac5e9c 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -1,5 +1,3 @@
-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.12.2.ebuild 888 BLAKE2B cb51f33c83b407a8fdf25cb18cbc1acb222a3cb1b0599769c52370c427374d32d92393d5faf8046abfcd02d1ab64a85c0d96de154415bd1912b0d482c2769023 SHA512 8ed974cbd0a7318dcd2c57b62d0af1db04dd84c97c233ce1a180239ac70f476e40e966c8719d0c53f9018189ea2e9064b3f6cccab5d0a5457be64bcf0d22e121
-EBUILD keysmith-24.12.3.ebuild 890 BLAKE2B 703fdd6ed21ddcdf4128707a459d33583977d35240bec61e2e0cb98e56c67082f8f98086334603ceff154e99656e41fc74fe3af1bfad55831aab6eddbffccf49 SHA512 1f25ac6f524def74bec13bee1a8dc07ad85dc5e61630368ff129fa0825f74d92b4671372d31b6b0d6a24cceed1bb0c834c6d15a5d3bed192f7bc123f4dbd0dc3
+EBUILD keysmith-24.12.3.ebuild 888 BLAKE2B cb51f33c83b407a8fdf25cb18cbc1acb222a3cb1b0599769c52370c427374d32d92393d5faf8046abfcd02d1ab64a85c0d96de154415bd1912b0d482c2769023 SHA512 8ed974cbd0a7318dcd2c57b62d0af1db04dd84c97c233ce1a180239ac70f476e40e966c8719d0c53f9018189ea2e9064b3f6cccab5d0a5457be64bcf0d22e121
 MISC metadata.xml 380 BLAKE2B 110b310586031ac53056b1502648607210ee0256858efee1d54e756e130b4e331202f8571c96f5064ccee7d63bce9c4af2b92c40389d2c7b06a4fad70be8656d SHA512 10365587bc7347003e99f0684c92fa7c7154576643eaee09e79b1bddf5aed12b6062dc426b07343c6cfbcd423ab3e77e245b3659919f75e4a4183fb56fa2fa0e
diff --git a/app-crypt/keysmith/keysmith-24.12.2.ebuild b/app-crypt/keysmith/keysmith-24.12.2.ebuild
deleted file mode 100644
index 164ee4981ce0..000000000000
--- a/app-crypt/keysmith/keysmith-24.12.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-ECM_TEST="true"
-KFMIN=6.7.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/kcoreaddons-${KFMIN}: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/keysmith/keysmith-24.12.3.ebuild b/app-crypt/keysmith/keysmith-24.12.3.ebuild
index a2d49325b99b..164ee4981ce0 100644
--- a/app-crypt/keysmith/keysmith-24.12.3.ebuild
+++ b/app-crypt/keysmith/keysmith-24.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/keysmith/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 3d372d7a475d..df0f1fd4f4a2 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,7 +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.10.ebuild 2524 BLAKE2B d3fc42aedaa37c85e4863be7bbd9d5968731408660bc167bb31130c9bd19961c1837e6415b092333a4977bab3094c734a8b1de796aa350acf9ff96d3727bcc46 SHA512 b143a6f7e25e2f2841402dd9df65eb1d16e7865de6ac07dfc2a5c9b00f0491112015c612e270ef89959b82a729f8db7e470b65e837a3abd53c94499586227b44
 EBUILD qca-2.3.9.ebuild 2561 BLAKE2B 9ebb164bf3591c1c4863617a2efe263083fd84640a72aff7a64d521cd93ead1b71499ef5533822115b3a1bf15d92f02cbfba2fc68cec3f85628450be80b2c39d SHA512 89f49d53d635dbe0dd0253fefacd3ea435096f8fcd8721d64d9e780ba7b242ce658848ae1e32b4486e0ffddfa349e9489425ff7109e2299ee2f7595263325361
 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
index 88220b9dfc14..91595e740b7f 100644
--- a/app-crypt/qca/qca-2.3.10.ebuild
+++ b/app-crypt/qca/qca-2.3.10.ebuild
@@ -11,7 +11,7 @@ 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"
+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 )"
 
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index a2234c694dac..4356bae53e83 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -4,6 +4,7 @@ AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2e
 AUX swtpm-0.8.2-slibtool.patch 779 BLAKE2B 4403ddecb4d1b2f0f40c3f4511ccc51eb0345d8570a5b36ef125c8c8781d8bceee6741b08f77057ca9eb222cfe31045748e722d837c011a393512cd539c1f7e7 SHA512 37bdaf16950b3b94af4ea8d8f042919a550fae1c9a8519eac36acc1fa289daa5677ba227b5e5a224a98b4f6859335a3f4e10de293c8283ac87474a84cef49f9a
 DIST swtpm-0.10.0.tar.gz 414698 BLAKE2B 62ebc5638e7c0b6c2be42d8da5369dfce708339882b582b154aa46d5ae6ed4a59f4e6cc31a05b062190b98a461caed82281bf64b05e8941d3923d200cfde501c SHA512 6f1848b0514799417582c1a5bedf9b7110e3627ab14f02ea193ad76ce8a188eba596494f410405c5f7226e2daf7d9ee889983a2265285839e72de12e6368180d
 DIST swtpm-0.9.0.tar.gz 370942 BLAKE2B bed63851dfdb94f463bbac962044114f75abd36f6558f173fd67be608f50c8954c6038d33bb6e3d2e88427238c7c06048beae23b84b2a1e186c0de98a9bd5ad8 SHA512 4f1723679b85218e80ea6aacdffa687e541ee309ddab9bcb8d8e5aa0b461ee431c880f2e300f1dcae112646f3636593005a342ee0cb762ec115aa599369e111c
+EBUILD swtpm-0.10.0-r1.ebuild 1666 BLAKE2B 5cc5d1c7166257d8b8b81b367995931c4844da487e96dc44712bd6625f4f0b481aecd48873e0a4a32affb7de81ec9a7ec71518910fb7846efc7645efb611ea51 SHA512 fb09cdaf313d36fbe7b55364080c509fb3c9651abe6e0cd645d852fcc206731074924fb97f13999aad7d6d93ef1ffa1307a138ba8bff364fafdcb958385ba0e4
 EBUILD swtpm-0.10.0.ebuild 1661 BLAKE2B a884f68815b5608f40ecc4919ea6d87842f3c28d35cf2bdb3c8d3a8d8be0e4b7e33868217686dde4b3e204cffe8b72d3029eeec7c254ea0ec97aabcf8389ba88 SHA512 af46767c7cd668cc0c8b94c378d4d08ab87ddfd996b1f9da131533f9731e013d7ac1f73a079b4209a3d9acf8c31608a9fa5ba6ecde326a03a39cdbe44df5af60
 EBUILD swtpm-0.9.0.ebuild 1602 BLAKE2B 2370b7d3776c44a308fe6b15a87c4632b800a233974e951f7a6e254784c73921d141ac90cbfd84b925ab5f43ca13e0feceb113f7186585b52b5f9d24270c4108 SHA512 5dcf477bf01109b2086628ec4beb030eb37cf046051cdd31052708b9ef62ebfc124a3e5828c9ce2bb6cac9617106e6bcf0b7c55b7744b0cbfc826da0c294be61
 MISC metadata.xml 717 BLAKE2B 70de08f9ed69084e7ed07c72ae96ab76cdb8bf489c3d3664edab24d2a904f44a6483bb9685f0e97f4520420dab1b6796e58cff00ba82190459af12398aa4b6d1 SHA512 a4f2977c84e03e215f6455def44ead6f767d6a4803061942b799b38bedaada373b51bbd47bd87c4339df32138a339b5f595a5ea19c5706b5e424329cc8aec0a5
diff --git a/app-crypt/swtpm/swtpm-0.10.0-r1.ebuild b/app-crypt/swtpm/swtpm-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..99daf56aa985
--- /dev/null
+++ b/app-crypt/swtpm/swtpm-0.10.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit autotools python-any-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="fuse seccomp test"
+RESTRICT="!test? ( test )"
+
+# net-libs/gnutls[pkcs11,tools] is required otherwsie it not possible to
+# provision new vTPMs. swtpm_cert spawns certttool, and upstream expects
+# pkcs11 in gnutls: https://github.com/stefanberger/swtpm/issues/477.
+
+RDEPEND="fuse? (
+		dev-libs/glib:2
+		sys-fs/fuse:0
+	)
+	seccomp? ( sys-libs/libseccomp )
+	acct-group/tss
+	acct-user/tss
+	dev-libs/gmp:=
+	dev-libs/openssl:=
+	dev-libs/json-glib
+	>=dev-libs/libtpms-0.10.0
+	dev-libs/libtasn1:=
+	net-libs/gnutls:=[pkcs11,tools]
+"
+
+DEPEND="${RDEPEND}
+	test?	(
+		net-misc/socat
+		dev-tcltk/expect
+		)"
+
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
+	"${FILESDIR}/${PN}-0.10.0-build-sys-Remove-WError.patch"
+	"${FILESDIR}/${PN}-0.8.2-slibtool.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-openssl \
+		--with-gnutls \
+		--without-selinux \
+		$(use_with fuse cuse) \
+		$(use_with seccomp) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	rm -fr "${ED}/usr/libexec/installed-tests/swtpm"
+	fowners -R tss:root /var/lib/swtpm-localca
+	fperms 750 /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+	find "${D}" -name '*.la' -delete || die
+}