gentoo auto-resync : 26:06:2023 - 01:31:19

12 files changed, 2 insertions, 704 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 414f66f9a1f6..d45ad8c1763b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 89c92214ebe8..e5b40ce32c4f 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,3 +1,3 @@
 DIST rhash-1.4.3-src.tar.gz 429290 BLAKE2B d225aeae0b3a8fb2e093a9aef50cd07a790c7e9734e91114deef2ca8492c85261b8ed5dea45958e35e049ea888885175608962ea72297bdef48b00c52f51eaca SHA512 d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7
-EBUILD rhash-1.4.3.ebuild 2141 BLAKE2B 341f0302fed17a6424b6b07aaba6d01632e96ec0c100cd0a3214b9d341df9b41da1889cf91f5778f4396562858822bd2c1412e2beee443c53557baf2e25f44dd SHA512 0f5a1368bb481b676abf394d97d01b7460f502b90405631a0d256db05bad8af945fe94301c20274a3e7156c963dfc916d41c79b856ba616eb8d5f2e32af7041e
+EBUILD rhash-1.4.3.ebuild 2113 BLAKE2B 2462ca1adacaedcfe7352553356498ba501ecf184c79ff64c29ee40b88d987ef1e45da8987f17c33d7e8cd40fa244e81fd41d1c91aa9fb3f8da49c06ed72aa85 SHA512 f2192895a9ae0195f403e1feddce71a10df7105765892a09f219614b2be50b9f20205baadf5f6ce32997d56ad5fed733e839fb5493f76423d8329c9be3d66763
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/rhash-1.4.3.ebuild b/app-crypt/rhash/rhash-1.4.3.ebuild
index f466b436e267..b7b11fc50fbd 100644
--- a/app-crypt/rhash/rhash-1.4.3.ebuild
+++ b/app-crypt/rhash/rhash-1.4.3.ebuild
@@ -81,7 +81,7 @@ multilib_src_install() {
 	emake DESTDIR="${D}" -j1 \
 		install{,-lib-headers,-pkg-config} \
 		$(multilib_is_native_abi && use nls && echo install-gmo) \
-		$(use kernel_Winnt || echo install-lib-so-link)
+		install-lib-so-link
 }
 
 multilib_src_test() {
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 8dfa5295509b..5840bc394388 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,16 +1,4 @@
-AUX tpm2-tss-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch 2556 BLAKE2B ea8799561378e718019ed2e3885a91f5b5a270f65eb22f11f952e4346fe066f40fc8ae21230d77c53f4a2ebee3d508342777f34e7e7aa6aa81fcd48fb766984e SHA512 ba555d93affd142c213cc023ddccdfbdfabc9aa05528005cca5bd51751f729c6b44111054443f7ed69c1316cf2986b1f84d5c470e918a1ac34f9c4760eb2e596
-AUX tpm2-tss-3.2.0-slibtool.patch 3603 BLAKE2B f0a0047b316396dfa5800702b793bf5247d62be75704be42968b7719a87a25200b6870e14f87ccb45876b53600052b6716386493ddcbead87857093188608621 SHA512 8c20df4be8857dfcf030770e74f27dc14c31f4a5b6eb1a90c9dca6f0dd01987a7983478c0dfe9774669b9f8fc9ddace66d5d51f991582ba3689bcdcea64a1b86
-AUX tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch 4895 BLAKE2B cb6e4d4544bb78e4fb768b4943dc0ebd381e2a480528d824634f486343955ea29370a731f5bbec222f653a3194615b4cbf13749fa089b58e2ded29e6bcaf06b8 SHA512 1fae2396bcf7bf1af55d4a8e6aa522e8a86344252a3b642c16f84158a3e3eb98dd2d0e2e41c2f13fa25af9452dd1a252bed4af91896aa2efa23029aa0ed1bf2f
-AUX tpm2-tss-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch 2651 BLAKE2B a14f328ff6942ad76ec16e818730073b2086bcf97542d966ee252cf36e417932ef45c1780f69436af5f032c7b11095e6645bd0a1cf9ab56a93fccdd4bb88ca75 SHA512 434ffe40495bc5adca0eea2a58ae8ef1fc7ff145cc7e096cdd436e96eee420f6f671e9bf5be7254918810773ae2f6a91d04b6039e5cb6cc472b12066ffe5bc49
 AUX tpm2-tss-4.0.0-Dont-install-files-into-run.patch 880 BLAKE2B 8ae9b55e853dcd117730eebc274252ea7afc4e3e415eafb21d3994690687cc9daa796a97536597da8cbfc4f54567cbb678fe61ba4eb4fdc1dee6d851d472efa3 SHA512 811dd1d2597557cf9fd08d7231cd5f48a8dd9dc76adf33bc4a0ee978dc8973fc5309bdc7386cbd9878b78dba1b4a8ecf9c2e2f856c887b141a423f0d94e3244e
-DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
-DIST tpm2-tss-3.2.1.tar.gz 1638566 BLAKE2B bdf5eeca1e7269a639cefd8b4a38e16c5b7c08518411a22718dcd14bc9fe3b621eee77cdd98f9ece0f6d9a52319bce5e0a502ff9a6e4ba6716341bd01f5967a9 SHA512 dbe5e29349d78621fcd608d9c75fa58f5e6462264b9654ca85af9f9faafebe1107d9f735a1b6ad4956a089b0dd96cbda3f46364cabd846f9fb29a419b074c78f
-DIST tpm2-tss-3.2.2.tar.gz 1638857 BLAKE2B 164c54b7c43a3379a9aae86fd39788a0906030bc2df9a96d7264635b0e281088f46f470d28098e194e77067f1c4412a8f1ef30d7877eb2410aeefee2d3639409 SHA512 efa71d04de907f74cf0e451a55124cb6fa804fddc2530ecc728a76030e0ae1e8597048c81cd4316397318f273e95754cf85745fc49966208b60babd398989aa6
-DIST tpm2-tss-4.0.0.tar.gz 1787084 BLAKE2B 9b9d466eab77ae71ec916c911f9e1321013fe49594e103610fcb03492a2f20e811a2faddc2237519b710a1931226d5664581cd671d2318319a92e16bcb5ccfb4 SHA512 1058aa74e2358bfb60a17b85291dc642d40b49bb076453810c5b2b0c37c72671c319d783c879f719ccbe7aaeb5f464e0144c6ee12d28242b477be5d579cb3f9c
 DIST tpm2-tss-4.0.1.tar.gz 1787139 BLAKE2B 627cdefeff6c64148f9da1425922a0a7a72debcee4930ffab208a3b9b66127c2d4f923e3e105bfd45410cdb13c19cb40cc15a720e9a05dd32ff622dabf5fcc32 SHA512 ed6ddc52cb0e8c1082a4bb001e1225eb9905fd2380da88db5fd69ff5b5d9d43a93eb67b634e49d53eb5d586832da3aef2c4c7e5f18d51bb730481f8913319d7d
-EBUILD tpm2-tss-3.2.0-r4.ebuild 2770 BLAKE2B 72a9aeab39843fa5f59a73c1cd52148ec74d785222474a576f369c78c95be2d76fbc10e8eb8715f3314f5cc3504a09fbd8be26f59867435616af537979254009 SHA512 6dbf11de1a9615d1b19183a84df5fbd113c59cc6df1c82e642461f637bf6334a00e15d5fb28d039473fc594167248ca087e1f2203d8340a4a32c92b1d4e63813
-EBUILD tpm2-tss-3.2.1.ebuild 2239 BLAKE2B 977935a7d06de6eccfa56a2ca9b3ef9ec1c35e66f34e03f866a21cb4b8e88941f8c9e99ee05e9f4bc03d882c262e996b8a59e4a55a28fa48ce7fe070b352544d SHA512 5dae9dbe08390dbfe91c07abe0e5754e61098e41c819c57be66695244d22a3de6ef0599d4d12e3714a0a9d34051d524c3aa702613d3edecb40151432756231df
-EBUILD tpm2-tss-3.2.2.ebuild 2234 BLAKE2B 5a3d949199a85978142d7ff125b343f616a473966665f317798698709cce326969f23ea43b76bc614105caa19b91a98d31211420378cb12af8fa811997396183 SHA512 60072faab0e67a617df1fb14715e870a1ad8c683a4d9b5d900b70c77b86d2c8dfc2e5ebc2b738c0b341ad94d4a84c9c6ec5932799baf25b22dd31818d206af36
-EBUILD tpm2-tss-4.0.0.ebuild 2319 BLAKE2B 2226d74ede3fe17e44848e1a41a16143b06773b33f86093e1a1fe25a96acb024b2a8fb073ade80568a53c4833283e11fd302dbd9f41faf61e95243848ff1844d SHA512 69787586fad184ffa65f32252d8249b2ae7c01671a4f5b08908e43c3b35cd6b21d353ec1d65962e59798871e55f16f2bbde108068afb43c1b308764ee844508a
 EBUILD tpm2-tss-4.0.1.ebuild 2357 BLAKE2B 1b2a4910e57b85bca930d47aadbfcb0fda6cb8be7fe288ca9b20fc0627f6a4c3a767f349fbc01d505a089ddde93558a7b5c040e549d09701c7110b84dc346d62 SHA512 9781d67e9466524464ac5f30b808d2b0370295268806924ef9548fe3975c90c8f58945dc87ac90d5800d08f76ea71647cfe41614608fd6e37201026b4c80ffb2
 MISC metadata.xml 835 BLAKE2B 58fcbb63b8fd77dd42f081e060cec1fc5593d13ad9237bd644462fd839a1fea9936342d5339a3ec8d339106ca6074c73ac31e7546feb0f1c5f0f212b21831d8a SHA512 941bfce986619b387410d49fe046218a388243c257a3164293033f8ebb4e2d64d7ff06d35dd4ef770a9e9194035839d68dcf1f00edbe439272c2e9c01ecb3c6b
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index 90b12801226b..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index ce19aac3..22a8c075 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -498,10 +498,9 @@ fapi-config.json: dist/fapi-config.json.in
- 		-e 's|[@]userstatedir@|$(userstatedir)|g' \
- 		< "$<" > "$@"
- 
--sysusers_DATA = dist/sysusers.d/tpm2-tss.conf
- tmpfiles_DATA = tpm2-tss-fapi.conf
- 
--EXTRA_DIST += dist/sysusers.d/tpm2-tss.conf dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-+EXTRA_DIST += dist/tmpfiles.d/tpm2-tss-fapi.conf.in
- CLEANFILES += tpm2-tss-fapi.conf
- 
- # We have to do this ourselves, in order to get absolute paths
-@@ -726,13 +725,6 @@ EXTRA_DIST += dist/tpm-udev.rules
- 
- install-dirs:
- if HOSTOS_LINUX
--if SYSD_SYSUSERS
--	@echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf"
--	@systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group"
--else
--	@echo "call make_tss_user_and_group"
--	@$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
--endif
- if SYSD_TMPFILES
- 	@echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf"
- 	@systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions"
-diff --git a/configure.ac b/configure.ac
-index 6482944f..44c0e383 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -483,22 +483,9 @@ AS_IF([test "x$enable_integration" = "xyes" && test "x$enable_self_generated_cer
-       [AC_MSG_WARN([Running integration tests without EK certificate verification, use --enable-self-generated-certificate for full test coverage])])
- 
- # Check for systemd helper tools used by make install
--AC_CHECK_PROG(systemd_sysusers, systemd-sysusers, yes)
--AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes")
- AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes)
- AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes")
- 
--# Check all tools used by make install
--AS_IF([test "$HOSTOS" = "Linux"],
--    [ AC_CHECK_PROG(useradd, useradd, yes)
--      AC_CHECK_PROG(groupadd, groupadd, yes)
--      AC_CHECK_PROG(adduser, adduser, yes)
--      AC_CHECK_PROG(addgroup, addgroup, yes)
--      AS_IF([test "x$addgroup" != "xyes" && test "x$groupadd" != "xyes" ],
--         [AC_MSG_ERROR([addgroup or groupadd are needed.])])
--      AS_IF([test "x$adduser" != "xyes" && test "x$useradd" != "xyes" ],
--         [AC_MSG_ERROR([adduser or useradd are needed.])])])
--
- AC_SUBST([PATH])
- 
- dnl --------- Doxy Gen -----------------------
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-slibtool.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-slibtool.patch
deleted file mode 100644
index b7d5e5c7d96d..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-slibtool.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Bug: https://bugs.gentoo.org/858674
-Upstream-PR: https://github.com/tpm2-software/tpm2-tss/pull/2391
-Upstream-Commit: https://github.com/tpm2-software/tpm2-tss/commit/5e626ab72283017cf4cb2dc4b101d16a58a6c470
-
-From f61fd726c064e909b7576f233f0ad0e885e1752e Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Thu, 14 Jul 2022 09:22:49 -0700
-Subject: [PATCH] build: Remove erroneous comma
-
-When building tpm2-tss with slibtool instead of GNU libtool the build
-will fail during 'make check'. This happens because there is an extra
-erroneous comma which is then passed to gcc causing it to fail to find a
-non-existent file. With GNU libtool it appears that the comma is
-silently removed while slibtool does not do this.
-
-rdlibtool --tag=CC --mode=link gcc -I./src -I./include/tss2 -I./test/fuzz/tcti -std=c99 -Wall -Wextra -Wformat-security -Werror -fstack-protector-all -fpic -fPIC -Wno-missing-braces -Wstrict-overflow=5 -DINTERNALBUILD=1 -I./include -I./src/tss2-mu -I./src/tss2-sys -I./src/tss2-esys -I./src/tss2-fapi -I./test/data -Wno-unused-parameter -Wno-missing-field-initializers -DTOP_SOURCEDIR="." -DTOP_SOURCEDIR="." -g -Wl,--wrap=read -Wl,--wrap=write, -Wl,--wrap=poll -Wl,--wrap=open -o test/unit/tcti-device test/unit/tcti_device-tcti-device.o src/tss2-tcti/test_unit_tcti_device-tcti-common.o src/tss2-tcti/test_unit_tcti_device-tcti-device.o -lcmocka src/tss2-mu/libtss2-mu.la libutil.la
-
-rdlibtool: lconf: {.name="libtool"}.
-rdlibtool: fdcwd: {.fdcwd=AT_FDCWD, .realpath="/tmp/tpm2-tss"}.
-rdlibtool: lconf: fstatat(AT_FDCWD,".",...) = 0 {.st_dev = 45, .st_ino = 15835}.
-rdlibtool: lconf: openat(AT_FDCWD,"libtool",O_RDONLY,0) = 3.
-rdlibtool: lconf: found "/tmp/tpm2-tss/libtool".
-rdlibtool: link: gcc test/unit/tcti_device-tcti-device.o src/tss2-tcti/test_unit_tcti_device-tcti-common.o src/tss2-tcti/test_unit_tcti_device-tcti-device.o .libs/libutil.a -I./src -I./include/tss2 -I./test/fuzz/tcti -std=c99 -Wall -Wextra -Wformat-security -Werror -fstack-protector-all -fpic -fPIC -Wno-missing-braces -Wstrict-overflow=5 -DINTERNALBUILD=1 -I./include -I./src/tss2-mu -I./src/tss2-sys -I./src/tss2-esys -I./src/tss2-fapi -I./test/data -Wno-unused-parameter -Wno-missing-field-initializers -DTOP_SOURCEDIR="." -DTOP_SOURCEDIR="." -g -Wl,--wrap=read -Wl,--wrap=write, -Wl,--wrap=poll -Wl,--wrap=open -lcmocka -Lsrc/tss2-mu/.libs -ltss2-mu -L.libs -o test/unit/.libs/tcti-device
-/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find : No such file or directory
-collect2: error: ld returned 1 exit status
-rdlibtool: exec error upon slbt_exec_link_create_executable(), line 1745: (see child process error messages).
-rdlibtool: < returned to > slbt_exec_link(), line 2155.
-make[1]: *** [Makefile:14899: test/unit/tcti-device] Error 2
-make[1]: Leaving directory '/tmp/tpm2-tss'
-make: *** [Makefile:29619: check-am] Error 2
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- Makefile-test.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile-test.am b/Makefile-test.am
-index bb933e956..533dfb38a 100644
---- a/Makefile-test.am
-+++ b/Makefile-test.am
-@@ -413,7 +413,7 @@ if UNIT
- if ENABLE_TCTI_DEVICE
- test_unit_tcti_device_CFLAGS  = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
- test_unit_tcti_device_LDADD   = $(CMOCKA_LIBS) $(libtss2_mu) $(libutil)
--test_unit_tcti_device_LDFLAGS = -Wl,--wrap=read -Wl,--wrap=write, -Wl,--wrap=poll  \
-+test_unit_tcti_device_LDFLAGS = -Wl,--wrap=read -Wl,--wrap=write -Wl,--wrap=poll  \
-         -Wl,--wrap=open
- test_unit_tcti_device_SOURCES = test/unit/tcti-device.c \
-     src/tss2-tcti/tcti-common.c \
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch
deleted file mode 100644
index aff792a28263..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-https://github.com/tpm2-software/tpm2-tss/commit/bda22252507124bb8e466ac2f0c61d5ebed9027d
-https://github.com/tpm2-software/tpm2-tss/pull/2423
-https://bugs.gentoo.org/833530
-
-From bda22252507124bb8e466ac2f0c61d5ebed9027d Mon Sep 17 00:00:00 2001
-From: William Roberts <william.c.roberts@intel.com>
-Date: Mon, 26 Sep 2022 15:16:15 -0500
-Subject: [PATCH] test: fix usage of FILE in unit test fapi-io
-
-The unit test had a static FILE structure used to pass to stdio FILE *
-routines as a dummy value to indicate to use the __real_xxx variant of
-the mocked function. This doesn't work when FILE is opaque as the
-compiler cannot figure out how much storage space is needed for a FILE
-struct.
-
-Fix this by passing a dummy pointer to a data type the compiler knows
-about and casting it to FILE pointer.
-
-Fixes: #2419
-
-Signed-off-by: William Roberts <william.c.roberts@intel.com>
----
- test/unit/fapi-io.c | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/test/unit/fapi-io.c b/test/unit/fapi-io.c
-index dbadcb47..8a883a43 100644
---- a/test/unit/fapi-io.c
-+++ b/test/unit/fapi-io.c
-@@ -38,7 +38,9 @@
- bool wrap_fcntl_test = false;
- bool wrap_malloc_test = false;
- bool wrap_read_test = false;
--FILE mock_stream; /**< stream will be used to activate wrapper.*/
-+char _mock_stream; /**< stream will be used to activate wrapper.*/
-+
-+#define MOCK_STREAM ((FILE *)(&_mock_stream))
- 
- /*
-  * Wrapper functions for file system io.
-@@ -74,7 +76,7 @@ __real_fclose(FILE *stream, ...);
- int
- __wrap_fclose(FILE *stream, ...)
- {
--    if (stream != &mock_stream) {
-+    if (stream != MOCK_STREAM) {
-         return __real_fclose(stream);
-     }
-     return mock_type(int);
-@@ -86,7 +88,7 @@ __real_fseek(FILE *stream, long offset, int whence, ...);
- int
- __wrap_fseek(FILE *stream, long offset, int whence, ...)
- {
--    if (stream != &mock_stream) {
-+    if (stream != MOCK_STREAM) {
-         return __real_fseek(stream, offset, whence);
-     }
-     return mock_type(int);
-@@ -98,7 +100,7 @@ __real_ftell(FILE *stream, ...);
- long
- __wrap_ftell(FILE *stream, ...)
- {
--    if (stream != &mock_stream) {
-+    if (stream != MOCK_STREAM) {
-         return __real_ftell(stream);
-     }
-     return mock_type(int);
-@@ -135,7 +137,7 @@ __real_fileno(FILE *stream, ...);
- int
- __wrap_fileno(FILE *stream, ...)
- {
--    if (stream != &mock_stream) {
-+    if (stream != MOCK_STREAM) {
-         return __real_fileno(stream);
-     }
-     return 1;
-@@ -179,7 +181,7 @@ check_io_read_async(void **state) {
-     assert_int_equal(r, TSS2_FAPI_RC_IO_ERROR);
- 
-     wrap_fcntl_test = true;
--    will_return(__wrap_fopen, &mock_stream);
-+    will_return(__wrap_fopen, MOCK_STREAM);
-     will_return(__wrap_fcntl, -1);
-     will_return_always(__wrap_fclose, 0);
-     errno = EAGAIN;
-@@ -187,8 +189,8 @@ check_io_read_async(void **state) {
-     r = ifapi_io_read_async(&io, "tss_unit_dummyf");
-     assert_int_equal(r, TSS2_FAPI_RC_IO_ERROR);
- 
--    will_return(__wrap_fopen, &mock_stream);
--    will_return(__wrap_fopen, &mock_stream);
-+    will_return(__wrap_fopen, MOCK_STREAM);
-+    will_return(__wrap_fopen, MOCK_STREAM);
-     will_return(__wrap_fcntl, 0);
-     will_return(__wrap_fseek, 0);
-     will_return(__wrap_ftell, 1);
-@@ -202,8 +204,8 @@ check_io_read_async(void **state) {
- 
-     wrap_malloc_test = false;
- 
--    will_return(__wrap_fopen, &mock_stream);
--    will_return(__wrap_fopen, &mock_stream);
-+    will_return(__wrap_fopen, MOCK_STREAM);
-+    will_return(__wrap_fopen, MOCK_STREAM);
-     will_return(__wrap_fcntl, 0);
-     will_return(__wrap_fseek, 0);
-     will_return(__wrap_ftell, 1);
-@@ -236,7 +238,7 @@ check_io_read_finish(void **state) {
-     will_return_always(__wrap_fclose, 0);
-     io.char_buffer = &io_char_buffer[0];
-     io.buffer_length = 10;
--    io.stream = &mock_stream;
-+    io.stream = MOCK_STREAM;
-     errno = EAGAIN;
-     r = ifapi_io_read_finish(&io, &buffer[0], &count);
-     assert_int_equal(r, TSS2_FAPI_RC_TRY_AGAIN);
-@@ -298,7 +300,7 @@ check_io_write_async(void **state) {
-     assert_int_equal(r, TSS2_FAPI_RC_IO_ERROR);
- 
-     wrap_fcntl_test = true;
--    will_return(__wrap_fopen, &mock_stream);
-+    will_return(__wrap_fopen, MOCK_STREAM);
-     will_return(__wrap_fcntl, -1);
- 
-     errno = EAGAIN;
-@@ -306,7 +308,7 @@ check_io_write_async(void **state) {
-     assert_int_equal(r, TSS2_FAPI_RC_IO_ERROR);
- 
-     io.char_rbuffer = NULL;
--    will_return(__wrap_fopen, &mock_stream);
-+    will_return(__wrap_fopen, MOCK_STREAM);
-     will_return(__wrap_fcntl, 0);
-     will_return(__wrap_fcntl, 0);
-     will_return(__wrap_fcntl, -1);
-@@ -345,7 +347,7 @@ check_io_write_finish(void **state) {
-     will_return_always(__wrap_fclose, 0);
- 
-     wrap_write_test = true;
--    io.stream = &mock_stream;
-+    io.stream = MOCK_STREAM;
-     will_return(__wrap_write, -1);
-     errno = EAGAIN;
-     r = ifapi_io_write_finish(&io);
--- 
-2.35.1
-
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index 7e55f965bd2f..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6242b19c..b30ec6e0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -492,7 +492,6 @@ fapi-config.json: dist/fapi-config.json.in
- 		-e 's|[@]userstatedir@|$(userstatedir)|g' \
- 		< "$<" > "$@"
- 
--sysusers_DATA = dist/sysusers.d/tpm2-tss.conf
- tmpfiles_DATA = tpm2-tss-fapi.conf
- 
- CLEANFILES += tpm2-tss-fapi.conf
-@@ -516,7 +515,6 @@ EXTRA_DIST +=  \
-     dist/fapi-config.json.in \
-     dist/fapi-profiles/P_RSA2048SHA256.json \
-     dist/fapi-profiles/P_ECCP256SHA256.json \
--    dist/sysusers.d/tpm2-tss.conf \
-     dist/tmpfiles.d/tpm2-tss-fapi.conf.in \
-     doc/fapi-config.md \
-     doc/fapi-profile.md \
-@@ -726,13 +724,6 @@ EXTRA_DIST += dist/tpm-udev.rules
- 
- install-dirs:
- if HOSTOS_LINUX
--if SYSD_SYSUSERS
--	@echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf"
--	@systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group"
--else
--	@echo "call make_tss_user_and_group"
--	@$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
--endif
- if SYSD_TMPFILES
- 	@echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf"
- 	@systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions"
-diff --git a/configure.ac b/configure.ac
-index 83554edd..c9599b93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -483,22 +483,9 @@ AS_IF([test "x$enable_integration" = "xyes" && test "x$enable_self_generated_cer
-       [AC_MSG_WARN([Running integration tests without EK certificate verification, use --enable-self-generated-certificate for full test coverage])])
- 
- # Check for systemd helper tools used by make install
--AC_CHECK_PROG(systemd_sysusers, systemd-sysusers, yes)
--AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes")
- AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes)
- AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes")
- 
--# Check all tools used by make install
--AS_IF([test "$HOSTOS" = "Linux"],
--    [ AC_CHECK_PROG(useradd, useradd, yes)
--      AC_CHECK_PROG(groupadd, groupadd, yes)
--      AC_CHECK_PROG(adduser, adduser, yes)
--      AC_CHECK_PROG(addgroup, addgroup, yes)
--      AS_IF([test "x$addgroup" != "xyes" && test "x$groupadd" != "xyes" ],
--         [AC_MSG_ERROR([addgroup or groupadd are needed.])])
--      AS_IF([test "x$adduser" != "xyes" && test "x$useradd" != "xyes" ],
--         [AC_MSG_ERROR([adduser or useradd are needed.])])])
--
- AC_SUBST([PATH])
- 
- dnl --------- Doxy Gen -----------------------
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild
deleted file mode 100644
index f4bd7889b8ec..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
-		fapi? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )"
-BDEPEND="sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch"
-	"${FILESDIR}/${PN}-3.2.0-slibtool.patch" # 858674
-	"${FILESDIR}/${PN}-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-
-	# See bug #833887 (and similar); eautoreconf means .pc file gets wrong version.
-	sed -i \
-	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-		"configure.ac" || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	ECONF_SOURCE=${S} econf \
-		--localstatedir=/var \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable test unit) \
-		$(multilib_native_use_enable test integration) \
-		$(multilib_native_use_enable test self-generated-certificate) \
-		--disable-tcti-libtpms \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex mbedtls mbed ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--with-sysusersdir="/usr/lib/sysusers.d" \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-multilib_src_install() {
-	default
-
-	if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then
-		# Safeguard for bug #833887
-		die "pkg-config file version doesn't match ${PV}! Please report a bug!"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.1.ebuild
deleted file mode 100644
index 0a1f2270a6ce..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="doc +fapi +openssl mbedtls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
-		fapi? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )"
-BDEPEND="sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-multilib_src_configure() {
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	ECONF_SOURCE=${S} econf \
-		--localstatedir=/var \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable test unit) \
-		$(multilib_native_use_enable test integration) \
-		$(multilib_native_use_enable test self-generated-certificate) \
-		--disable-tcti-libtpms \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex mbedtls mbed ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--with-sysusersdir="/usr/lib/sysusers.d" \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.2.ebuild
deleted file mode 100644
index 98139319e210..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
-		fapi? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )"
-BDEPEND="sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-multilib_src_configure() {
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	ECONF_SOURCE=${S} econf \
-		--localstatedir=/var \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable test unit) \
-		$(multilib_native_use_enable test integration) \
-		$(multilib_native_use_enable test self-generated-certificate) \
-		--disable-tcti-libtpms \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex mbedtls mbed ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--with-sysusersdir="/usr/lib/sysusers.d" \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild
deleted file mode 100644
index c3ee7e33a8d1..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
-		fapi? ( openssl !mbedtls )
-		policy? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )"
-BDEPEND="sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch"
-	)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	ECONF_SOURCE=${S} econf \
-		--localstatedir=/var \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable policy) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable test unit) \
-		$(multilib_native_use_enable test integration) \
-		$(multilib_native_use_enable test self-generated-certificate) \
-		--disable-tcti-libtpms \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex mbedtls mbed ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--without-sysusersdir \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}