gentoo resync : 12.05.2022

4 files changed, 6 insertions, 67 deletions

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 90ad93a01ccb..2a09b858b779 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,8 +1,5 @@
-AUX tpm2-tools-4.3.0-Remove-WError.patch 360 BLAKE2B 440f48fca6e8aaf9b2c0fd094011738c467a22dc31bd94b53f6788b8fa52c00c5d7ebe074434be60b6370dcf1e94ee4d57bcfc93857fcf03dbdff30c8e157445 SHA512 0d246d1446b5b2ebca0e12467c746a731897311448840a7aac35b57d22edcdec0c9f424d1c95c9614d969a57dba458bbbad8826516cc05329b47d2dad05318fe
 AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac73692dc54475da3044d3afcfe570d6c72f5d8ace2bbf3faf5242002be02c4a765ba9b9c37ba9777d9b4b8bac416e6721d9b8660d19bf2 SHA512 4622e235ef5202cc3448fbc67f362ce36396ca04892c340f275f67c93d5bb2857a14094329ec499c4f7215ac10002b70d18cfc2bdef1474d93f556c5759383ae
 AUX tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch 1380 BLAKE2B ffbbe59cbfd4a411544ef7f03ed04c73afc774edebaa2da8deb11e7fe4f321b88b686d3138fd5524b2279407518dda32de0e1cb96a5517ba87f8cc8c9ddb2be5 SHA512 557ad07048e288a9611222b920e8c82fab9852dde04da2b57981cb04ce3bb9d4ea40c57ba24fb2b3dc09cacc16ef731d11428d0603d757f7f7adc2023c5ca779
-DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b SHA512 1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
-EBUILD tpm2-tools-4.3.2.ebuild 1052 BLAKE2B 7c6f919d4a43a7c990803e12b9f2233c018975c01fe792aa6ea49a944ec4865c57fb947803c8e4b3360fcd5933e24607b0750fe90cdc9272c261f579eecc8997 SHA512 ed36b9a1721c02268e5990b9d63721bbcf0c09eb2360e3dc02f295d83c01b2f98aeb306def7052a79de6b98e10c7edc1ec46aff2009e1babacdbc681a9e33dfd
-EBUILD tpm2-tools-5.2.ebuild 1579 BLAKE2B c0f6797ba6b2d8c325b3824fd9e8b88e4ba75b26f10c46dc905c350b586b0712e0d09cde5777dc5520926e5678c72091a45f16002cdf8f4b59deaa8de067cc88 SHA512 97dae63c0c10aa2df4dd4717c604eaf94be1dede40e09e71939dc792b0683fd3b1e446b3bf4a22720072dfe5100f31f7c70e3a2721f670b6c156a097c4235612
+EBUILD tpm2-tools-5.2-r1.ebuild 1523 BLAKE2B a454c179e2e8e934340e2cc55938636f8f3f509570a44ef0bc4bb86eaefc43d26943418349f9c5c7513aebc1f44dffdd22501298b13e8ee032728a316b063a3b SHA512 25fde96052b52615a7f806e32b6fff0cc2e5b0eb43e6a67ed0512f1f310806864550255fd0f55acb6619fe763ea4775bd57f4d6460f5b0646fb22d35ede52905
 MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
deleted file mode 100644
index caa3fac23bf4..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7b5c2196..d07d5433 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [
- 
-   add_hardened_c_flag([-Wall])
-   add_hardened_c_flag([-Wextra])
--  add_hardened_c_flag([-Werror])
- 
-   add_hardened_c_flag([-Wformat])
-   add_hardened_c_flag([-Wformat-security])
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
deleted file mode 100644
index fc76619d1790..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-	>=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	sys-devel/autoconf-archive"
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
-	sed -i \
-	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-	"${S}/configure.ac" || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fapi) \
-		--enable-hardening
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
index 9b7629c2cc9a..8438c854a1ce 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools bash-completion-r1 python-single-r1
+inherit autotools bash-completion-r1 python-any-r1
 
 DESCRIPTION="Tools for the TPM 2.0 TSS"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
@@ -16,13 +16,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
 	dev-libs/openssl:=
 	net-misc/curl
-	sys-libs/efivar:=
-	${PYTHON_DEPS}"
+	sys-libs/efivar:="
 DEPEND="${RDEPEND}
 	test? (
 		app-crypt/swtpm
@@ -34,7 +32,7 @@ BDEPEND="virtual/pkgconfig
 	test? (
 		app-editors/vim-core
 		dev-tcltk/expect
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	)
 	${PYTHON_DEPS}"