gentoo auto-resync : 25:05:2024 - 00:07:14

3 files changed, 5 insertions, 115 deletions

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index e6e594fcddff..b40fccf7c8dd 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -7,11 +7,10 @@ AUX tpm2-tss-4.1.1-Remove-bash-syntax.patch 1293 BLAKE2B b13f767e097fb2fe4912c0b
 AUX tpm2-tss-4.1.1-int-log-compiler-common.sh-Remove-dependency-on-whic.patch 1052 BLAKE2B 67171fb9b1d2e37bbc71c70d5517930aedb68f7fe326cd63cc2a8cec29f4ca06a5e5823da155a06dccc4f7defa4a6c70bd92d3cc0547a23ab9ef9c6ff686aa39 SHA512 f93bae0037b5ded19ea78cf3dfbffc22db4072d01e0507648d85d581948863b873a468640b571bcd862e486dd5a8b267697ecdf14efa57ee6f83d0ea29580ae2
 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
 EBUILD tpm2-tss-4.0.1-r1.ebuild 2588 BLAKE2B b9a58449aa540dd800e5453091c464edeba60987e0119044cf0caccfbb14ef7d15c7fc28ee27d45d80044f4b6d4df9c56cbead18fffd4819afd53dde921692f0 SHA512 bad17cc8511c05ff8295c1812ac78f48c097563efe2224d9bcf6d3f1cd131149571596f1fc47a7423ee10b88b7221ae8f52bbe05a01ab402369a66ba0a8e62d5
 EBUILD tpm2-tss-4.0.1.ebuild 2492 BLAKE2B a31affba60e4b53ba69ba9bc3dece3bfca550cad98eb21d5cabb4b24e427b321fdb4104cabe6676e8128719d1e0dbf8992ad778df025f2709aefe078e01c3458 SHA512 502461ec7f03aba7d346ede6db2b0f365f16c5e37d4272f27467f62d84c09c12258994f22733f33e3869fa90fefe1fb2e3004e4ec38e5276a67f1ada32442749
 EBUILD tpm2-tss-4.0.2-r1.ebuild 2645 BLAKE2B ae4b32081dd9628b72daea77600cf15e891d6644923f75124fd5d8343972843a3fbb1d749745aa2af1980dd347506ca834c153bd45e119ee8ba6aadac65b3b8d SHA512 bf6340799f4d3abeb3c012e56f861cab2579a3eefd0c5804997c6e257bc2bd1b789464023b282dc3d3bee1a77f021801ecfdd091c4281b5fdc7d2849fb5cc3d4
 EBUILD tpm2-tss-4.0.2.ebuild 2583 BLAKE2B dddc3558af2f942663de1157c99fb4d26a845d51684f94b9c2d95b3af82cd1744852fe69c45d7aeedf45e68a334f76ddb081b1fd1fe5db8208d5dd64ebac0afb SHA512 7df61c8d336026c2679071571ed48143d5a4c367677f2b40b514832a15d468c1d8bc03f0bea61922a42faf304b5743f000cce6903193b16ad63d72679eb7c873
-EBUILD tpm2-tss-4.1.1-r1.ebuild 2652 BLAKE2B 274e9278d380cd4edbcc343fbc3a7af09fafef9892e4565ec1d601688ce6163ff6f837e3eea29cf4ba03d8a99d9b5a9803d456dec3d54add5bf2e00d66476163 SHA512 26318d63e67c5fc10ad0e5e8e3e668b1be2b6c668733d39f47a8667895ef7105edd9ac40770a2a0b4a9ed471def7c26f56dc7feb92a075fab273c6f7d137ec0b
-EBUILD tpm2-tss-4.1.1.ebuild 2434 BLAKE2B 6d9d66fa2e03c9a1933d14b7fe09f5146df232aa3b11cba4008ae5e1c1c7f247ab0bb38553f3a9bced5f3536fb2eb95b4c3bc8fe113a067c21b64481afb9ab05 SHA512 80bc38751bf15cbe7e65733f00af178e7cba5d66976fb87d39ed55108365997de41258fd3e0890fce34aec7521f31fdb6d0c1be6826585f8b99d1b45979866e2
+EBUILD tpm2-tss-4.1.3.ebuild 2514 BLAKE2B c669ba0828072e0c664492e697bbad79f8d4167e5f533db041e44c89714f3ff002a651b795eea31a5de310cbb9d0b47097c6680d55bab268cb5fab2b24355e4d SHA512 0edda24ab12c9599e7826d8c62841d71e69cd5de4751faad15e5b470a6b97c5bd93af5dd2410fd6bf994b79bbb84f36c92e1d18c8d58dd08a0196c3b8a228a5f
 MISC metadata.xml 835 BLAKE2B 58fcbb63b8fd77dd42f081e060cec1fc5593d13ad9237bd644462fd839a1fea9936342d5339a3ec8d339106ca6074c73ac31e7546feb0f1c5f0f212b21831d8a SHA512 941bfce986619b387410d49fe046218a388243c257a3164293033f8ebb4e2d64d7ff06d35dd4ef770a9e9194035839d68dcf1f00edbe439272c2e9c01ecb3c6b
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)"