3 files changed, 4 insertions, 113 deletions
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index dea1ae67e62e..e08c54ad4a15 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-tss-4.0.1.tar.gz 1787139 BLAKE2B 627cdefeff6c64148f9da1425922a0a7a72debcee4930ffab208a3b9b66127c2d4f923e3e105bfd45410cdb13c19cb40cc15a720e9a05dd32ff622dabf5fcc32 SHA512 ed6ddc52cb0e8c1082a4bb001e1225eb9905fd2380da88db5fd69ff5b5d9d43a93eb67b634e49d53eb5d586832da3aef2c4c7e5f18d51bb730481f8913319d7d
 DIST tpm2-tss-4.0.2.tar.gz 1833499 BLAKE2B 91e70bcc66099fe5d7d53cf98a2c46582e96f204fc7bcb89c46497cc811ca1eb39c752be077a6e8132fc980a6581a2df075fcc6670d646d1270e642c144f043c SHA512 e92038de985ac928bf87a707b0f9b190aaa936827923ea5e3cbdda216cbc6cf8590af650c59c2e1e420ad9914dc6c1f14232ab7930ffc1a50fb0c49fdef6d3f0
-DIST tpm2-tss-4.1.1.tar.gz 1901759 BLAKE2B 96e154e0778caf8ba8d7299c82ff1614c26254fe741290a588fa251a3013bdda26f720c148d400dc068851746e85719ae78068d64eef1067f3d45c540a303284 SHA512 a8fdc85e44c4a7960cdc21fd46154fbdb63992e072cc4356f472c962a751a826906604848b7b2608344494f85f72d591f4c0bdf42e3df7491446bdecbe22f2af
+DIST tpm2-tss-4.1.3.tar.gz 1902009 BLAKE2B d8592f4797a4254883667476efb2fdf3c95547d9c472fe3557031e934c725e20e3cc70a9b7b41eaddac71e8d9f94beb5fbb39aec5d81b3eeb1b612df27312923 SHA512 c9a5e1e90f6545a466d43790ab2d67c52c4b788a0b21f8212575e27e04e0ac663105863fe00824e08a4e56a4f8c6b00c48c1a1c132531b8569cd5042c3bb9e69
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.1.1-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.1.1-r1.ebuild
deleted file mode 100644
index eb0fa6293ad5..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 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
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	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-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
-	"${FILESDIR}/${PN}-4.1.1-int-log-compiler-common.sh-Remove-dependency-on-whic.patch"
-	"${FILESDIR}/${PN}-4.1.1-Remove-bash-syntax.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() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	local myconf=(
-		--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-tcti-spi-ltt2go
-		--disable-tcti-spi-ftdi
-		--disable-tcti-i2c-ftdi
-		--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"
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-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
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.1.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild
index 7e6bf442977f..79327c45219d 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-4.1.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild
@@ -78,6 +78,9 @@ multilib_src_configure() {
 		$(multilib_native_use_enable test integration)
 		$(multilib_native_use_enable test self-generated-certificate)
 		--disable-tcti-libtpms
+		--disable-tcti-spi-ltt2go
+		--disable-tcti-spi-ftdi
+		--disable-tcti-i2c-ftdi
 		--disable-defaultflags
 		--disable-weakcrypto
 		--with-crypto="$(usex mbedtls mbed ossl)"