gentoo resync : 20.03.2022

10 files changed, 47 insertions, 34 deletions

diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 04f6d42db2e3..eb79d7760f97 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.57.0 b/metadata/md5-cache/net-ftp/filezilla-3.57.0
index de9175b5ff9b..f2b8bcf0e67e 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.57.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=7
 HOMEPAGE=https://filezilla-project.org/
 IUSE=dbus nls test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.35.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.57.0_src.tar.bz2
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c27902d6748dba02280a8507a8de43b8
+_md5_=ac09191b96e4e21f02c73c592fa3066f
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.58.0 b/metadata/md5-cache/net-ftp/filezilla-3.58.0
new file mode 100644
index 000000000000..7429d9d53eca
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.58.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.36.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) test? ( >=dev-util/cppunit-1.13.0 )
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=8
+HOMEPAGE=https://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.36.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.58.0_src.tar.bz2
+_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=a77f5b8533712abb9b7b65e73beaf147
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01-r5 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r5
deleted file mode 100644
index 25fac5e49b15..000000000000
--- a/metadata/md5-cache/net-ftp/ftpbase-0.01-r5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=pam? ( sys-libs/pam ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=File Transfer Protocol (FTP) base layout
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=pam zeroconf
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/ftp acct-user/ftp
-SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cc03f4928af642eb017274cc6cd91e0a
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01-r6 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r6
new file mode 100644
index 000000000000..73149c508600
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.01-r6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=pam? ( sys-libs/pam ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=File Transfer Protocol (FTP) base layout
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=pam zeroconf
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=acct-group/ftp acct-user/ftp
+SLOT=0
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=ed3e42f2229971a330364ffe811e2469
diff --git a/metadata/md5-cache/net-ftp/gftp-2.0.19-r3 b/metadata/md5-cache/net-ftp/gftp-2.0.19-r3
index 0db593d382b4..1e8a8c91e474 100644
--- a/metadata/md5-cache/net-ftp/gftp-2.0.19-r3
+++ b/metadata/md5-cache/net-ftp/gftp-2.0.19-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Gnome based FTP Client
 EAPI=6
 HOMEPAGE=http://www.gftp.org
 IUSE=gtk ssl
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0 gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.gftp.org/gftp-2.0.19.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=2f4988f3876d57d53dd7e9ca555e0b34
+_md5_=77e1219ce481106422a1e2cdef5aeb3d
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r3 b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r3
deleted file mode 100644
index f7260766b3c8..000000000000
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:=
-DESCRIPTION=An extremely configurable ftp client
-EAPI=7
-HOMEPAGE=https://www.ncftp.com/
-IUSE=pch
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=Clarified-Artistic
-RDEPEND=sys-libs/ncurses:=
-SLOT=0
-SRC_URI=https://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.xz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e33346fe952b68b4296e9768f47ebfc9
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r4 b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r4
index 1a5812ab0ec7..70a570ec511d 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r4
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r4
@@ -5,10 +5,10 @@ DESCRIPTION=An extremely configurable ftp client
 EAPI=8
 HOMEPAGE=https://www.ncftp.com/
 IUSE=pch
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=Clarified-Artistic
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.xz
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5fe1b50f0b388280c305980cb6cb7378
+_md5_=6394b339feb7b591d1350d8a180fd295
diff --git a/metadata/md5-cache/net-ftp/tnftp-20210827 b/metadata/md5-cache/net-ftp/tnftp-20210827
new file mode 100644
index 000000000000..6e231853cc5c
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/tnftp-20210827
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=sys-libs/ncurses-5.1 dev-libs/libedit socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl:= )
+DESCRIPTION=NetBSD FTP client with several advanced features
+EAPI=8
+HOMEPAGE=ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
+IUSE=ipv6 socks5 ssl
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-4 BSD ISC
+RDEPEND=>=sys-libs/ncurses-5.1 dev-libs/libedit socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/tnftp-20210827.tar.gz ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/old/tnftp-20210827.tar.gz
+_md5_=6577765a2d5a90b34aac037784f8b240
diff --git a/metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1 b/metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
index a68e8dc9a3e6..a0631fd96b40 100644
--- a/metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
+++ b/metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Very Secure FTP Daemon
 EAPI=8
 HOMEPAGE=https://security.appspot.com/vsftpd.html
 IUSE=pam ssl tcpd
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libcap-2 pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) net-ftp/ftpbase
 SLOT=0
 SRC_URI=https://security.appspot.com/downloads/vsftpd-3.0.5.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=297df3802d66de7137facfe3f9fffc81
+_md5_=35149999dc18906331a7c90fd070cf66