From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8827C15808C for ; Sat, 26 Feb 2022 02:44:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEE28E082B; Sat, 26 Feb 2022 02:43:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D483E0831 for ; Sat, 26 Feb 2022 02:43:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C44BC342F6F for ; Sat, 26 Feb 2022 02:43:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4FDE30F for ; Sat, 26 Feb 2022 02:43:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645843415.f017a49dbc8dda50bb125667a1340ac80c34e330.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/ima-evm-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild X-VCS-Directories: app-crypt/ima-evm-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f017a49dbc8dda50bb125667a1340ac80c34e330 X-VCS-Branch: master Date: Sat, 26 Feb 2022 02:43:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a799ef39-6743-4dd4-b927-0e7645a5c86c X-Archives-Hash: e64cd0a46b575d23afa82bc31c88fb17 commit: f017a49dbc8dda50bb125667a1340ac80c34e330 Author: Sam James gentoo org> AuthorDate: Sat Feb 26 02:42:36 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 26 02:43:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f017a49d app-crypt/ima-evm-utils: sync live ebuild Signed-off-by: Sam James gentoo.org> app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild | 4 ++-- app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild index 8a6872dda3e1..3f32ba3defbf 100644 --- a/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild +++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.4-configure-remove-automagic-TSS-dependencies.patch" "${FILESDIR}/${PN}-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch" "${FILESDIR}/${PN}-1.4-test-remove-boot_aggregate.patch" - ) +) src_prepare() { default diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild index bdb4d49d4f72..7237825ff877 100644 --- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild +++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools git-r3 @@ -11,11 +11,12 @@ EGIT_REPO_URI="https://git.code.sf.net/p/linux-ima/ima-evm-utils" LICENSE="GPL-2" SLOT="0" -IUSE="debug test" +IUSE="debug test tpm" RDEPEND=" dev-libs/openssl:0= - sys-apps/keyutils:=" + sys-apps/keyutils:= + tpm? ( app-crypt/tpm2-tss )" DEPEND="${RDEPEND}" BDEPEND=" app-text/asciidoc @@ -25,18 +26,23 @@ BDEPEND=" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}/${PN}-1.4-configure-remove-automagic-TSS-dependencies.patch" + "${FILESDIR}/${PN}-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch" + "${FILESDIR}/${PN}-1.4-test-remove-boot_aggregate.patch" +) + src_prepare() { default sed -i '/^MANPAGE_DOCBOOK_XSL/s:/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl:/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' Makefile.am || die - eautoreconf } src_configure() { econf \ $(use_enable debug) \ - --disable-static + $(use_with tpm pcrtss) } src_install() {