gentoo resync : 18.12.2020

6 files changed, 41 insertions, 3 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e105d2f7c0f2..e55cbe0a15af 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 0e00ca3e20f5..2eb6ad7b41b9 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -8,8 +8,9 @@ AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd
 AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1fc12afedf9eae52e5aaa34aad518cbee5ab225fca3a524e21efc583ab9e103bb8dafa6c9154da18962d4b03400a939d0 SHA512 a48e46873d9134693452cc55c2562d1a7d7b6bb7124dba061db029e6e1c611ed9787518c86043213629683727cf0fff07afc8ce7298a30fd237941300a1aeae0
 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6
 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
+AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
 AUX lftp-4.9.2-libressl.patch 1393 BLAKE2B fb014efb50ceb0ad1b0f58c8ebc70c43b474552f3e9f084a8d40e178c4d5dbf2b830fa987ac52a7249b790dfe8f84ed39f7676eedc66612acb2a83e3599bf952 SHA512 f427059a2047d817a1b0eab03cc861d78538a5bde7686ff9bf6955f7965f27b15f6b8ff5299fe821298e716d440b16f0fb61b922badf233fa88ba725a0a48396
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.9.2.ebuild 2654 BLAKE2B b5f0ef3c1121ef5106717a9b03741ee52952c4c2fd388c222fda10c379c4437a253600c2862b39b31cfa457da1b621f5d8c355d1738c1bd9f55c301cc0a07050 SHA512 31ac9e54465f7f233e7292ffac7eccb18bd55948c8aa505c50611e52413bb7ddafba38eafa3cf208abaf5f36845e71c2d094f5c5c476f7cb3aa9932e3472515f
+EBUILD lftp-4.9.2.ebuild 2694 BLAKE2B 244012b8a82a201aba463ae510f1db51c67bfe27fbe85f7753c056546cabd7bd6f2d83a40fcd16a295122e2ee5e1c321e37a4c189bc2b7d88230c5dd9b6098dd SHA512 599fe05cee30efdf30d51a4a2fe5c1a8e973c40648e0f3ba282ec18668ee4448a75041bf71862ea727006487b8918d05c6cada67e0a4e247f3fde4c6f774a355
 EBUILD lftp-9999.ebuild 2438 BLAKE2B e96329335ad785af88182d486ba295a750c565136c41ebaa83f59b5430bf70de4f40f80d4abc79e68dd0b5b8d60e0ad8152c0e6ed6f119f687f95cfc6db783a1 SHA512 3b5a771d1be09c8b010ddc47cf2aa791a2924c464272feb7183a6f7da457fb0d6b7e2667828d41c405a47b93a5eb69b03616579cf0c501354719de5b35ad8f5a
 MISC metadata.xml 592 BLAKE2B 87ed7484a2723b3f46c358e839930919c22b296c86e44b492136c553150b040b903da2361a71eeecd8f4a7b077389988b9f185fa222f6559ebf65c44609514f4 SHA512 86dc525bb6734b4bf7995df33ef4f8027b01263afa9f827916224abeff84a04079dc50a62aa8c93c55c588d94669fcd6eee17984ef4b8913aa777e9f03a6e1ed
diff --git a/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch b/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch
new file mode 100644
index 000000000000..a2a558db5a64
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-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-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index 121ccc94638b..ab4b0a1a9ffe 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
 	"${FILESDIR}"/${PN}-4.9.2-libressl.patch
+	"${FILESDIR}"/${PN}-4.9.2-ac-270.patch
 )
 
 src_prepare() {
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 0982f548895f..09e5f88e5875 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -2,6 +2,6 @@ AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663
 DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
 DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc8106a8618a66eab5d9def258d2ee9c2b709e1a637b9d833513ef87b652f4ab0ff518dc9d67d90a7dd43941d3c SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199
 EBUILD ncftp-3.2.6-r1.ebuild 975 BLAKE2B 30ff54992100b50c7b9a55300f324b369b8a5d6bc4e6084a00c5982648595211839262463d4f44b0474cfc86b63dbebb6ac650b2c7a9ab32c2cdb59fee3dc73b SHA512 9cf1333cd5ab061dabbc252df65598d0411a7a254596b35601a41dace0c713d0b0f503956f0fe26f2acfddfda1b8bde1d1d7da4fd0345ba8066d1b23263555a9
-EBUILD ncftp-3.2.6-r2.ebuild 1049 BLAKE2B 535236ffde13913cc12d4f9e150a42bb925ef4bdc33ab86c59897a840fd275d06f939ee1c0d6f6664ba3e2fb15deee038e5d97588f4059d5e02a19ab7d18dbde SHA512 19e6fe97256d71a2ec6b0560c7c2da9c1bca3fdab0ce6d54f29af39802590351cef99adef918531fe3ebc93aa6af994403f39b4eea6e21735a2f6766a8bb2f80
+EBUILD ncftp-3.2.6-r2.ebuild 1045 BLAKE2B 95a5cbb7076d58369e0586dff649fb9f1fbbab8167be4898ddb39f1b9eb88725e2280866a21b9323a20048aa8c071337b5e2422931bf7265139d1bdbcf6ad130 SHA512 0871a21bff14f4d0c9d6cf59369b1c3fab6b1097ffae9284b514d155d7c9b988c099d11617977843a368691f9f12b71cb38f97bda64baf34940f7fa674b978e1
 EBUILD ncftp-3.2.6.ebuild 1043 BLAKE2B b5b30ecd0d33201c30a5ccfa13ddddbc9134b2176f4097be558659182538d5604d4ba9adf9ceb69a1c596695b4aad38e24e5184c9b389dfafb24f887cccbaa89 SHA512 e9912f780ccd6f0658a227d451934ba95ac0b29f27098300af44abaf8375a893992ef1aed4e13db43d59dadcbcb2dab3f60512383fcc4ece14d72eed612e0dfd
 MISC metadata.xml 662 BLAKE2B e41a84c3553efba6d4425c73d7aefeabc235057178408f63a649a2580110f8e7af365b41bea7ec150091b2a57f871ad81476607bbfe73dc7d2ee123a9f175ada SHA512 a3a91d842e2865916280524c6d844c83133f136cf6f9fd59e6246026295f4fe9f5ab535944b79c7c5417b50672de5edc25b5dc34df069721a535342b30b6ab98
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
index d08daf98db4c..14f9f6aedf07 100644
--- a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="