[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

["Mikle Kolyada" <zlogene@gentoo.org>]

commit:     67d70633119f9edce686d0233fded6db1423e8d5
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 16:32:07 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May  2 16:40:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d70633

app-crypt/tpm2-tools: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild | 8 +++-----
 app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild   | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
index f9edff247c5..01663f80cd5 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+fapi libressl"
+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
@@ -21,13 +21,11 @@ RESTRICT="test"
 
 RDEPEND="net-misc/curl:=
 	>=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	sys-devel/autoconf-archive"
 PATCHES=(
-	"${FILESDIR}/${PN}-4.3.0-libressl.patch"
 	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )
 
@@ -42,5 +40,5 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable fapi) \
-		$(use_enable !libressl hardening)
+		--enable-hardening
 }

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
index 375c04e216e..344be726c38 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+fapi libressl"
+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
@@ -21,13 +21,11 @@ RESTRICT="test"
 
 RDEPEND="net-misc/curl:=
 	>=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	sys-devel/autoconf-archive"
 PATCHES=(
-	"${FILESDIR}/${PN}-5.0-libressl.patch"
 	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )
 
@@ -42,5 +40,5 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable fapi) \
-		$(use_enable !libressl hardening)
+		--enable-hardening
 }