gentoo resync : 30.05.2020

3 files changed, 33 insertions, 11 deletions

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 25801fabaad3..7aaf81605e69 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,4 +1,5 @@
+AUX tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 180ba38d8b383e12f822a490e648f1e7392bb72c587537b655f613d7200fa0812f367fb6fb9e8ec411e22168016f9db4b352804dc55de1d094c7e3f493ce3a2d SHA512 cfc9591034f8216b5b949058dd3444c2c5b0e860b2fe5cbea99f353d80425d051e90b1117cd5c66b96a5990f7514b575ccf7ee98cdf38b7a2060fe250b805982
 AUX tpm2-tss-2.4.0-fix-tmpfiles-path.patch 1145 BLAKE2B 2cb265a5ae605982765675b5911c111c76d433f5ed1803dedbe06766abf9a0e00abd6dd1e378e6d2e30e9f8acdaf2795595c6a83e7fc08b96377c3b125b62ffc SHA512 60a7af4e6aff18837bc6f97211f14af99799942dae197193daa81ceec9a5c889056321abbf3734ec45daf2d873cb978946b6a77f1f5fe4ec2c2df78d3c59c7dd
 DIST tpm2-tss-2.4.0.tar.gz 1446509 BLAKE2B bb078719fa85d9ea07b9710b5ac5d2f9c2b842700ed5b26a30ab2708a227b4bd599563c76e648d6f0b9dfe7785a25c049826f953baffdd39113bd62e7b4563df SHA512 763370381584f2124f751f0736e6a8b34428fd52134fd9966f3581e128f3b74b3f1261992f5d6162d7c866e47f7e5519ea80c1d1d39b80d5ed6e067eb2cd35a0
-EBUILD tpm2-tss-2.4.0.ebuild 1610 BLAKE2B 8f230e65c4327c443c809cc0af7b6f6f5ccd339cfa94c9c5d167898eaa645f1af35bef8e6bd711a153feda87e898e0dfa8d2fa20a6fff3b6da9d7155b814f4f7 SHA512 284e5f7f3d96f1d52b3ddd58fdf051ff56642ae66129f8e09daaa2c81902264741fb0e625c0e1469957ef2554040fa1f0deb3cc40a6f66e2c96606ae3547a04c
+EBUILD tpm2-tss-2.4.0.ebuild 1732 BLAKE2B 79aeca3a75ad2353e9097e04146076d007f4f9f577e43bc22e248ccfe768b2fe26cb11504fe252687c52734fa1cac741e92300400f2a19545888a5827e01546f SHA512 1322dfc40d4be8353b0b8ce64006160ab7717c615351e088e359e73f6e2fb1046db35a77bf9f5a80e5907edf3ed22a3016dbb93cbe3cceb783a83f8cc500e6ee
 MISC metadata.xml 713 BLAKE2B 2abdfb26f5f48d666fb73603855baca019806420a262855faa4d4b00c90cdb260f2d6db4fab0752b13ef67dcfcd0e6462889eed7797545b1893a8c6ed137d563 SHA512 d48e14b074bcaaf77b723671a49979f94b592812d55a1e42acbe9b609be4e799bab939fdd4db66a2f9e37b40a0c2a13b47ef48d0e6c30e0ba88110e28dfaa4d2
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 000000000000..c916bbf0133c
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index c543a287..58187f7e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -558,10 +558,6 @@ uninstall-local:
+ 	-rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
+ endif
+ 
+-# Create tss user and FAPI directories directly after installation (vs. after a reboot)
+-install-exec-hook:
+-	systemd-sysusers && systemd-tmpfiles --create || true
+-
+ uninstall-hook:
+ 	cd $(DESTDIR)$(man3dir) && \
+ 		[ -L Tss2_TctiLdr_Initialize_Ex.3 ] && \
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
index f8986d88dc98..9f3fd54be541 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info tmpfiles udev
+inherit autotools linux-info tmpfiles udev
 
 DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
@@ -17,16 +17,16 @@ IUSE="doc +fapi gcrypt +openssl static-libs test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="^^ ( gcrypt openssl )
-		fapi ( !gcrypt )"
+		fapi? ( openssl !gcrypt )"
 
 RDEPEND="acct-group/tss
-	 acct-user/tss
-	 fapi? (
+	acct-user/tss
+	fapi? (
 		dev-libs/json-c
-	        net-misc/curl
-	 )
-	 gcrypt? ( dev-libs/libgcrypt:0= )
-	 openssl? ( dev-libs/openssl:0= )"
+		net-misc/curl
+	)
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	openssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig
@@ -34,7 +34,8 @@ BDEPEND="virtual/pkgconfig
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.patch"
-)
+	"${FILESDIR}/${PN}-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch"
+	)
 
 pkg_setup() {
 	local CONFIG_CHECK=" \
@@ -44,6 +45,11 @@ pkg_setup() {
 	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable doc doxygen-doc) \
@@ -57,7 +63,7 @@ src_configure() {
 		--with-runstatedir=/run \
 		--with-udevrulesdir="$(get_udevdir)/rules.d" \
 		--with-udevrulesprefix=60- \
-		--with-sysusersdir="/usr/lib/sysusers.d"
+		--with-sysusersdir="/usr/lib/sysusers.d" \
 		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
 }