gentoo resync : 20.03.2021

3 files changed, 32 insertions, 1 deletions

diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 7329439c6e57..c7a336022cf6 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -8,6 +8,7 @@ AUX heimdal-kpasswdd.confd 148 BLAKE2B 74c70bf236789e8c87bfd928d9108f181ad31c254
 AUX heimdal-kpasswdd.initd-r2 448 BLAKE2B e9280b18c06ad50579eceec52fe7bb83630b868e5b3ec16bc6ba0bf80c04f303fb8405cb6a728be79052729076de4df4b85e08277198e75d3c0d3093c464680e SHA512 e7de18a197ec6d56fac61c3d014c9f7d5cc10e4ee6c7ee432f9e4658ad5feee7be6c26d175755863321bf927e082e9da34a576647eaa428c98cf80f9eaa99176
 AUX heimdal_build-headers-before-use.patch 1128 BLAKE2B fa8f4a481304b619797a20dce8a8ac9f912d7f3f3402980da35259839fa9ecea0a84b1fb04dfee93af64699beefcdd9b0cedaa27c0323a568861307fa53ef3cf SHA512 df3257627300456afe4bd4a3a18bff5641cf1f0a9d1f0e74716b46a45ad0e58194ee284930cc1f856e7b74eecd6a590d1a6ef93d40a4b275d899856b46e14128
 AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0948437f20228aec0508788de30fe657765dfe3be3955680a8e006d4afdc1396c7810d26775bae936d72f927e14e8dbd46f SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e
+AUX heimdal_fix-autoconf-2.70.patch 936 BLAKE2B 313982f105ac8549b4f6049bcc3b9ea21972584ce243860a105985c795166c8be7a8c6cff46810e6bf604e21f3ebe75cb1f0ecad5ab2aa96ab5f8719b1e19156 SHA512 71668c87242813320d57418b849158af1231e42a970d2e7b7bd64a28db6ce834179c2f1f27b9ff2be4c7ba349a73209d715a60bb8913f7cf4d20d1acc2e49c6e
 AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad753189addf11359a01236a03280eb605ff136b290dcc379d182741d924e2392fc05642520278af8ecc310f7 SHA512 b6e80678801eaeee8c1aa2ec317a80b58cad3ca181aad14136cf352c55246ae36a43344b48a01bc9fc19c9ecfa383d9ab10892534ea60d25e36255fa049523a7
 AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f829566b3bccfb1d0800d7f9f076c2958ec756821f2b5f2d4249a59d4c9bb320ffa07c3a0e14533a013dbebe6 SHA512 6427258ba47c28415cf2b02e483ab2b29670cc803a7581a4d0102be14f5a102fab478b7c2735436603e44fd6e2d34fa2bbcd0dfc7cf15eca575fe424356baf99
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
@@ -15,5 +16,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
 EBUILD heimdal-7.6.0.ebuild 4512 BLAKE2B a4e4293543cde87d08cb1833480f278c5c2b2e9d7b138eeecc59668a829526e8bbf0d1aa610747166e9427f555d5c36117146f6399f048a22636df28c5d77107 SHA512 91ab34a629c2c7d909ba1d81538d9d543f8f66c26e32dbed4a45e8bf9358db817d4d56b8e85791fb17fddb51e7bc862a696d06c7f49f7a8d32c3c463b281c0e2
-EBUILD heimdal-7.7.0-r1.ebuild 4511 BLAKE2B f5063ce346f8d7c702bee5b2dbee3077d4f635ad439ed4566b2e835bb02dd501a4239c2de9973febba9eb76786745879457cabbbfb20b4f722bdd3dae4de1d04 SHA512 172bec83d21c91bce1ed233b2204b4c1a5c0e6ab49da8ad9fee920b49be55d88f0dc5a62512b5e8ef589783c33ee2f3752717e79fd58f6f339b0d44658073f2d
+EBUILD heimdal-7.7.0-r1.ebuild 4558 BLAKE2B 537f884969b9d8ea30e08f3183e8a41d2d16febdd8e43517e8415a0a5a5046e2374ded4089336959feef42b4373f2e470999c56f557518f12db9a79d4c913904 SHA512 3144c6e6b97273716ce56ef4099794451be9a4e927d0a53adbe66fe949ff46ff195b92a2b0379b622756010e35e7ad1130a41561283aab64c53d68e194a75123
 MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
new file mode 100644
index 000000000000..0dcc31026203
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
@@ -0,0 +1,29 @@
+From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 17 Mar 2021 17:49:18 +0100
+Subject: [PATCH] autoconf-2.70 fix
+
+autoconf-2.70 and newer are more strict with quoting etc. and thus generate
+a broken configure file:
+
+  configure: 20855: Syntax error: ")" unexpected (expecting "fi")
+
+Gentoo-bug: https://bugs.gentoo.org/776241
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ cf/check-var.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cf/check-var.m4 b/cf/check-var.m4
+index 2fd7bca6f0..71d6f70ca8 100644
+--- a/cf/check-var.m4
++++ b/cf/check-var.m4
+@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo)
+ if test "$ac_foo" = yes; then
+ 	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
+ 		[Define if you have the `]$1[' variable.])
+-	m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
++	m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
+ fi
+ ])
+ 
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index e6fabf4e9541..1140bf30c50e 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
 	"${FILESDIR}/heimdal_hcrypto.patch"
 	"${FILESDIR}/heimdal_build-headers-before-use.patch"
 	"${FILESDIR}/heimdal_fix-db60.patch"
+	"${FILESDIR}/heimdal_fix-autoconf-2.70.patch"
 )
 
 src_prepare() {