7 files changed, 28 insertions, 41 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 588c6b0d78bf..5a3fcb4698d8 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 212824ea5c32..afaacca7d173 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -2,5 +2,5 @@ DIST libsecret-0.21.1.tar.xz 190796 BLAKE2B 862c2aac0c519d2607c1c5b057d1e0d00d3d
 DIST libsecret-0.21.4.tar.xz 206636 BLAKE2B c2f938e667b229e3dbe05e4193459b24f79d874348fda39423712ef92fa0c056129eaf646fbcfab1d7a1ae40982909f4882b5e66c294a2ba648fdd07c88e5909 SHA512 4731d9b2809a867f59e0702a55d1577ee0a968826c3df40717b1a6f6ea3f9d94ed95457dd82070d2914f5b1911d49fd6ae340bec6f4bcf88b6c804782ae7a24e
 EBUILD libsecret-0.21.1.ebuild 3632 BLAKE2B 9ea840eb408ebac6ab30c2a2f33d51a888c04794b2b0b369b12b2e640ece9fd12942f1a7d42f4c9ca8667f004230f903003f7160b9d5c4ade7714a19267ce2a5 SHA512 52e39f15751e5b30166107a00bf63114091b6bc445d9a031b72ca33f700117fb915d0c581f6a2ab5c53c2ae6325ec6a384cdbaf17976c11306736355230c6607
 EBUILD libsecret-0.21.4-r1.ebuild 3971 BLAKE2B 3260709583467ddca09d188531568cc415d5071f72031de0d06d30844bac125410015ac47cdd87ee9fce0ab024d35a58969b2400b0d21e79cb88ba8b5073d2a2 SHA512 5166a4f5299db595950f314b1fcfe15df572ad4efe5111372547676fedccb3da2f63f8c933fed80612a5324026b04136dc2305b76e0b22a697b6f31978b6bb7d
-EBUILD libsecret-0.21.4-r2.ebuild 3974 BLAKE2B a0a44cf370ffc4bd5331875e264b235bbe24bd03ff282413c190aab06d409836279bd57125724ac54b85e0c3f9acb3f9725de89ab2be03e6774defe7d4590026 SHA512 606a731487660bd8294f81e1a3f20b4c84c81d2b1ad27a74b958638edca7289f70d9eec082169ff8c24df32c51d5d2cf525fa2012707e3daa817ca5fa6b25284
+EBUILD libsecret-0.21.4-r2.ebuild 3970 BLAKE2B 49f0a0ebf74b267bca08995785d5ebe192d3f2139f16fd2d8c2d40593ba13b74ece34c67351a23a0236a34e5678b083e255d383073bf6276aec0c265ff0732d2 SHA512 98439d6cf94643e31a273237b26ccd37c83a7c0aa411d78a7349c679bd8a886d9302d673b3b3c9680969343e1091353259ab60b3afb70f75d0a0823508b6da57
 MISC metadata.xml 812 BLAKE2B d36ccd893f4781a8de0189c3afa0c6f4c5c4cc75bb8bf0ed15878a687313aa727973a3d223613064c0d174d24b9b644123b08b2639514f553392f0aa563e4e47 SHA512 7d688d62a72da7bdb98cdd60c16bee970510eba4e6e0a2234bfc7ab561738f35bb117dc9c0141c1966dec1653ca4227150b85bfb19e4387d7e9629c3e4a5804c
diff --git a/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild b/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild
index 648186326062..7cd62384bbb8 100644
--- a/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild
+++ b/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
 LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+crypt +gcrypt gnutls gtk-doc +introspection pam test test-rust tpm +vala"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index a21256b83086..17adb04b4f64 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,4 +1,4 @@
-AUX tpm2-pkcs11-1.9.0-Remove-incorrect-append-in-configure-ac.patch 936 BLAKE2B bb44105eeacf605d9a9340c83c32fd4e7b22f30ae7d655d48dd7fbb611b94e187e9995a31edc04965bd88e3e03b9013f83cb934e255d32f1144ba304a224f5da SHA512 22d61f93170ce8e385f4caec03c3da032e07af7ea21355f986d192c549eb91a6c530a9f0b686483c411c34abfb1057525cc6b0c1eb63d0410855a2a94ec8be36
-DIST tpm2-pkcs11-1.9.0.tar.gz 1396590 BLAKE2B a5880b61463154d8f17549c442c7eca49b7a438335c264022d81fa93079b83633cba8ff8c3377f5829a896e6f5f55688018d8c3a78cb8223a888c7d6bfcaf555 SHA512 e88e78790a8d4d5a67713855106860e90dd18da00dc738ca7bfebf7979cdde54ce5089d0be015e7a208117bf393db700ca7739986c5e8138ee0e3b37344614b0
-EBUILD tpm2-pkcs11-1.9.0-r2.ebuild 1535 BLAKE2B 5dc0aa73843a20453d3b011990b0e0a00449f170c2c8edae7db38380e46fbb8ea58beb4689019cfcd29e1f1d1108f0995eedd15a3da5876f726b54d71c21e8e9 SHA512 0e11c46722330cbc83e8284fe4ce5ce53ef1feaaa899d0546c536535f409e97601d15713a33aee2e9e79cabf6fd2ed9fe01d15cfabbc2ca594763ff4ce8aee56
+AUX tpm2-pkcs11-1.9.1-Fix-prefix-install-variable.patch 464 BLAKE2B 0b76428613cc1498752d5ecd18bc4a4eea53dc1e1fdb39ea20c643313921aad58f1599e9cad17ab68df95420ccba5d9e2aa18cb545aba85f4dc72dbeb33791cc SHA512 b17daee79815d5ea262db907f9605005fe80bea31aab0954e51e79da67325c2910db9bc24a616f05873c6d180557ff15ffbc18b69dca751a0cc1fcc7920508d7
+DIST tpm2-pkcs11-1.9.1.tar.gz 1412372 BLAKE2B 79a40f124e8b00a1dce3f9fe180b6d4f05a45639128592739c64878ff6d9764b3c861d4cfb57759562ac9135f61ad02c1c42831ed04fad86cdb98b260a91d1ad SHA512 c0f76ef941f51f8637906da42917596725dbe15bbd7ab56de9efdb81cbf0ec1a846e752702eb84e08d8c539098755402c519e5f95dce101ac44143de6602c393
+EBUILD tpm2-pkcs11-1.9.1.ebuild 1528 BLAKE2B 0e4216f4b3d2d63c5dc629136f5c8330acab192c8c32ac1296e62b12effa4d7d7d328cce189dd948af25294ef40f23e279ef6c048f278e5fff3748385bb49486 SHA512 695707f7bf18dc4edec3dcce22e507c4b679da57f0259925f03ae69a51685cae0f9830a5fe1188f6d10c0a3631366080c912b07d6b584bd21ea645d196b35a20
 MISC metadata.xml 563 BLAKE2B 2941f98612d53afaa52bb0d6b635ab83f51932a9446dfb4724326ce9a3da9b3c5a94cf1550f1a7d29b0d0bb2176c3d5b9ab38810f2d520617cc36eff029a607e SHA512 7f0b1d5349a60227c434bee6d150f1287182bda634b1197f9b9ebd91cac32cdb4a2e21796728526b1168e9f8d358fdc8d836e93ca65fb6419d26e418ccf87275
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.0-Remove-incorrect-append-in-configure-ac.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.0-Remove-incorrect-append-in-configure-ac.patch
deleted file mode 100644
index 10272341fe42..000000000000
--- a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.0-Remove-incorrect-append-in-configure-ac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 03bc2732826443328550358ba8f2c79195922bc8 Mon Sep 17 00:00:00 2001
-From: Christopher Byrne <salah.coronya@gmail.com>
-Date: Wed, 7 Feb 2024 14:55:38 -0600
-Subject: [PATCH] configure: Change mistaken += to =
-
-Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 771004b..0f1457e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -540,7 +540,7 @@ and submitting patches upstream!])
- # Rather than nesting these and making them ugly just use a counter.
- AX_CHECK_COMPILE_FLAG([-fdata-sections], [strip=y])
- AX_CHECK_COMPILE_FLAG([-ffunction-sections], [strip="y$strip"])
--AX_CHECK_LINK_FLAG([[-Wl,--gc-sections]], [strip+="y$strip"])
-+AX_CHECK_LINK_FLAG([[-Wl,--gc-sections]], [strip="y$strip"])
- 
- AS_IF([test x"$strip" = xyyy], [
-   EXTRA_CFLAGS="$EXTRA_CFLAGS -fdata-sections -ffunction-sections"
--- 
-2.43.0
-
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.1-Fix-prefix-install-variable.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.1-Fix-prefix-install-variable.patch
new file mode 100644
index 000000000000..e698ceb12806
--- /dev/null
+++ b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.1-Fix-prefix-install-variable.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 1ec6eb4..9e47feb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -487,7 +487,7 @@ AM_CONDITIONAL([HAVE_P11KIT], [test "x$have_p11kit" = "xyes"])
+ 
+ # check for --prefix and set flag HAVE_PREFIX if found
+ #   do not change install location if --prefix is given and with P11_KIT found
+-AM_CONDITIONAL([HAVE_PREFIX], [test ! -z "$(prefix)"])
++AM_CONDITIONAL([HAVE_PREFIX], [test ! -z "${prefix}"])
+ 
+ # END P11 CONFIG
+ 
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.9.0-r2.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.9.1.ebuild
index 2efa0a2d8d04..66b0428fd329 100644
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.9.0-r2.ebuild
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="sqlite"
 
 inherit autotools python-single-r1
@@ -32,13 +32,13 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/libyaml
 	dev-libs/openssl:=
 	$(python_gen_cond_dep '
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tpm2-pytss[${PYTHON_USEDEP}]
-	')
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/tpm2-pytss[${PYTHON_USEDEP}]
+		')
 "
 
 DEPEND="test? ( dev-util/cmocka )
@@ -48,7 +48,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.9.0-Remove-incorrect-append-in-configure-ac.patch"
+	"${FILESDIR}/${PN}-1.9.1-Fix-prefix-install-variable.patch"
 )
 
 src_prepare() {
@@ -58,7 +58,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable fapi) \
+		$(use_with fapi) \
 		$(use_enable test unit)
 }