gentoo resync : 18.12.2020

3 files changed, 41 insertions, 3 deletions

diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index bc8d48005f95..4102be3e4af4 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,7 +1,8 @@
 AUX libgsasl-1.8.0-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
+AUX libgsasl-1.8.1-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
 AUX libgsasl-1.8.1-gss-extra.patch 855 BLAKE2B 68eb983dee51393b4d871b71932a61c880bc37f6ead9047472215f8388833efea85db9ab4282bfcb700d0bda366623935bb487652dd334c4bb87dcb188b30d8f SHA512 97922b23fb967ee0110076913ac1ad89b3720be5d9883bce3762b4e41d95375ae1602470eeaf1551cb7ef7d46952d3dfffda64ef6ecc51149cd93dea681ad988
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
 DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
 EBUILD libgsasl-1.8.0-r1.ebuild 1387 BLAKE2B 131b327007cfd2b3ca71d38da504b93a7fca6b9bd4a986b57edac157529d561852bc2881d927931d82b75678875a269aa70a0c2ed38eb9c2f70125f8e1896197 SHA512 634b59ac8efe01d93c0f15f1794c122e608f7b2427bd61f3b93413d301cb5b908c0162a652c8d3dc9a4745eed8630c6bc94a907a12b0f4d4da5ad35f6f92ab7d
-EBUILD libgsasl-1.8.1.ebuild 1395 BLAKE2B 69f4650c846152db363d81cd5a9700dd4fdac1808f95f12dd2bcf989cd06505a21436e3d7ffb6deddc34d1ee45392ebf37d1544a52224263ddfbdaaaf11772f5 SHA512 77f725be69b8f8841cd70c1419d02854413b90d84acd4b402d441dcdd0949b15bfecb31ef81000a025fba153428dd128c8803a526e69ff53b8e382d49765070b
+EBUILD libgsasl-1.8.1.ebuild 1430 BLAKE2B dbb4a0ceebcf074382f6cbf14f71341b4a88c789eb47c9085a014dd47d41f3f16bd2d799f239d9c8c56967a231a024a375c925171ab32273a0caee3106c0062f SHA512 fddb0eb4528335adf61d876df0e09719851bcec03f9ffb694368b1dc5afc21940db3be085d3411bb12490f8b47ac7f1909e5d649fc0c2909a1dba8aa9f220b89
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
new file mode 100644
index 000000000000..a2a558db5a64
--- /dev/null
+++ b/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
@@ -0,0 +1,36 @@
+--- a/m4/std-gnu11.m4
++++ b/m4/std-gnu11.m4
+@@ -6,6 +6,8 @@
+ # This implementation will be obsolete once we can assume Autoconf 2.70
+ # or later is installed everywhere a Gnulib program might be developed.
+ 
++m4_version_prereq([2.70], [], [
++
+ 
+ # Copyright (C) 2001-2020 Free Software Foundation, Inc.
+ 
+@@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+ set X $ac_compile
+ ac_compiler=$[2]
+ for ac_option in --version -v -V -qversion -version; do
+-  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
++  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+ done
+ 
+ m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+@@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+ set X $ac_compile
+ ac_compiler=$[2]
+ for ac_option in --version -v -V -qversion; do
+-  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
++  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+ done
+ 
+ m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+@@ -822,3 +824,6 @@ dnl Tru64	N/A (no support)
+ dnl with extended modes being tried first.
+ [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl
+ ])# _AC_PROG_CXX_CXX11
++
++
++])# m4_version_prereq
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
index c23abb24fb4a..3f49132b9008 100644
--- a/net-libs/libgsasl/libgsasl-1.8.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
@@ -25,7 +25,8 @@ RDEPEND="${DEPEND}
 	!net-misc/gsasl"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.8.1-gss-extra.patch"
+	"${FILESDIR}"/${PN}-1.8.1-gss-extra.patch
+	"${FILESDIR}"/${PN}-1.8.1-ac-270.patch
 )
 
 src_prepare() {