4 files changed, 5 insertions, 88 deletions
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 617723eb5ead..2c1f8c521d55 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,5 +1,3 @@
-AUX tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch 1025 BLAKE2B 4f957dc6a7ceafe53dcf68ded61e2d75d9c09f4b8c056ab92857662e42223b83d99595d7d5c4f89547d3001427a27370d45597349be5261ebd35f30dd105a498 SHA512 6505fa8eba5ead5b75b48d6b4bd1bbf65ac5060fb1d5b77a2b3eec14420fb80d4a712ebb01c7485fc8dd36c5c9a1e9f0b1bd3d9867338858fa63a0070abfec10
-DIST tpm2-tss-engine-1.1.0.tar.gz 394448 BLAKE2B 0502907dc9ce872f31be3b980f975a02af2e3e4b369d188afa5327bd4475d93dbf43769dc7ddc11e8cbda8d1fde09f28a9aef9145e859a90225cd397f62c7a2c SHA512 5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4
-EBUILD tpm2-tss-engine-1.1.0-r1.ebuild 873 BLAKE2B a08a6ac9fb15bb90576eba365aa80e3c23b67df12a6186a84df4f949e2dfb7995d928ffeddfc66367f93fa62b9da9e0898f617f263aaab16e6caed237f912086 SHA512 828b2b3317317f049a00bd073c257db6b39d3aae9d902a6fc6e8206615b18a6f78e3ad26a1f93bd564ac209d2a9defea80dce849c648e6da550af9557516a823
-EBUILD tpm2-tss-engine-1.1.0-r2.ebuild 995 BLAKE2B 637e5639800057b2f132781774944431bb6bbfcf6c66ad64c08dccfa6a8c1b2a720055788db69a45907e1e1760133d82fa82b83c960ee49053aa07b5a8ef7c48 SHA512 d357f6ce46b93ef9d7d3546dec2d128ff91d5a5aa288c5f69ed18b4e436e618771005610e9d8448c9be4333148495e9101492d9725e1ac01d88f78188ce03caa
+DIST tpm2-tss-engine-1.2.0.tar.gz 410605 BLAKE2B f6b88238ed780315cf23dc9caac4639220e76e8daeeb35a0e9bf2f23efb1b45497dd24f43f97d0f4018440b33e2e80de4f321254b9e58708d04a15a3bd922aae SHA512 cd0f1c3b5251ab2f21159099cdb9c0b1cc68d7ad334d4c5245bba9c07274ecea7c86a531afc9ce6250635a9d0929a5147f461cc3760b15cd6ad099342af87ad0
+EBUILD tpm2-tss-engine-1.2.0.ebuild 912 BLAKE2B 166e641ff7298fdc284dffbcd84293c5be7a8f4232321faa5d6bfe7105216bbc57b3f55ef923efffec9f101da7c4a9ef95acf55aaa8fb7ab3568e001c130b028 SHA512 01f494ce396b6407449034b5e2855bda27692719da4336106a8406eaf11272be968072c08a29079d77ef088cc5c849e2cfb95df509644d8fe0a91eafd005f0a2
 MISC metadata.xml 498 BLAKE2B 00c3e4cdaaf71d33864bfdca3585e9874a6d984aa6d825e8ed2dcc00afa022c5908b37da3e391238f4c7519408d4dcaafff40ceee644312e568627c44bfdecec SHA512 459f2c5d0a6051a81cf5f3c17f65248fe8e1681db2032ccebc2a1c0de6ea427c45bb317ffd374bb141f5f06bc16305e61bc591df9d943821fe1ac0f31e4f5323
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch
deleted file mode 100644
index b8114b4c25c0..000000000000
--- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/833531
---- a/configure.ac
-+++ b/configure.ac
-@@ -174,6 +174,8 @@ AC_ARG_WITH([device],
-             [with_device_set=no])
- AM_CONDITIONAL([TESTDEVICE],[test "x$with_device_set" = xyes])
- 
-+AC_CHECK_FUNC([backtrace_symbols_fd],[AC_DEFINE([HAVE_EXECINFO],[1], ['Define to 1 if you have the <execinfo.h> header file.'])])
-+
- # Integration test with simulator
- AS_IF([test "x$enable_integration" = xyes && test "x$with_device_set" = xno],
-       [integration_args=""
---- a/test/error_tpm2-tss-engine-common.c
-+++ b/test/error_tpm2-tss-engine-common.c
-@@ -7,7 +7,9 @@
- #include "tpm2-tss-engine.h"
- #include "tpm2-tss-engine-common.h"
- 
-+#ifdef HAVE_EXECINFO
- #include <execinfo.h>
-+#endif
- #include <stdio.h>
- #include <unistd.h>
- #include <setjmp.h>
-@@ -17,8 +19,10 @@ TSS2_RC
- __wrap_Esys_Initialize()
- {
-     printf("Esys_Initialize called\n");
-+#ifdef HAVE_EXECINFO
-     void* b[128];
-     backtrace_symbols_fd(b, backtrace(b, sizeof(b)/sizeof(b[0])), STDOUT_FILENO);
-+#endif
-     return -1;
- }
-     
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild
deleted file mode 100644
index a737e7269f55..000000000000
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="OpenSSL Engine for TPM2 devices"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss-engine"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/tpm2-tss:=
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable test unit) \
-		--disable-defaultflags \
-		--disable-static \
-		--with-completionsdir="$(get_bashcompdir)"
-}
-
-src_install () {
-	default
-	find "${ED}" -name '*.la' -delete || die
-	dobashcomp bash-completion/*
-}
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r2.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.2.0.ebuild
index c320b9d81d6f..790eff2f51b6 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r2.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.2.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools bash-completion-r1
 
 DESCRIPTION="OpenSSL Engine for TPM2 devices"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tss-engine"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -23,10 +23,6 @@ DEPEND="${RDEPEND}
 BDEPEND="sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-tests-Allow-compilation-under-musl.patch"
-	)
-
 src_prepare() {
 	default
 	eautoreconf