| 1 |
commit: f017a49dbc8dda50bb125667a1340ac80c34e330 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 26 02:42:36 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 26 02:43:35 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f017a49d |
| 7 |
|
| 8 |
app-crypt/ima-evm-utils: sync live ebuild |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild | 4 ++-- |
| 13 |
app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild | 18 ++++++++++++------ |
| 14 |
2 files changed, 14 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index 8a6872dda3e1..3f32ba3defbf 100644 |
| 18 |
--- a/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild |
| 19 |
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2021 Gentoo Authors |
| 22 |
+# Copyright 1999-2022 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=8 |
| 26 |
@@ -31,7 +31,7 @@ PATCHES=( |
| 27 |
"${FILESDIR}/${PN}-1.4-configure-remove-automagic-TSS-dependencies.patch" |
| 28 |
"${FILESDIR}/${PN}-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch" |
| 29 |
"${FILESDIR}/${PN}-1.4-test-remove-boot_aggregate.patch" |
| 30 |
- ) |
| 31 |
+) |
| 32 |
|
| 33 |
src_prepare() { |
| 34 |
default |
| 35 |
|
| 36 |
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild |
| 37 |
index bdb4d49d4f72..7237825ff877 100644 |
| 38 |
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild |
| 39 |
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild |
| 40 |
@@ -1,7 +1,7 @@ |
| 41 |
-# Copyright 1999-2021 Gentoo Authors |
| 42 |
+# Copyright 1999-2022 Gentoo Authors |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
|
| 45 |
-EAPI=7 |
| 46 |
+EAPI=8 |
| 47 |
|
| 48 |
inherit autotools git-r3 |
| 49 |
|
| 50 |
@@ -11,11 +11,12 @@ EGIT_REPO_URI="https://git.code.sf.net/p/linux-ima/ima-evm-utils" |
| 51 |
|
| 52 |
LICENSE="GPL-2" |
| 53 |
SLOT="0" |
| 54 |
-IUSE="debug test" |
| 55 |
+IUSE="debug test tpm" |
| 56 |
|
| 57 |
RDEPEND=" |
| 58 |
dev-libs/openssl:0= |
| 59 |
- sys-apps/keyutils:=" |
| 60 |
+ sys-apps/keyutils:= |
| 61 |
+ tpm? ( app-crypt/tpm2-tss )" |
| 62 |
DEPEND="${RDEPEND}" |
| 63 |
BDEPEND=" |
| 64 |
app-text/asciidoc |
| 65 |
@@ -25,18 +26,23 @@ BDEPEND=" |
| 66 |
|
| 67 |
RESTRICT="!test? ( test )" |
| 68 |
|
| 69 |
+PATCHES=( |
| 70 |
+ "${FILESDIR}/${PN}-1.4-configure-remove-automagic-TSS-dependencies.patch" |
| 71 |
+ "${FILESDIR}/${PN}-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch" |
| 72 |
+ "${FILESDIR}/${PN}-1.4-test-remove-boot_aggregate.patch" |
| 73 |
+) |
| 74 |
+ |
| 75 |
src_prepare() { |
| 76 |
default |
| 77 |
|
| 78 |
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 |
| 79 |
- |
| 80 |
eautoreconf |
| 81 |
} |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
econf \ |
| 85 |
$(use_enable debug) \ |
| 86 |
- --disable-static |
| 87 |
+ $(use_with tpm pcrtss) |
| 88 |
} |
| 89 |
|
| 90 |
src_install() { |
Archives