gentoo resync : 10.09.2021

4 files changed, 43 insertions, 6 deletions

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 224a80a70a96..6eced450f815 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,7 +1,8 @@
 AUX tpm2-tools-4.3.0-Remove-WError.patch 360 BLAKE2B 440f48fca6e8aaf9b2c0fd094011738c467a22dc31bd94b53f6788b8fa52c00c5d7ebe074434be60b6370dcf1e94ee4d57bcfc93857fcf03dbdff30c8e157445 SHA512 0d246d1446b5b2ebca0e12467c746a731897311448840a7aac35b57d22edcdec0c9f424d1c95c9614d969a57dba458bbbad8826516cc05329b47d2dad05318fe
 AUX tpm2-tools-5.1.1-fix-tpm-checkquote.patch 1193 BLAKE2B d65717bc15b490c99123ad8022dace6b337b638b797d6f5b0aa783e04fd4f12f2f4281bcc5d53728a6b612c6106aa2ab1593bce9833fcd4109e94de1a1718135 SHA512 a38cdc124eaf1321d954dc969c3c5a409a90ee7d5d25eb0bb692b9a56f8340a6f783852e995a4e9790f5472c47d8475ad083b76015ccfddb7d74ea167cc54364
+AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac73692dc54475da3044d3afcfe570d6c72f5d8ace2bbf3faf5242002be02c4a765ba9b9c37ba9777d9b4b8bac416e6721d9b8660d19bf2 SHA512 4622e235ef5202cc3448fbc67f362ce36396ca04892c340f275f67c93d5bb2857a14094329ec499c4f7215ac10002b70d18cfc2bdef1474d93f556c5759383ae
 DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b SHA512 1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f SHA512 4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e
-EBUILD tpm2-tools-4.3.2.ebuild 1052 BLAKE2B bf435ee4ce938f58cf82a835e4940c2044ee179a574e575fad1124222216c4d1147d302b9fbe95165303326758e7145112e120f7d1f70c0750fc62b75d4db1c2 SHA512 85155fc93543892a19be80b0826f20fb38be8cfe84ed2e4ae957e2c36bd075126b635fe54f848785aa866c0a22e1e7e19378a22361c30d3fba4f922299cc3048
-EBUILD tpm2-tools-5.1.1-r1.ebuild 1575 BLAKE2B e9a949b1e0387b15b2e87bd95fbcb47edfb4b0cb92a6770274e5607d62617e8635a2265ac12031707c03d54b167b21c0730c92c13f8e0f1d104c4bf8fd03fc7b SHA512 7d6a7d2dd894fb521494110a818433ff804bc0deb72565a35c1e97120fa454978b422627768db3619ac89d68a0651e9077297d2b13d284b68dbdbca269356b8b
+EBUILD tpm2-tools-4.3.2.ebuild 1052 BLAKE2B 7c6f919d4a43a7c990803e12b9f2233c018975c01fe792aa6ea49a944ec4865c57fb947803c8e4b3360fcd5933e24607b0750fe90cdc9272c261f579eecc8997 SHA512 ed36b9a1721c02268e5990b9d63721bbcf0c09eb2360e3dc02f295d83c01b2f98aeb306def7052a79de6b98e10c7edc1ec46aff2009e1babacdbc681a9e33dfd
+EBUILD tpm2-tools-5.1.1-r2.ebuild 1647 BLAKE2B 941f93a6bc1798b75b57092c728a421b9b8f1d47cb679c3bc42739779b1c99f436e41c6133227c5e5c742b0749898f5a640447a195fd74c8efb390b2cf12ea1d SHA512 7235cfb7293cc0949e4562755b675a7f8128bacf5c92d8b558bd8631c26dcaae61910520c32a80e9ba9dca33eb0011f8733a7553b1884c7bf768dcf0495c6b19
 MISC metadata.xml 559 BLAKE2B 6c0842aa4bbd95d2047bf3ce11c99fad96491481bbe52cdd81d0d02085d97799129ab5a249925c88c20afc1fba8890fb1809a1809a2c2c23e62bb36673031c98 SHA512 6fe7716a5db796b958fee79d65fa04b32196985f503bfb11ff4790c95f118fb5ca14cc9b4ef59b94caadc60c30453b629c6b93918fde505404646a0165947f5c
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
new file mode 100644
index 000000000000..25f3ef43fe3d
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/812047
+
+From 0cea7f0f78f1a9e8dca789eb5f2ece052e026bed Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Tue, 7 Sep 2021 20:22:27 -0500
+Subject: [PATCH] configure.ac: Fix automagic depency on libefivar
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ configure.ac | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f1c17116..bdb4abda 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,8 +62,12 @@ PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.1.0])
+ PKG_CHECK_MODULES([CURL], [libcurl])
+ 
+ # pretty print of devicepath if efivar library is present
+-PKG_CHECK_MODULES([EFIVAR], [efivar],,[true])
+-AC_CHECK_HEADERS([efivar/efivar.h])
++AC_ARG_WITH([efivar], AS_HELP_STRING([--without-efivar], [Build without efivar library (default: test)]))
++
++AS_IF([test "x$with_efivar" != "xno"], [
++	PKG_CHECK_MODULES([EFIVAR], [efivar])
++	AC_CHECK_HEADERS([efivar/efivar.h])
++])
+ 
+ # backwards compat with older pkg-config
+ # - pull in AC_DEFUN from pkg.m4
+-- 
+2.32.0
+
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
index 01663f80cd57..fc76619d1790 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
@@ -33,8 +33,8 @@ src_prepare() {
 	sed -i \
 	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
 	"${S}/configure.ac" || die
-	eautoreconf
 	default
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
index fb7168bfb2f4..6fe96e4e93f3 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+fapi test"
 
-RDEPEND="net-misc/curl:=
-	>=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}"
 DEPEND="${RDEPEND}
 	test? (
@@ -38,6 +39,7 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
 # https://github.com/tpm2-software/tpm2-tools/issues/2767
 PATCHES=(
 	"${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch"
+	"${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch"
 )
 
 src_prepare() {
@@ -45,8 +47,8 @@ src_prepare() {
 	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
 	"${S}/configure.ac" || die
 	"${S}/scripts/utils/man_to_bashcompletion.sh"
-	eautoreconf
 	default
+	eautoreconf
 }
 
 src_configure() {