gentoo resync : 28.04.2021

33 files changed, 326 insertions, 710 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 96665117597c..6db11a21e663 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 9b0bde18ea61..982cd80bb6ca 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -1,13 +1,8 @@
 AUX atftp-0.7.2-CFLAGS.patch 611 BLAKE2B a897ae1d9f03387283826c5b9795028b9190ca5a55e9db795d6a3753c7ce45ccd75a8d37eb2de228bd1b8fc57472fb3f662860c0f1efdc5a0ceab2d1a178c1dc SHA512 b020e761af2b73193e0bc3ef0e11e293babdfaedeac5429f3ad89079d686ce9c69737a4f74e147a023a92a2424241d61f17574feaadc39a5b6bd361245886c8a
-AUX atftp-0.7.2-cve-2020-6097.patch 3433 BLAKE2B 3ea6ac0bf80a8750535b1184d7b9d8e6023d5678ebf1150fce02b268a4e44ba08f4350d1c7ee4e3bb9dc5676d3b0c75db4e95fb637c9cbcb5f074fb0d9ec28e4 SHA512 0677ffc38f1e94036596ab58f356c351d53b4440cbb37b96f265fe335d1595003ff3e773cb1b5ab5af3be31a4a93af30188fe1ea88cd9cb5a7cb65e385932bd5
-AUX atftp-0.7.2-fewer_seeks.patch 1398 BLAKE2B 6ac60c1953a1849700fd7e00cce78c2481667846aad6966f6df570d1cc29b69524edd8a9763dbafdfaee219a27666a6b8d8857350521813338729c0dfe553a11 SHA512 f83f98419487d4caa861ec16fe3250e4421a0cb9366a3aca3bb6dbda1141ec19cb0318aa5d00740672d99a73b28353a220138e86d30a370d902dcd606a5da40c
 AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5aebdbceb0987316a9ec906182cacf5337fce5190aeac3bfc4cda0be72b8d48e99a5b2cbc2eca0e SHA512 cdbd63df16c2cee7491209de8ec44e05e10beccc6286cf7cb1c5dc7731c616d41bc94ce4d6c020b4ac8bb77b27956e9ee36d9b5703dcd3477e8b14927d154b91
 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23
 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
-DIST atftp-0.7.2.tar.gz 248038 BLAKE2B 3ca44624bf989009c2ebd0ae97927b0784e3c617a79a1bd00212a72a185302cf84f51c8bcda2012981d67cfed4d241b70f8719e78155207608f07a2227e6c437 SHA512 d602bb69451175a36e619abcff412ab1f6d0e7baf8c3f9a2b32081530fbc5816157404b80d42a8b6caa89cc83675b5cbeefcd57a5d98b8f5b43c6254b20ef28b
 DIST atftp-0.7.4.tar.gz 249699 BLAKE2B 8aa30df1cc92982b0e718cd9bcc68cf397e29f6abb795cf9fdfd0b9942d9a7dd16beafb24d69d7339f9ab4cbda16404eadf40096a8dfdb684fbc7ec1c7f81c9f SHA512 f9ff9b72b7d1d659d4ca00d990c28b9da8dea0228e66610ee2d17a3959fcd142998a7539f8ea68effdfe830d2f5e68c154a2911afb9cad52acd24a6a642d76a4
-EBUILD atftp-0.7.2-r2.ebuild 1494 BLAKE2B 1b360f602465ee0dea30a42151ec36cb3d0b918d80dad948b25ee2851f994586cbaecdc893e75d4d782a785ae1769188944581aa84b2e4087f2550b4186caee8 SHA512 4f11fd15e3b4504a973b07c70383f1e9edfd16e5a42b824eda20e63fc6bf87c96439a91c1cf68fbfcc8a914dfbb0a9bc52992b3b30e1fd1a0ccf620d89297553
-EBUILD atftp-0.7.2-r3.ebuild 1532 BLAKE2B 2fde64746a10e04536b39f70f745ca4e8d8a8c4be0ba38365be588c3ec7e247c7e08df5caf0875a3b02a93915bfc32b91943590de8d39e494972e90c760eede5 SHA512 1f65881c2b27ab97f05cdd4dab33ae41f4869b54ec661269568beea6df376076145cfecbdede0e0103f6534aa9f1c829812e84b9c13bf5f8e1f7d4d5f03d25b7
-EBUILD atftp-0.7.4.ebuild 1452 BLAKE2B 38eb6f305fbdf1b4c668c33852fe81a25e57bb9149c03edd953569b5ba064ebb85805c08b8b025de3d5ad8795ddcb53fc82e7457bf4f4818aecd0ea79f044f3b SHA512 a2dfb54ad97a0c36954d207372e01c973aa62246e39a39e0da9020e29663f618bb6ea46ce7a3786699cf150ea42c29f116d3b5a7ae69ff0b261dac0ea89bd1d7
+EBUILD atftp-0.7.4.ebuild 1447 BLAKE2B 6508f1a2d3be859cb6cfb6e44ac306811342a6522f3b305bd3714b23b8d6ba9ab601495a1742ce24e7e8fda907347e4c60e897b2ee083fb484563aeec79b0889 SHA512 5d69276f37f510e10884a67a3ee8010bfff68076e5d10550a0b689fee35672804c18cc3feae8e7397cfed4a000e474707976dd50d6924e3f7909245090c0bce0
 MISC metadata.xml 448 BLAKE2B 402322d0c162daf12b319730a1a48c5000d823851140ee31a577927cf2b5e6ea3a2d25c71a7cf9b71f7bcb569685154658c544b3f35a12a148dcc8a57e348609 SHA512 2d70e060eb79a7b0c0b6683472d158fd1f87397345707ac961d87dc202ab4029de9067454e62d29654bc0df207bd542c894fc62f0f296daf6db7963be32d2165
diff --git a/net-ftp/atftp/atftp-0.7.2-r2.ebuild b/net-ftp/atftp/atftp-0.7.2-r2.ebuild
deleted file mode 100644
index fec89f3f92a4..000000000000
--- a/net-ftp/atftp/atftp-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Advanced TFTP implementation client/server"
-HOMEPAGE="https://sourceforge.net/projects/atftp/"
-SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sparc x86"
-IUSE="selinux tcpd readline pcre"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0= )
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}
-	!net-ftp/tftp-hpa
-	!net-ftp/uftpd
-	selinux? ( sec-policy/selinux-tftp )"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-CFLAGS.patch"
-	"${FILESDIR}/${P}-cve-2020-6097.patch"
-)
-
-src_prepare() {
-	append-cppflags -D_REENTRANT -DRATE_CONTROL
-	# fix #561720 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tcpd libwrap) \
-		$(use_enable readline libreadline) \
-		$(use_enable pcre libpcre) \
-		--enable-mtftp
-}
-
-src_test() {
-	cd "${S}"/test || die
-	# Try to run the tests
-	./test.sh || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/atftp.init atftp
-	newconfd "${FILESDIR}"/atftp.confd atftp
-
-	systemd_dounit "${FILESDIR}"/atftp.service
-	systemd_install_serviced "${FILESDIR}"/atftp.service.conf
-
-	dodoc README* BUGS FAQ Changelog INSTALL TODO
-	dodoc "${S}"/docs/*
-
-	docinto test
-	cd "${S}"/test || die
-	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
-}
diff --git a/net-ftp/atftp/atftp-0.7.2-r3.ebuild b/net-ftp/atftp/atftp-0.7.2-r3.ebuild
deleted file mode 100644
index 575196956ef2..000000000000
--- a/net-ftp/atftp/atftp-0.7.2-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Advanced TFTP implementation client/server"
-HOMEPAGE="https://sourceforge.net/projects/atftp/"
-SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sparc x86"
-IUSE="selinux tcpd readline pcre"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0= )
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}
-	!net-ftp/tftp-hpa
-	!net-ftp/uftpd
-	selinux? ( sec-policy/selinux-tftp )"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-CFLAGS.patch"
-	"${FILESDIR}/${P}-cve-2020-6097.patch"
-	"${FILESDIR}/${P}-fewer_seeks.patch"
-)
-
-src_prepare() {
-	append-cppflags -D_REENTRANT -DRATE_CONTROL
-	# fix #561720 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tcpd libwrap) \
-		$(use_enable readline libreadline) \
-		$(use_enable pcre libpcre) \
-		--enable-mtftp
-}
-
-src_test() {
-	cd "${S}"/test || die
-	# Try to run the tests
-	./test.sh || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/atftp.init atftp
-	newconfd "${FILESDIR}"/atftp.confd atftp
-
-	systemd_dounit "${FILESDIR}"/atftp.service
-	systemd_install_serviced "${FILESDIR}"/atftp.service.conf
-
-	dodoc README* BUGS FAQ Changelog INSTALL TODO
-	dodoc "${S}"/docs/*
-
-	docinto test
-	cd "${S}"/test || die
-	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
-}
diff --git a/net-ftp/atftp/atftp-0.7.4.ebuild b/net-ftp/atftp/atftp-0.7.4.ebuild
index 1a1fe73e17ea..b467be06846f 100644
--- a/net-ftp/atftp/atftp-0.7.4.ebuild
+++ b/net-ftp/atftp/atftp-0.7.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sparc x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-ftp/atftp/files/atftp-0.7.2-cve-2020-6097.patch b/net-ftp/atftp/files/atftp-0.7.2-cve-2020-6097.patch
deleted file mode 100644
index 5130d0086432..000000000000
--- a/net-ftp/atftp/files/atftp-0.7.2-cve-2020-6097.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-commit 96409ef3b9ca061f9527cfaafa778105cf15d994
-Author: Peter Kaestle <peter.kaestle@nokia.com>
-Date:   Wed Oct 14 14:02:41 2020 +0200
-
-    Fix for DoS issue CVE-2020-6097
-    
-    "sockaddr_print_addr" of tftpd can be triggered remotely to call
-    assert(), which will crash the tftpd daemon.  See:
-    https://talosintelligence.com/vulnerability_reports/TALOS-2020-1029
-    
-    "sockaddr_print_addr" originaly had two features:
-    1) returning pointer to string of the incoming ip address
-    2) checking whether ss_family of the connection is supported
-    
-    To fix the issue, a separate function "sockaddr_family_supported" is
-    used to take care of 2) and "sockaddr_print_addr" returns an error
-    message string for unsupported cases when using 1) insert of calling
-    assert().
-
-diff --git a/tftp_def.c b/tftp_def.c
-index d457c2a..428a930 100644
---- a/tftp_def.c
-+++ b/tftp_def.c
-@@ -180,6 +180,15 @@ int Gethostbyname(char *addr, struct hostent *host)
-      return OK;
- }
- 
-+int
-+sockaddr_family_supported(const struct sockaddr_storage *ss)
-+{
-+     if (ss->ss_family == AF_INET || ss->ss_family == AF_INET6)
-+          return 1;
-+     else
-+          return 0;
-+}
-+
- char *
- sockaddr_print_addr(const struct sockaddr_storage *ss, char *buf, size_t len)
- {
-@@ -189,7 +198,7 @@ sockaddr_print_addr(const struct sockaddr_storage *ss, char *buf, size_t len)
-      else if (ss->ss_family == AF_INET6)
-           addr = &((const struct sockaddr_in6 *)ss)->sin6_addr;
-      else
--          assert(!"sockaddr_print: unsupported address family");
-+          return "sockaddr_print: unsupported address family";
-      return (char *)inet_ntop(ss->ss_family, addr, buf, len);
- }
- 
-diff --git a/tftp_def.h b/tftp_def.h
-index 0841746..458e310 100644
---- a/tftp_def.h
-+++ b/tftp_def.h
-@@ -54,6 +54,7 @@ int print_eng(double value, char *string, int size, char *format);
- inline char *Strncpy(char *to, const char *from, size_t size);
- int Gethostbyname(char *addr, struct hostent *host);
- 
-+int sockaddr_family_supported(const struct sockaddr_storage *ss);
- char *sockaddr_print_addr(const struct sockaddr_storage *, char *, size_t);
- #define SOCKADDR_PRINT_ADDR_LEN INET6_ADDRSTRLEN
- uint16_t sockaddr_get_port(const struct sockaddr_storage *);
-diff --git a/tftpd.c b/tftpd.c
-index 0b6f6a5..a7561a5 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -644,6 +644,11 @@ void *tftpd_receive_request(void *arg)
-      }
- 
- #ifdef HAVE_WRAP
-+     if (!abort && !sockaddr_family_supported(&data->client_info->client))
-+     {
-+          logger(LOG_ERR, "Connection from unsupported network address family refused");
-+          abort = 1;
-+     }
-      if (!abort)
-      {
-           /* Verify the client has access. We don't look for the name but
-diff --git a/tftpd_mtftp.c b/tftpd_mtftp.c
-index d420d10..0032905 100644
---- a/tftpd_mtftp.c
-+++ b/tftpd_mtftp.c
-@@ -393,6 +393,11 @@ void *tftpd_mtftp_server(void *arg)
-                                         &data_size, data->data_buffer);
- 
- #ifdef HAVE_WRAP
-+               if (!sockaddr_family_supported(&sa))
-+               {
-+                    logger(LOG_ERR, "mtftp: Connection from unsupported network address family refused");
-+                    continue;
-+               }
-                /* Verify the client has access. We don't look for the name but
-                   rely only on the IP address for that. */
-                sockaddr_print_addr(&sa, addr_str, sizeof(addr_str));
diff --git a/net-ftp/atftp/files/atftp-0.7.2-fewer_seeks.patch b/net-ftp/atftp/files/atftp-0.7.2-fewer_seeks.patch
deleted file mode 100644
index 78926b94b9f7..000000000000
--- a/net-ftp/atftp/files/atftp-0.7.2-fewer_seeks.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-<F28>diff -U8 atftp-0.7.2/tftp_io.c /var/tmp/portage/net-ftp/atftp-0.7.2-r1/work/atftp-0.7.2/tftp_io.c
---- atftp-0.7.2/tftp_io.c	2019-04-14 17:38:55.000000000 -0500
-+++ /var/tmp/portage/net-ftp/atftp-0.7.2-r1/work/atftp-0.7.2/tftp_io.c	2020-03-16 12:55:22.371820662 -0500
-@@ -439,26 +439,32 @@
- }
- 
- /*
-  * Write to file and do netascii conversion if needed
-  */
- int tftp_file_write(FILE *fp, char *data_buffer, int data_buffer_size, long block_number, int data_size,
-                     int convert, long *prev_block_number, int *temp)
- {
-+     static long filepos;
-      int bytes_written;
-      int c;
-      char prevchar = *temp;
- 
-      if (!convert)
-      {
- 	  /* Simple case, just seek and write */
--          if (fseek(fp, (block_number - 1) * data_buffer_size, SEEK_SET) != 0)
--	      return 0;
-+          long position = (block_number - 1)*data_buffer_size;
-+          if (position != filepos)
-+               if (fseek(fp, position, SEEK_SET) != 0)
-+                    return 0;
-+               else
-+                    filepos = position;
- 	  bytes_written = fwrite(data_buffer, 1, data_size, fp);
-+          filepos += bytes_written;
-      }
-      else if (block_number != *prev_block_number)
-      {
- 	  /* 
- 	   * Same principle than for reading, but simpler since when client
-            * send same block twice there is no need to rewrite it to the
-            * file
- 	   */
diff --git a/net-ftp/cmdftp/Manifest b/net-ftp/cmdftp/Manifest
index 4dc9dbc3138e..2186d3cbf0df 100644
--- a/net-ftp/cmdftp/Manifest
+++ b/net-ftp/cmdftp/Manifest
@@ -1,3 +1,3 @@
 DIST cmdftp-0.9.8.tar.gz 145985 BLAKE2B cc5869cc8c43208161886020b2a3c4df9151d48053ab3c6d4e7d0759bb47a23a687c09eda2c202ac93167f26c33a6c4ac49568f356a9fe16ef09237d499f04c8 SHA512 8c8bb670988c439838493f1c6d31e47ae01e3fd6a1521602267dc8cb8dcc6ed18605277bdbf22a06b3af61e33a676ff3f188648f54af5d0839c7039eaab6b262
-EBUILD cmdftp-0.9.8.ebuild 460 BLAKE2B d45e2d2e03959be50d745fa07b38c07a00743243ec300dd9ce492c9dcea932ebcbad7df7cea20a8d99155f070be53d795bd66bdcdddff52d99d3a4b289066772 SHA512 1fcd97c077db38727423c7eed70202176db1434ea3e62db55adf6681a2f1d66d037babd1495dc6af72960fcf8faedb33b140a13af0ca08ff3c7e7700eb431d3e
+EBUILD cmdftp-0.9.8.ebuild 425 BLAKE2B 6c87d265242ba1c41c10032d14cfe69f8442583061c4571775400d80b6faf1ebc5941af454a2c8cc05733d728ed160ba689391236f7c6380645da533e897e027 SHA512 f6b3df51a0cac100c65d5f9ad0b0755046647a1b28a03e9f07b2b66d87544cf603599a1e48f7b227af4c74671d57544e219464e910c891ec0c34fe972e75ae7e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
index ecc0224ef1e2..0e11dd145c5e 100644
--- a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
+++ b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
@@ -1,20 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-DESCRIPTION="Light weight, yet robust command line FTP client with shell-like
-functions."
+DESCRIPTION="Light weight, yet robust command line FTP client with shell-likefunctions"
 HOMEPAGE="https://savannah.nongnu.org/projects/cmdftp/"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 DOCS=( NEWS README AUTHORS )
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index dc3947b087de..92e80ccb8af6 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,14 +2,6 @@ AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a
 AUX filezilla-3.47.0-disable-shellext_conf.patch 699 BLAKE2B 9d0209166f8e76b0575be47e8a13b1d07f159ed05aaf9e8624030fa1ea2ce1ab63a7283336511bc14b6a922c8536d9ac992a231cf53f9c825299b4b588512c62 SHA512 3c0e6178f8fcc3793cbc722fcb91b2b2834eccda17ab6260243d1262198debe3c71ced1c2443ada8245a7bcf02b5fbb5fffdb16bdab948dc3badc149576ab027
 AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c
 AUX filezilla-3.52.2-slibtool.patch 723 BLAKE2B f051ae8d8b1d9c75bf4752d009a3b710b742accb50ec46ad6d1be0d7c5f88ab77996e47b55e3f87432a9d5aee2fef61e915ed36c09e988e01bbf68943a64144b SHA512 7a7f1adc4144c5535d60e6dd6f18aecc04c93ff2c98f52660fa576dcbce9ff7bb53175eef2fee7671c472181ea7f5c388ccc8697e70b8841759fdec06e62d1a1
-DIST FileZilla_3.51.0_src.tar.bz2 4808717 BLAKE2B 67f614032145abe7f715254fd47756d3a537d2eca63be976c29351f79e15d3620e77c1bb7beccc2b61a1df8b86484334a3e77639402c93e8ce28d4b12eb8884f SHA512 b5e0f80b61eb168b41f7582bf10bf0067da76aec3165ffe13819e20eb842ffc0fb12b01c54843b3ec4e7355111c36be249db3526e2ea2eaa77ba4274ffa03e93
-DIST FileZilla_3.52.0.5_src.tar.bz2 4811653 BLAKE2B a80d0784e5c85b74cadb944af232bb42fd0170ca31034e51804b56dc06ca2bbc4580a5ed1564bf82436be50be62d86f2017ebf3496ecc00af24837c0da99bbcc SHA512 c0a3f20ad9351ae0bb15e7e488801cdaefc83d5eb1355fcb664150ea588b9fb8c4b446e4b1df5d8b35fb88111a37527037e4dc70ba783d5161b1d91c8dc3bee0
-DIST FileZilla_3.52.2_src.tar.bz2 4813167 BLAKE2B af651f4db74e805c866d040aa932c39e1a488bf37b0c215a2cdeae3fd4ab608f84b1b12dfbe8bf197e778760ca26183a3532a370e7a0095c1a250eefdc14717c SHA512 74abb78eaece5ffed044a88bdbbff7be0470e47868b806925ea5666d741370dff910d55849f6ad91fb57f8c1a33c461dc10c9f093d75e7a96ff0d909f3a8f131
-DIST FileZilla_3.53.0_src.tar.bz2 4842563 BLAKE2B e9704e5b0c7afee28c3d3efb9b0f72111e9fc4f2d8d69a935d195a09b685f39b80019de77216b5da4353c65837b5b0d8102b3e9e88cad840f3716372232f8bd3 SHA512 b658a0e67d0f92051e5f5503da64f8bc0b1dd6d9af4b54b34d32c9a6c83abe0709b310d940a8f6676f20a49537baca48df805a88c1fa29d7e7b262f59544deff
 DIST FileZilla_3.53.1_src.tar.bz2 4844262 BLAKE2B 1ae9bab7b3812df106340a2267d5634c3e3e3078a5fbb3dcbf526c28ea5bfefe619e380b739533754ec9f4e200d08a398d6ebe0c984a7b18679f0165f3a03e29 SHA512 85109c68c9acaf2d3fb7d2ed98bdeae636cc359993535484ca404bd34e8287927628e255364bdb03681fcc47bff02423e954fd304b2e304bf18efaf2c0784eaa
-EBUILD filezilla-3.51.0.ebuild 1957 BLAKE2B 2e3089f2a70a43ef4dafc954204a2c770fbf0969f1510d1f10d11c1d133314699431a439d83bf8a124fd0df001dcbfe9da1cb794219545269e855599420a0e97 SHA512 c0892524296e0449e20148bd3723a603fe78b7dd2c96cf4dc0bc040c661cfe36483ca94a251af9ac761d31534d994be0a88a9c45785f87665e62a0c887a348ca
-EBUILD filezilla-3.52.0.5.ebuild 1961 BLAKE2B fac20a3303d173d9590befc1d8ad7984a9f64600655efaa84ccdb722309d6db055b332e378721709082da21e8ce95cd7fb7b70737b781c0dc758e366833ab9a3 SHA512 fbe14ca5bae08360767874bd4ef5355add7252d1f5141ed88fdcd174cff880bc7466377d459350efeb28259073aaec54d328a7dfae2f02067b8e1ab7d9e308d3
-EBUILD filezilla-3.52.2.ebuild 2004 BLAKE2B e140dd155a123e9020a3a33097a72f2c8f20c1df1156faa30053e5bead65e409cc090837c5c3fd893bc2623affa1c5907c65e9bf8002943b6d475bf01c6fc82f SHA512 9d1a03103bb3e62f346854fd9b14d0b5408ed8a2ab817b97269b31a32c1d1e1a88a82d4c853ffdfd7ab4afe96887ceaf19baf412a4efb745fc35220aabf50f8d
-EBUILD filezilla-3.53.0.ebuild 2004 BLAKE2B e140dd155a123e9020a3a33097a72f2c8f20c1df1156faa30053e5bead65e409cc090837c5c3fd893bc2623affa1c5907c65e9bf8002943b6d475bf01c6fc82f SHA512 9d1a03103bb3e62f346854fd9b14d0b5408ed8a2ab817b97269b31a32c1d1e1a88a82d4c853ffdfd7ab4afe96887ceaf19baf412a4efb745fc35220aabf50f8d
-EBUILD filezilla-3.53.1.ebuild 2004 BLAKE2B e140dd155a123e9020a3a33097a72f2c8f20c1df1156faa30053e5bead65e409cc090837c5c3fd893bc2623affa1c5907c65e9bf8002943b6d475bf01c6fc82f SHA512 9d1a03103bb3e62f346854fd9b14d0b5408ed8a2ab817b97269b31a32c1d1e1a88a82d4c853ffdfd7ab4afe96887ceaf19baf412a4efb745fc35220aabf50f8d
+EBUILD filezilla-3.53.1-r1.ebuild 1571 BLAKE2B dd9d203963419932e93af9455b7a445dc6df94523d9f6b5c2f127e774ba7d428d996dcd03c2689bc8220882581fbb0b2a72b041d96e41f4b5ab3dcd0f475beb9 SHA512 3d462010456db814b7a043cfb6af5e31e3c4f1670f8cee8932edf4a69dcb4632516aec829c89dbb9ff8fc637b9c63f4176a4ffea3872e044520d14db8ea2fc85
 MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f
diff --git a/net-ftp/filezilla/filezilla-3.51.0.ebuild b/net-ftp/filezilla/filezilla-3.51.0.ebuild
deleted file mode 100644
index f500915b3135..000000000000
--- a/net-ftp/filezilla/filezilla-3.51.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.25.0:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/net-ftp/filezilla/filezilla-3.52.0.5.ebuild b/net-ftp/filezilla/filezilla-3.52.0.5.ebuild
deleted file mode 100644
index ba2ce7335de1..000000000000
--- a/net-ftp/filezilla/filezilla-3.52.0.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.26.0:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/net-ftp/filezilla/filezilla-3.53.0.ebuild b/net-ftp/filezilla/filezilla-3.53.0.ebuild
deleted file mode 100644
index c8f67f39ebeb..000000000000
--- a/net-ftp/filezilla/filezilla-3.53.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.26.0:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/net-ftp/filezilla/filezilla-3.52.2.ebuild b/net-ftp/filezilla/filezilla-3.53.1-r1.ebuild
index c8f67f39ebeb..3ccd1f882cbf 100644
--- a/net-ftp/filezilla/filezilla-3.52.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.53.1-r1.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
 inherit autotools flag-o-matic wxwidgets xdg
 
-MY_PV=${PV/_/-}
+MY_PV="${PV/_/-}"
 MY_P="FileZilla_${MY_PV}"
 
 DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
 HOMEPAGE="https://filezilla-project.org/"
 SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
 IUSE="dbus nls test"
+RESTRICT="!test? ( test )"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+RDEPEND="
+	>=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.26.0:=
@@ -30,16 +33,11 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	x11-misc/xdg-utils
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.13.0 )"
+BDEPEND="
 	virtual/pkgconfig
 	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
+	nls? ( >=sys-devel/gettext-0.11 )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.22.1-debug.patch
@@ -48,24 +46,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
 )
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
 src_prepare() {
-	setup-wxwidgets
 	default
 	eautoreconf
 }
 
 src_configure() {
+	setup-wxwidgets
+
 	local myeconfargs=(
 		--disable-autoupdatecheck
 		--with-pugixml=system
@@ -75,14 +63,9 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
+src_install() {
+	default
 
-pkg_postrm() {
-	xdg_pkg_postrm
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-ftp/filezilla/filezilla-3.53.1.ebuild b/net-ftp/filezilla/filezilla-3.53.1.ebuild
deleted file mode 100644
index c8f67f39ebeb..000000000000
--- a/net-ftp/filezilla/filezilla-3.53.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.26.0:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index ee6a1973e219..e3b9fa754b37 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -4,5 +4,5 @@ AUX frox-0.7.18-config.patch 1960 BLAKE2B a6ca1b8bd15f39a3dc5b3b10cb4a578447ce30
 AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df6dd978f84490f48e102e9fcc3efbd77b3cbf09071ca7c1dcf15bb20cd149c576680d7705beb4c8814bc15e8afbc44 SHA512 99c2157206f1cf14bb5bef5b2fef656c4322077363d531c2798091d871e1931a81df8dd5a21f9b57ecba22c5379ad72ddf36c10d78e9efcdfee7e1e29fbf6108
 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364
 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c
-EBUILD frox-0.7.18-r6.ebuild 2013 BLAKE2B 9c2fe42c27b654496c210c602f92f60aac7365d52cc3315dd77c81fda5774266765db2c4c1f8fcdb3b9d24cfd7e5082a7e9c35a6966d6ff1fd8d84c916ccfe17 SHA512 b169215a9a56ce571ecea073d9d35e7c47c46975ba11a2e490e0206d67f3e8c178616d74477f30446b9de746885474673333b6afa7895f141b9d9b5ec1dc3071
+EBUILD frox-0.7.18-r6.ebuild 2006 BLAKE2B 56ebe1a0d7bc5b1b1304808a46c2ef07d295d332f01f621101fdb38d816352bd104a58d2b0b43eead8ca5ec89322bd2b7c8de6bd7bdc9485bda1f55ddd515c6f SHA512 9d2cc56744138ad30fecf70868f0c839f6b1f3f29288127e47d620a072ec894e62461b80df254c2cbec810d4abe8d919c20384143f5daa0acad1d3fea8d6eca3
 MISC metadata.xml 623 BLAKE2B fe1b6aaccdc85accf5b392e79b85e18233eee2e86c6f2c60284ca95805f107408ac9adc1e56900390b75583c86bccd322deb6cdd0bab773e35c896b4d3e04511 SHA512 62a239cfde0893981edef12942251ea54fd4260254e32b726ff9b424f57b37795cd3b188005f1bc1b4fa42c99c89c5eaa63b0239d34b32dd7270ea336f34e8b1
diff --git a/net-ftp/frox/frox-0.7.18-r6.ebuild b/net-ftp/frox/frox-0.7.18-r6.ebuild
index b05bce79d8c3..972f0fdb1a21 100644
--- a/net-ftp/frox/frox-0.7.18-r6.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils user
+inherit autotools user
 
 DESCRIPTION="A transparent ftp proxy"
 SRC_URI="http://frox.sourceforge.net/download/${P}.tar.bz2"
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 62b7b3b3824a..c9529c42db36 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,5 +1,5 @@
 DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a SHA512 6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
-EBUILD ftp-0.17.23.0.2.1.ebuild 1554 BLAKE2B 7d6261d1e56f7716be5539ac052acd398a253024f7abf4f65976ce2a98ff2f2302e20d11a107943664a7c038e35512457d86ec6c00816fcf874523d7ca43f546 SHA512 41cc39602424dae6e2ec1f61e10df35f22596b18919c0b8f69a5209919b06ef1537c11bf794d580ef57239dec625f839be98c65a0f6ae874e76ac7acf8724d9e
+EBUILD ftp-0.17.23.0.2.1.ebuild 1555 BLAKE2B cf68fb465b8e2ca62bf6a3fbca7e7338ba1d6afa9ac69ae810fb2d70af1e5f8ca0622c76765f152aa3126fea3401f96eafa669ed6c6da1effd5a809cccaa009b SHA512 9d57ecf6f71164d18bca9c565e844ef7088ead5b36cd61384295297a9f2e89b9ddc1bfe62056d389ca59acd7acd9ed56c39d1cbef3510d96dc0b77ba46ea5c33
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index b17b87a27db5..fce7464edfdc 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils toolchain-funcs flag-o-matic versionator
+inherit epatch toolchain-funcs flag-o-matic versionator
 
 PATCH_VER="2"
 MY_PN="netkit-ftp"
@@ -19,7 +19,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 81a4adc19f29..e5da67d5c8df 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,5 +1,5 @@
 AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r4.ebuild 737 BLAKE2B 57c9261641cf526027abe518458c58a682055dd4ff525ac3f30944e679a64c490a06004fe306be62fed870639451273fd15b082385c9f3a53dda2c7dc7a8b8c4 SHA512 44ff0ea193c476162f94b118681c08f0ca670a12e2618f09db67434bb78a193b96be0ee96c13d841e2d235560c38054b74fbc243c3e4df15f28047fd566586d8
+EBUILD ftpbase-0.01-r4.ebuild 738 BLAKE2B 270a30abcd61bd75664da4a1ead38bff0eb60d0ecf23b6e7cbca43858cfb531709e7fa2f8224faaa8cf4522c534d293b90642266debfcb66cd72608f2b771afa SHA512 02ea902cc72ca5cad4d110f4e7027b495e5f5fa40ac6c4845c76fb04995975f82b20fcc55569f1b5d4976c85c0f08c12c0d18d90fa04b11854540ca717651f3b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
index 19eee733db9e..dc3a2253a339 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="pam"
 
 DEPEND="pam? ( sys-libs/pam )
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 28127b76951b..eb41af84c76a 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,4 +1,4 @@
 AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663a5abcd680269101d5547ab9f6b9addcfe6040ba35e16e8e540784796e34304a9377b1149f7ac00fe0859627a141200 SHA512 c6bf0cc4324583d9aae3f3a57c900437a78d30138d0b9da06fea66cd5fbf57a79ea420afe33536a5bbcf2ace61aaca30ea04155df638daeae125ed9ca90b1c25
 DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
-EBUILD ncftp-3.2.6-r2.ebuild 1021 BLAKE2B b7b4269a8aea831c2a2f9be5238f0c012944773d279913afb5c5f88228decfd5d6c8bbb002bd83d04a45d0ba60e7f2af1ff79fd342f00eca5171e18fa1fa2a56 SHA512 a1fffbaac6a9e9d11bdf16b4fe34c3edb9790fa15ce00450f599451326aef90a875dde87fb2b11c83dd596a677a5f97d885844fe089a4416f278ae4da8c46fd2
+EBUILD ncftp-3.2.6-r2.ebuild 1050 BLAKE2B d12005db3b563af620101cea2276468d21cfb32c4dfdc9f46b1a6dbb52b47b113f1a7bdb013036396a87391ae16ce66b1563fbbe1d32296bcdfe1d2872f402d6 SHA512 50db5b6b0441f96c3daa8733e6f8443cecafdbf025cdf130f5f2bf6b660149229f35198879f118302b7e4f5a1d45bc6f4ea972d35d5ad040806c1274ccf6b783
 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 2ad892c6a4a1..2185c86ad4a9 100644
--- a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
@@ -21,6 +21,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.6-fno-common.patch
 )
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 26c9f0bac12b..47a668a4d319 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -3,6 +3,7 @@ AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 BLAKE2B ce4522896a81fed326ae
 AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dcada8a14db6681440494abc24ccbf53ea5baef2362a9174de3bf7e3e07d562f30a55492735137efa91a9dd09676dbb95e624f3ae77f SHA512 4cc235bdb60ea4c84794d4347826b040057067d8283dcfcb795d5d25a156de480df7d897078ab8ab4faf12d4fc9e714a55f723ce27c9397bc2223550597df674
 AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af3700ce4a09d7f31ca9b24c66e1a1306bbe26c243b553c1cb81c13cc9593ae36e93b03f28faeb64fe2ae2f834575e9dee402f73ee55 SHA512 d0dcc467289b4107aecee66edf122667b2fbb9b1f1a6a6ecea517f286090d22682200b9d11f503465cb9b5387e8fb749cc09c3033825282450fe1d6c0a4bb11d
 AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd
+AUX proftpd-1.3.7a-no-ncurses.patch 7787 BLAKE2B 0122a91623bb9a3207a5eb9f53767e555f08810eaa9b0a97585725345dfe1798174c8534d72fbaab1aa8259a66e74bd972a38243064c2e5c7c4d9f986eb13a06 SHA512 061e1692304856136763478aea35d0668216dba07450b6b87af51d2464857f62df25e92173a9e889065b2f5f9e6b960433d591ecf1649735b36fd97be9de947d
 AUX proftpd-1.3.7a-tinfow-segv.patch 5918 BLAKE2B 526e3e83c946e61445f32281054a768fe9eca5027c49d2f9e915810f15c4ac3a16b53de6e16886a52fc3d891fda4882ef74df1f0fc8c4774e8bac35f50ff6adb SHA512 688a0f4e79ff9089329e56f0dffffa346152f5508e1bc403ef11fb65c117403ab74660f5bc2719939f88df70518f34f7eb8f69735cb9a8a28ec0906b73a516d6
 AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52
 AUX proftpd-tmpfiles.d.conf-r1 30 BLAKE2B 0eb931370872ef78732d23179f20a3fe1289f8e601478c1b4709755748416f9283cdadcb2c43765019a9f6b5407e7c9db1aba8b1c1524db1e702b52898aa7602 SHA512 c85a6bc1375ebb44d88114c5c6f46d9c2e207e9d9555d9dc599f69a6485e2d5b2a161ac151f8b9e76f8e385f9dc3b811128db68f5d45648d960c8e8fbeb0050b
@@ -19,6 +20,6 @@ DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
-EBUILD proftpd-1.3.7a-r1.ebuild 8663 BLAKE2B 6fb976e733b88f597377002013f0777ed6045add297ff5aae73f532990e861ae494398b12bb8fb9e0677cdabea233fc9ae68ff2178539a5d7cea44a30248f23a SHA512 84721b8bb9a88d18a324c009b80358ee8f936aba84ac837c2a394fe9531c891e655f1d10dc4a6d35aaa94e4324dd93fc1d9f0c3533b201edaa1abea33af68f8b
+EBUILD proftpd-1.3.7a-r1.ebuild 8694 BLAKE2B 12076f3e626c51edb25e29722a13726fa4fcf4437495210e4f9d4483afc829ee794a4db24f30178adfa4eb897dbad7cc43cca8c361ed57c673dbfc2141241c1f SHA512 812d17de61a5735e6cab1e344bc96dbf0c37da6b0f0ab8cc0a8a234fc2a11cb8c7f328f00cdc9c95970d678eff43ec15965f8290b7b5f30149a9c75a6c4d7506
 EBUILD proftpd-1.3.7a.ebuild 8619 BLAKE2B 86d5f5a14fbbc9392e5e5f92da7377c657e5edb2560717cad90a8e0d9e77354a34ecf8db16477e83fd3cf7c7fe6187f349d07bb9d0fcaf06d1b8c014dc185114 SHA512 a6b0a8e3d58bc35a25aeac2e2745f6e6dae3a8112cd138c1785f51329542f2cb95b2a247214e4e1fbb2b8f0a5798fefd78ff4861cbde5714d117e73ba806cbaf
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
new file mode 100644
index 000000000000..be18a9954590
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
@@ -0,0 +1,269 @@
+https://github.com/proftpd/proftpd/commit/8fc570bc13e771d3ecafe53ab94ada0be2b6646a
+https://bugs.gentoo.org/777531
+
+From 8fc570bc13e771d3ecafe53ab94ada0be2b6646a Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj@castaglia.org>
+Date: Tue, 23 Mar 2021 19:50:49 -0700
+Subject: [PATCH] Issue #1207: Properly honor the `--disable-curses`,
+ `--disable-ncurses` configure options.
+
+---
+ configure    | 156 +++++++++++++++++++++++++++++++++++++++++++++++----
+ configure.in |  39 +++++++++----
+ 2 files changed, 172 insertions(+), 23 deletions(-)
+
+diff --git a/configure b/configure
+index 86cf1360e..59df363fa 100755
+--- a/configure
++++ b/configure
+@@ -22970,7 +22970,7 @@ $as_echo "#define SETGRENT_VOID 1" >>confdefs.h
+ fi
+ 
+ 
+-if test x"$ac_cv_header_curses_h" = xyes; then
++if test x"$enable_curses" != xno ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
+ $as_echo_n "checking for initscr in -lcurses... " >&6; }
+ if ${ac_cv_lib_curses_initscr+:} false; then :
+@@ -23013,12 +23013,154 @@ if test "x$ac_cv_lib_curses_initscr" = xyes; then :
+ $as_echo "#define HAVE_LIBCURSES 1" >>confdefs.h
+ 
+ 
++$as_echo "#define PR_USE_CURSES 1" >>confdefs.h
++
++
+ fi
+ 
++
++          if test x"$enable_nls" = xyes ; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfow" >&5
++$as_echo_n "checking for halfdelay in -ltinfow... " >&6; }
++if ${ac_cv_lib_tinfow_halfdelay+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfow  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char halfdelay ();
++int
++main ()
++{
++return halfdelay ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tinfow_halfdelay=yes
++else
++  ac_cv_lib_tinfow_halfdelay=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" >&5
++$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; }
++if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then :
++   UTILS_LIBS="$UTILS_LIBS -ltinfow"
++
++$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h
++
++
++else
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5
++$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
++if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfo  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char halfdelay ();
++int
++main ()
++{
++return halfdelay ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tinfo_halfdelay=yes
++else
++  ac_cv_lib_tinfo_halfdelay=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5
++$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; }
++if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then :
++   UTILS_LIBS="$UTILS_LIBS -ltinfo"
++
++$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
++
++
++fi
++
++
++fi
++
++  else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5
++$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
++if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfo  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char halfdelay ();
++int
++main ()
++{
++return halfdelay ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tinfo_halfdelay=yes
++else
++  ac_cv_lib_tinfo_halfdelay=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5
++$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; }
++if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then :
++   UTILS_LIBS="$UTILS_LIBS -ltinfo"
++
++$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
++
++
++fi
++
++  fi
++fi
++
++if test x"$enable_ncurses" != xno ; then
++  pr_have_ncursesw="no"
+ 
+-pr_have_ncursesw="no"
+-if test x"$ac_cv_header_ncurses_h" = xyes; then
+ 
+   if test x"$enable_nls" = xyes ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
+@@ -23160,15 +23302,7 @@ $as_echo "#define HAVE_LIBNCURSES 1" >>confdefs.h
+ fi
+ 
+   fi
+-fi
+ 
+-if test x"$enable_curses" != xno ; then
+-
+-$as_echo "#define PR_USE_CURSES 1" >>confdefs.h
+-
+-fi
+-
+-if test x"$enable_ncurses" != xno ; then
+ 
+   if test x"$pr_have_ncursesw" = xyes ; then
+ 
+diff --git a/configure.in b/configure.in
+index 4bd0f7c19..01ec7863e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2749,17 +2749,38 @@ fi
+ dnl Custom-rolled macro for checking return type of setgrent(3)
+ PR_FUNC_SETGRENT_VOID
+ 
+-dnl Perform checks for curses/ncurses libraries only if the corresponding
+-dnl headers have been found.
+-if test x"$ac_cv_header_curses_h" = xyes; then
++if test x"$enable_curses" != xno ; then
+   AC_CHECK_LIB(curses, initscr,
+     [ CURSES_LIBS="-lcurses"
+       AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have curses])
++      AC_DEFINE(PR_USE_CURSES, 1, [Define if using curses support])
+     ])
++
++  dnl Check for the libtinfo library, which contains the stdscr symbol,
++  dnl halfdelay curses function on some systems (e.g. Gentoo); see
++  dnl Issue #1207.  Note that on some systems, this may need to be libtinfow
++  dnl instead.
++  if test x"$enable_nls" = xyes ; then
++    AC_CHECK_LIB(tinfow, halfdelay,
++      [ UTILS_LIBS="$UTILS_LIBS -ltinfow"
++        AC_DEFINE(HAVE_LIBTINFOW, 1, [Define if you have libtinfow])
++      ],
++      [ AC_CHECK_LIB(tinfo, halfdelay,
++        [ UTILS_LIBS="$UTILS_LIBS -ltinfo"
++          AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo])
++        ])
++      ])
++  else
++    AC_CHECK_LIB(tinfo, halfdelay,
++      [ UTILS_LIBS="$UTILS_LIBS -ltinfo"
++        AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo])
++      ])
++  fi
+ fi
+ 
+-pr_have_ncursesw="no"
+-if test x"$ac_cv_header_ncurses_h" = xyes; then
++if test x"$enable_ncurses" != xno ; then
++  pr_have_ncursesw="no"
++
+   dnl If NLS support has been enabled, then check for the locale-sensitive
+   dnl libncursesw library first; if not found, or if no NLS support, then
+   dnl check for libncurses.
+@@ -2776,19 +2797,13 @@ if test x"$ac_cv_header_ncurses_h" = xyes; then
+           ])
+       ])
+ 
+-  else 
++  else
+     AC_CHECK_LIB(ncurses, initscr,
+       [ CURSES_LIBS="-lncurses"
+         AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have ncurses])
+       ])
+   fi
+-fi
+-
+-if test x"$enable_curses" != xno ; then
+-  AC_DEFINE(PR_USE_CURSES, 1, [Define if using curses support])
+-fi
+ 
+-if test x"$enable_ncurses" != xno ; then
+   dnl Check for the libtinfo library, which contains the halfdelay() curses
+   dnl function on some systems (e.g. OpenSuSE); see Bug#3718.  Note that on
+   dnl some systems, this may need to be libtinfow instead; see Issue #1174.
diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index 17be3df4415b..249498784d2c 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
@@ -71,6 +71,7 @@ S="${WORKDIR}/${P/_/}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
 	"${FILESDIR}"/${P}-tinfow-segv.patch
+	"${FILESDIR}"/${P}-no-ncurses.patch
 )
 
 RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index ee38865ceab3..c37a9675c8bc 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -5,6 +5,6 @@ AUX tftp.service 119 BLAKE2B a2d50dba1103fb7c868e070331c8a2000e65364801abc85d969
 AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e4209e83e7d6d273583b2cd9104ba611e3acca0018d915f4313860039a3b0003e556f49f82917ef1 SHA512 d49cdbb7e265aa98d989f8ae96e2c80bfd5887ae0efc6bfcd726d5fa4d83ffc480f5f374e30b8564b05d9690eb2a0c0ed0077982a74946edfbce5d19066d0564
 AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5
 DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394
-EBUILD tftp-hpa-5.2-r1.ebuild 1360 BLAKE2B 32be95550c5cd04c03f8c57310e50bdba20fee6b3384193d51e24da64148240d3e5053b44dc8272d53de0e8c9cd1de68e9297dd0648d6db63cdee3fff9fc1ac9 SHA512 d2e542023d6595dc5df42f15acd685a8b31f0213a2a36c480dc6eb797678b72e595762b4d97b320a6a28a70b9746b0e084051cc756a37fa49b28142a7eaa3d55
-EBUILD tftp-hpa-5.2-r2.ebuild 1623 BLAKE2B 6e10533dab6e9ae828a32a3a510d9e7988f8d6d46ee95e4d0d2e2a1dd1c25843b93c581efd65bcda92a9bce014cf1d2fecb1e10ef5f92603d8cc6ff1be1c78cb SHA512 9d7ffca2a535b93bf827c5b55f29acd3de0d51f03d9f79a0a84e7c43b71723f7391dfbf08d06a78ca7bdee26309addcfc128e1f89de9f4c4c5f08e559272536c
+EBUILD tftp-hpa-5.2-r1.ebuild 1361 BLAKE2B 8366d6b63cf50038df4c6ff8ba3efec86d374e7a72d6d7cea3f616b854fab4f4842a00f45c35c944e0ac9cc781dd6e5fa53685d963efd731107d1740a99999f3 SHA512 4c5649c21bbf0846c79b5270d10bd6c5c0715b7f6db23c02d0d2074785ead8b07b0d6aa7e902053a618f206210307ab3c663f486691fd758f2b275cd44a72a2d
+EBUILD tftp-hpa-5.2-r2.ebuild 1616 BLAKE2B 54be8e1f41dd4423299af55f59b5765d8d9395aa5a36c6762725a010a1964f6ec7e73a3ebcea1ffcea458cde8ab1c5bf89e5e8d296edf6316893ae17ff2c02e2 SHA512 e117f3f1a6100fcb55d64af287dd276f16004c0e79f36460fff86d1371fc95e50c744dd6350848ec10066dd6fae936452919ef96038692730556cbd2a86437b2
 MISC metadata.xml 394 BLAKE2B 87202528ec85f2d4931e861cbb0ee6a69653502c2ab33ae5def46e32786cff1fa90b5102546254a03f71c84c970757591da6f883e49f63580ccca837f8c5181e SHA512 0a866135a65f2c41c97a5991a4f041989a5c9b13c74cf327a3a6ec66d1589da64f31f2d8ec2f3848ecd32faebb790092a39a33f1806335b2f267e41501209321
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
index d4befbf65a61..b9c900575cf3 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit systemd eutils toolchain-funcs
+inherit systemd epatch toolchain-funcs
 
-DESCRIPTION="port of the OpenBSD TFTP server"
+DESCRIPTION="Port of the OpenBSD TFTP server"
 HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/"
 SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE="ipv6 readline selinux tcpd"
 
 CDEPEND="
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
index b242ee021199..30a1a4c26456 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit systemd toolchain-funcs
 
-DESCRIPTION="port of the OpenBSD TFTP server"
+DESCRIPTION="Port of the OpenBSD TFTP server"
 HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/"
 SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE="ipv6 readline selinux tcpd +client +server"
 
 DEPEND="
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 8e781a5f0eed..69e38cc7e800 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -16,5 +16,5 @@ AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba
 AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e2642fe37aa122b59c0a3fe509d00a5435eaf4c300962c9cb5712b083e7d7d927ffbc148d0bd6a5b8 SHA512 30fb4ae07f55011b9b29625db072062a0f1df4f1c7578041231f35febfb90ad2d2dfe1deb964e34fde5c660f0e3ffc3df3d77af1b2f3a1f724176f691a53a182
 AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-EBUILD vsftpd-3.0.3-r3.ebuild 3693 BLAKE2B eb831efc42f2083493ba308c86e63d7b530c0e03f369319ba31525ee5e0c9fc0641158ac1f2e4c91e37e8113c98347ee3fe38d996ee129d7f82a0b5caad927b1 SHA512 c2e6cdb7b512d9cd7450e92cab4aea9b5fa64297e38d34c980f672f60d89644b191327d32b2aa5645770bd3d0c9c7031a4d2a34355b6cf1078acad6f1115b52e
+EBUILD vsftpd-3.0.3-r3.ebuild 3694 BLAKE2B b98c886c622b8ad1557e6b24f8478d6fab924b5b74b57e44edf230aa4388d277588e05204e47bcb68eb659cfec4ffdca15ebedf9a68240cbccccfbfd1b9d7911 SHA512 42213f0d67da37b811e71400ac399b2629a7e5307850b4d64b8b20b5840b132ebfba2a8b63a5d69a6bc009f88ccaabe147cecfaa29672c8383e440a660175435
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
index 9ff59b89d0c4..1152c63c9016 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )
diff --git a/net-ftp/yafc/Manifest b/net-ftp/yafc/Manifest
index b7604ccad17a..b99701ad55c1 100644
--- a/net-ftp/yafc/Manifest
+++ b/net-ftp/yafc/Manifest
@@ -1,3 +1,3 @@
 DIST yafc-1.3.7.tar.xz 363692 BLAKE2B deeda22d997ee7f3dd04626cdac352ec43f5e47c66029d59f474c43f7ccfba4ed8cbf886fc6ac7a684b8828d30baa02ee880978c891c34337607d88a42582db1 SHA512 2547cf3d6f1918a5cd2d3bc29455311d48fcd7dbccfdc8ae4ce08d1fd63cfabae07b70ebf005206a61937bd5b686e19d3af095f876616a5ac4b0593e90cd39c5
-EBUILD yafc-1.3.7.ebuild 1072 BLAKE2B df45f814675020d6f81ccadff03cbd70ef09ad139cfa838983f0cf0f855a38fe635ab17ce02ca6b98d7c45524218cf345c1188a2cc212a6aea2295b856ef4ec1 SHA512 fa1c15f93a9163a81f516deb9d45002f09f4a913b0dd8a6bcfb65432cd6a10adb49ee89c8a54453b5a488df42afde0931ce695c8b807b9afeb718e6fe0aa1285
+EBUILD yafc-1.3.7.ebuild 970 BLAKE2B 79faa94af21f8c1a336a302bd3e9d59038beed5ac95fc2d9725ed36a71637d327aac324d57a25cc527e8394e1de5209162dba8baaa5a013940a3550cf58aa53a SHA512 f4452aef3abd1d888dacc5e37aa015dfd61c3122f4d2f36f17e93a3a6ce0025eb581f1ffe9e434c6dc31af144b673f9df89983e9c2cfcbf52e0db5cbd4f69e13
 MISC metadata.xml 232 BLAKE2B 0716645e33dc0657e438f92ba6d3afdaf2dc1ff90cf88418e5f3ca4b70f82fc928c44cdbce0e703df3e3311f1deb413a5c0142cefdc1de2d77046c0866ee605b SHA512 d7fd342295962b89739ead1984e71a86832878146498a919c1551d499bf1ef133d48b880a065735e88cf256494073591f31703f600ef456b8ba5b9fa4499f707
diff --git a/net-ftp/yafc/yafc-1.3.7.ebuild b/net-ftp/yafc/yafc-1.3.7.ebuild
index 39bf8f0beb48..b5da3d97096b 100644
--- a/net-ftp/yafc/yafc-1.3.7.ebuild
+++ b/net-ftp/yafc/yafc-1.3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit bash-completion-r1 eutils
+inherit bash-completion-r1
 
 DESCRIPTION="Console ftp client with a lot of nifty features"
 HOMEPAGE="http://www.yafc-ftp.com/"
@@ -12,13 +12,12 @@ SRC_URI="http://www.yafc-ftp.com/downloads/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="ipv6 libressl kerberos readline socks5 ssh"
+IUSE="ipv6 kerberos readline socks5 ssh"
 
 RDEPEND="
 	sys-libs/ncurses:*
 	dev-libs/libbsd
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	kerberos? ( virtual/krb5 )
 	readline? ( >=sys-libs/readline-6:0= )
 	socks5? ( net-proxy/dante )
@@ -28,10 +27,6 @@ DEPEND="${RDEPEND}"
 
 DOCS=( BUGS NEWS README.md THANKS TODO )
 
-src_prepare() {
-	epatch_user
-}
-
 src_configure() {
 	export ac_cv_ipv6=$(usex ipv6)
 	econf \