gentoo resync : 20.03.2022

15 files changed, 118 insertions, 66 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 9affbe227f01..223c1f8b204f 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index df6a1461a030..82e50260d5ae 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -9,11 +9,13 @@ DIST FileZilla_3.55.1_src.tar.bz2 4910935 BLAKE2B 7a901f7c73c6223c92100138989ced
 DIST FileZilla_3.56.0_src.tar.bz2 4918048 BLAKE2B c671f1a2d0164f7083841d03e6e3780e778b620cf9525b96c15c7c86fc2ca4a4e5908b7bbe30a37b44209f30494c6adedc9292ae0ee5cf03043e18c73dc6e036 SHA512 390aceee80151bbf5e8f00cdfe48fafc20afdfab8b78f627a96215e74bc7d4ff7310dd67400b1deb531dde0fa4a100ac4cd04ff4e6166860badac68438ed23db
 DIST FileZilla_3.56.2_src.tar.bz2 4919610 BLAKE2B 1034500f3f4c2c747db663a8b4fe234e7f24db570186625b40cca84143c3b3119a9d1c7206069bfe1837056e134f2df4641beeb9c437fb0b1bb48872cec89d51 SHA512 6aab8a0a8b2205ac5428c6b5ef698010cb9a42759913254ac5981be85ffb8d725251724c1972c9b9ba6c88029573ef2c8a36f6814252b8080476f0b080a9d2f1
 DIST FileZilla_3.57.0_src.tar.bz2 4922294 BLAKE2B c9eba7f5815702e6d46f25a176f768cbbd77d0f82b37beaf07c038035f46f3963405bf4c1a4254406dbda3ff28bed1192e50dbe2238b87ecd1fa88a9fece1f79 SHA512 4c3a5c4f4c1551cb81283f2886555c0e4857be55c60c4489d4cbe817ea6ebc0c9104088408766d5f9b3e6434f0fcf47986c62afc858e7095225f2db6f6753377
+DIST FileZilla_3.58.0_src.tar.bz2 4931087 BLAKE2B c0a9ed0d14a9cbc0d392f9680c4c6c60cb4157ec87be596aa8c7edb53dff23ed21ccb234b58a32b9929cb44f1624dfc8c0a3d09690be467bdeef6ebba802b354 SHA512 f613f210d9176be2dd41046ecdf4598604f8902829edfe5981564217561417ca35029618b0c50cdb6232220ec0440bd390f098b602c05845c846efe0689d9d54
 EBUILD filezilla-3.53.1-r1.ebuild 1571 BLAKE2B dd9d203963419932e93af9455b7a445dc6df94523d9f6b5c2f127e774ba7d428d996dcd03c2689bc8220882581fbb0b2a72b041d96e41f4b5ab3dcd0f475beb9 SHA512 3d462010456db814b7a043cfb6af5e31e3c4f1670f8cee8932edf4a69dcb4632516aec829c89dbb9ff8fc637b9c63f4176a4ffea3872e044520d14db8ea2fc85
 EBUILD filezilla-3.54.1.ebuild 1575 BLAKE2B 5c88143cc929ddcebb2c98828a8f9337fc55a7bffee83aa12096d9b3d7ba4283c00eb26715abfb48bfeca93af509c71f7890b1f1066505422638f5d0447b02ce SHA512 9110f108f3a2e47ece4eec3933b3c137a03de8f1bb4cae66bca913abd6fb252220fab2ccf50ce186cda7860eec7c3c60b4c5891d7eb9dd9080d547c0d952d80b
 EBUILD filezilla-3.55.0.ebuild 1575 BLAKE2B 2d02d23713d4dca30ab3a8044d711b52b8cb31d2aa1742b615ff63862a2cdaaf99711d1bf18ceacec9413b6543a441e2e2384d76f99bce769faad7bfd2d02b5c SHA512 7313ec741aca650db99b3acee996de1d1d67e53e9eeb599c448d20a2597752ea5d7cc1e08d371f7d56dbbf7dbd1a54dff6f43883b6ca741de87134b8799a2478
 EBUILD filezilla-3.55.1.ebuild 1575 BLAKE2B 5b04084b76567e4da05930aa1d9bf65648f072c7042b62b18fb48de24042605b8378a422f0d634c7cf666526de02e229b0fd592efab2fd28a9b5477b1d417c21 SHA512 27a8211978188750665bc5fe2e232474a96ce61aefbdcb489f0ef0940811f20ac483065b8f03547048e786e5d474c0de90adcfb37f5be7dfe8b07aced877f89e
 EBUILD filezilla-3.56.0.ebuild 1575 BLAKE2B f28646fdfa607ddc764edd52f1e8fc8579782ecb1a2a15e2ffcf3c75feb6fb569b0059c99ca6e21b4888cef3f74249570bd538615185eac4b4147d3e9df4371d SHA512 83f219692ebd35de23cd6922440e324b293e491a79406fedebba0a3d8b1ef1c472fe969db00195871aa05c263718142d831535d70c7f05aeb70b0de185110f6e
 EBUILD filezilla-3.56.2.ebuild 1575 BLAKE2B df0cd70ac3470ee498456100773c3fa0d1e833e3e34e41f51f93acc77b96d9a6067a0711ba53f73d10a2e5dbf6c6c2cb96a5974e5118bbf4010193452317a6b3 SHA512 830d610fc41467007cc3152443786330df0859def3fd2e2e32ae980d6d43abb0e77a9d5054e10463c5478af63ac3a139c66726b6d18536a21b2f30bcc93c5824
-EBUILD filezilla-3.57.0.ebuild 1562 BLAKE2B 6956e1ba7e274ab825636011cde1065d5495ccae6280bc689749c139efb172e3f88c0c1d0d1a1a3cc787d87cfdee63db2f9f73a20c79e6586a5fbf3673702f7a SHA512 89b05733cce322ec6a2693e54153337c9033eda4d423207ea2a08a442995ca7d6bc41c7dd9a4444e5348ea09bede0cd661667ec163781dd40c4ab13b82903765
+EBUILD filezilla-3.57.0.ebuild 1569 BLAKE2B 25794ae1d8f270b0858a1179010501de8466750c5ccb7216b3bf31cdc712a205185ae6c8ef651f29512e0ed818749c5710c161efb798f3f2a1838b5def6ad8a4 SHA512 299d641c7b9f6e27a34f5e0802ad2524ea979707910c5f4f635da7f3840188b72415f9b0626124bb46f6b04718a5ff67087ac6a5acc2a74c45e5516b71d04665
+EBUILD filezilla-3.58.0.ebuild 1569 BLAKE2B e87b9cf181e530f9de1eceb4f22f290518a55f30887bde0f32891d688a2426b2433669f24f9f2169aaba1caf174fc2bcb8ab8f5b3b34da0a1435c14c6d6424b5 SHA512 fb59b680389bb9a09f578aa728df1d055e4808a9fb6d908ad93899ef30a23afa06133e92e4a43485d257488b22291f3ef58231269e9d50a17e815f03bd1bfe14
 MISC metadata.xml 460 BLAKE2B 7690f57ee9bf1ea095d672904d4361d4563969d28fc61a9afbf9efaa4965eb1aee775c6555b7959fb2bd17ae80827cd84874dbc79657cd8884b96b7e6740dfe4 SHA512 4afeb15bd88c8926ff25032d2c1cfcd4915cfba862fed4f54e68b471249e03da9d487ab1c0a05350cd4a289eb5b06cab1cc597e5aeab226655405e49a1088338
diff --git a/net-ftp/filezilla/filezilla-3.57.0.ebuild b/net-ftp/filezilla/filezilla-3.57.0.ebuild
index 54d6c4421bad..07b8bc826a8a 100644
--- a/net-ftp/filezilla/filezilla-3.57.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.57.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="dbus nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-ftp/filezilla/filezilla-3.58.0.ebuild b/net-ftp/filezilla/filezilla-3.58.0.ebuild
new file mode 100644
index 000000000000..b78ee06bceba
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.58.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools 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"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
+	>=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:${WX_GTK_VER}[X]
+	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 )"
+
+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
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index e861ff9d5e59..7355c869ac99 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,5 +1,5 @@
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftp.service 278 BLAKE2B 8c0c636297d60c3d9fb8baaf9e3a9d545fbe56a6a6031c50fa202292fcf747a4c14621a8e34529617c5b3f0d1a89d5c151f1c90cc8e5f1af5d85b9c85194f3e3 SHA512 fcba0f31adf681bc67ce206dcabcd94486ecafdf96c348ec9ef3597f6f040a99e20a00db9757d5f077105e5fcb9183291585568b7edb0676ef9d522be56f6d6e
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r5.ebuild 793 BLAKE2B f10c672f92cab8e0d9df533d89af0df22276f2c6bc5d631e47ebe33a63ab1771e3c140c3237e19c3bf02ebddb602641d10cffb3bfb7a1c44ad2a3754555b446f SHA512 48c7358d8ab219b7d4e7e83592cb296228295310004881744cada2f761c3109bfa5b2e6092023749986838181cc9d5850eb8de0d77a4be3b08a07c9d786f498f
+EBUILD ftpbase-0.01-r6.ebuild 793 BLAKE2B 7bfab7ae84ab923315ad94e6c13480b43c4d4c5e67d42a3de5c28fc6e90fd84658840cd3f3014b9dbdeef945db17165602b293a3f424ea90f835ce47ea3ce407 SHA512 a58ca491c58785f87385a0737f4aeaeb0d7277c6af9d9f6c23a3f6bea70aca8b55e41f4af701602e3e2943d4ce8ca19eb2d56ff5b7107d4ce65e7b230cf4d1c8
 MISC metadata.xml 381 BLAKE2B b63d46c10dcbbf62a0f63c866f72ed9e2d720972a772bd27a258e8531f5bec4261c1f841fe684bdf2d10e9fbfc9c16eb984a928efea078b81159e19799e5220d SHA512 06ba1369d2767969f377b9fef79a1204f613f2d3642e5f847e0a42ef6fdbd65d608223ac0fed887216b8304f2b89705d2308e625725f1bad15fc15331286db09
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r6.ebuild
index bcc22c197463..47fb950fa6a2 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit pam
 
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index ee3748f210ed..1d555cdabe19 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -2,5 +2,5 @@ AUX gftp-2.0.19-desktop.patch 837 BLAKE2B a9199ab915aa43dfc9138066da05524020a443
 AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 BLAKE2B 4733b21dae4e801ac9b22c0bf460f0de23ffcc95ca184035cb19ca331e84a0deba9a8d22c8aa67b279cb3b92f9706a08bede3e374659b296598ad5297b3a0e47 SHA512 4ee09d50955fc91dea33bb71d8bd65a7c481f02c7bdf6dce53bbd630307c2ab898b533babe7597b1e434d0defdde3be6e145c0c5344d21e8a23c1537eb5f2bbf
 AUX gftp-2.0.19-glibc-2.30.patch 908 BLAKE2B 3bea073b519b2fe64571ef58a2bbb10b978ad7615ef7cbcce8448eff97db186f21153171e405181f275f73a0cfc274f9d048030da2ae18b9f5e535b93626444f SHA512 ec024c09e06874ac955b9fccae3fb95b05ecab6da186a9e28c4802dbc3f14d95d32d44dc60e7152b1560517a8971f61859aa715b7802ebe0884823112ab68fdc
 DIST gftp-2.0.19.tar.bz2 1687167 BLAKE2B b7cd5409c7dfe4672a383417554c39a848b9afa341de498eea76bd02a2099559f14d7d0ceebe13d52842c311a4b242a0d558aa017dd7062a3369a7c2c3af19a0 SHA512 59968786d66aaf6fb520f73d52ed0f8b57751a5ed222a5c65a7257628cd9addfd0ff3213206311bfd24441d7e6cc6d245d74d6687a1ad9739361da61ca078172
-EBUILD gftp-2.0.19-r3.ebuild 942 BLAKE2B 2c51f3293cea0ac7e91ac850aeaeec35f214ae69cc015d6562098b115e4405e03144c0640f2a56094564bead755a25aab828a5f29cd0b3b660adbf3804b17bd8 SHA512 db78026e23ec6ac0657c0a1fe7b754cea58cbc37a2844d1ed798883f9275239d4ebad476c501e737f5bdaa453468fa50f192b4184489cc8f1e2074d1133e661c
+EBUILD gftp-2.0.19-r3.ebuild 956 BLAKE2B c6da7f7b7be9775101f2493b19c3ba83941d3a5852086b6ced665e62443a76e34023ea9803d6a5502eec98e107953d05ab0233c0e2ab1c901f198261c704db49 SHA512 db454dca8bd2cc841f10b193ac21b71c90583ef21004acb0cb9f2853d9e389a49b7ef4ab4b02aabc6c68192d2317fc5e04ca19f3d6a7c6041494acdf3700467d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index dbc107fb71fc..8d4fab840477 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gftp.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="gtk ssl"
 
 RDEPEND="
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 3991b335c1b7..e71b68b2f700 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,5 +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-r3.ebuild 1050 BLAKE2B 5ce5712e148ff10ad2ebbcf10360336bf4891fa22f16e80ae14fa44877031fafbc4b5b7f399b5f3cf04a9ffc76e647d9a90363d36eca68eae2f94b8c2f052881 SHA512 5cedc52dc0d30a0c86f1d3c02e6042625331a2ef91d52612d7546e9d86cd3e27cb6b3b9839c5b6c7ffac0b35cff72133c61192c3c2507b5183a5b8f647a8d1e0
-EBUILD ncftp-3.2.6-r4.ebuild 1136 BLAKE2B 7ab6416c4f98975b7e676db2c81ee8824b8771239d3fded5f97eda4a68083b9a5693cc075af7f06f3dc60e0d05764fa1dbcdb021aeb4e77790c780b5089e25f3 SHA512 ee239d39d32012f7744abd1f781bafd719e01afe75fca1607d99d20578eac46ce13a89d01e13483c789ed6a880ce430d3047c92e658f35ca8c51b84c563d5540
+EBUILD ncftp-3.2.6-r4.ebuild 1137 BLAKE2B 122bbe66f3611d353bd9f0d3786953f55a1a7be641d746f121fbf6cb8c8da0f9e7ffb5c10aa46547f85ea61e1d50a4c83bc082b2c3dca1769ae1f4253ad36a33 SHA512 a744fd7ac84b8e5cdbaf10cca9955ed19c52318cb1c4cf22bc38476cb06b22098b47e68868c3d53edc66313460398bcbdd65eab1d4abdf230443f9a535a805c2
 MISC metadata.xml 901 BLAKE2B fe2e37f11f7dc951509759b8f2954b99db7296843928ad0cd5efafaa84e0e284cef9fbb584ec272b0938b3baaf84cd2702cab8c3ae4287aa5d1fe2efad57a811 SHA512 d5617d76fcda26a6ad44b5869102fca50793d59518f8095bcaf390269eb2a99448bcea37dbed0f58458f6a47958d3a2f926509347f70efee48b071c58d89a758
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r3.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r3.ebuild
deleted file mode 100644
index de6863dacda0..000000000000
--- a/net-ftp/ncftp/ncftp-3.2.6-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An extremely configurable ftp client"
-HOMEPAGE="https://www.ncftp.com/"
-SRC_URI="
-	https://ftp.mirrorservice.org/sites/ftp.${PN}.com/${PN}/${P}-src.tar.xz
-"
-
-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 ~sparc-solaris ~x86-solaris"
-IUSE="pch"
-
-DEPEND="
-	sys-libs/ncurses:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.6-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/^AR=/d' autoconf_local/aclocal.m4 || die
-
-	AT_M4DIR=autoconf_local/ eautoreconf
-}
-
-src_configure() {
-	tc-export AR CC
-	LC_ALL="C" \
-	LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		econf \
-		$(use_enable pch precomp) \
-		--disable-ccdv \
-		--disable-universal
-}
-
-src_install() {
-	default
-	dodoc README.txt doc/*.txt
-	docinto html
-	dodoc doc/html/*.html
-}
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
index ec444773157b..29fce062b84f 100644
--- a/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6-r4.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 ~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"
 IUSE="pch"
 
 DEPEND="
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index ece9758466a0..9433bbf81b99 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,5 +1,7 @@
 DIST tnftp-20141104.tar.gz 613180 BLAKE2B d9882b7793873abcd0cd00273a29adb2427ea5cdab822c744b02de08ccc88fb62a064ff42ceeec3ea20df68101a2ac5c8cb34bda8c9948078aab2f19f4206fab SHA512 e3d99215d36d27d3d841d946975c2a2723c6ca227cc7d9469f30dbc398f32bdd5c0922933dd12d9e822d7e85826a74619fb7712a6c5a97d1ee721c79d5728d55
 DIST tnftp-20151004.tar.gz 613482 BLAKE2B 3f63a4a57d11b4bfa871fdcac0de6cd4f20743f0e4e02c2b36d341c72dd12d45227ab813c59704b5da07cfed35f2e6e7777c9f34896960bc8f2acbb8ed46acbd SHA512 0702dc26c072599eebbe8731924452575eab93ab72245d4703497daa6e5e4a2c050b28278c0a20b4dbb86cee25949f216fc80a581ed73457a78c1616f484ed6e
+DIST tnftp-20210827.tar.gz 699171 BLAKE2B fe1d4f9f972f349c18e98dbc40305c867511339cb661936fbd255c4a76d9df61f1eae7e723479ef67a96dd05886a079daa4b7367d0c8768d33bc08faa743e5e8 SHA512 9b33f48e237ff49fe3cf502635b948cf7d5e20e2f38a6a429288e3f4374099ac9fb910a9e5b88de4420f1570f6f92ec1fc7ab16f0b93dfe8c6f32d11f0fc0e47
 EBUILD tnftp-20141104.ebuild 739 BLAKE2B 3b8f4756e5389f28175a3c8aa9c18fe69da00efed9d332c980c08951b43887a1d5118ca0d26bdf7b9edaadb140e42b10693d82a911c92f5fc9ca62e3bfbcd714 SHA512 3669ebb2ab0ad5375635b2dd95bac8877c9f42d2f563d46152f8c54d43b735d70a850f049b2bed3d22f5b8d460534c95de934bf8be25eae652059a4f6fca00c9
 EBUILD tnftp-20151004.ebuild 742 BLAKE2B f5c528e41a668414456e61cc7e6e0b4fea33c806e7c0cc868e022e7c52e6e3e050940597b126d2d61b8818bf51bfbdf978311e5e2bffd2ad51a4cd0978dfa6ac SHA512 391bc2f036516de650609c25a87658ba4fb4051f8991ff8b7a6308f66db3267b9b2b4937a41de930a09c5789b0cbcd363d461bce391ed8ce215541d2b3a6792d
+EBUILD tnftp-20210827.ebuild 797 BLAKE2B 51df5a31de124b51cacbd514b92cc22a5b6605dcfe5425d417b7f6645ec1c3c0f61254dd75fbb2e49813552047dcb180874519d57b63263e2304b988f1ba8132 SHA512 7ae97215cc27afbd82b30ec2a2aaee9a66a650728b48abd334974c129230f50de139f98c1ec92d88ce4094dcea56ddf9049350305f708e70a06faa12ef97aa76
 MISC metadata.xml 245 BLAKE2B 6458c0b0aca10d6fe15ed3c72599e6144d86236c49c69d8fa210ea09790b43658adadd645b98f3444fd2a097894c8b7da37de1728fbe0f1cb49f311e6a3968cb SHA512 abec8962af24666c9c0c3d373d94d951504906d03e83bfc474bd4906b7c45b731d4c711588ff4156bb526e6303715abbbe1afebb5537a76ce9b05393800a524b
diff --git a/net-ftp/tnftp/tnftp-20210827.ebuild b/net-ftp/tnftp/tnftp-20210827.ebuild
new file mode 100644
index 000000000000..ff6a5f77bfbb
--- /dev/null
+++ b/net-ftp/tnftp/tnftp-20210827.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="NetBSD FTP client with several advanced features"
+SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
+	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
+HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
+
+SLOT="0"
+LICENSE="BSD-4 BSD ISC"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 socks5 ssl"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-libs/libedit
+	socks5? ( net-proxy/dante )
+	ssl? ( dev-libs/openssl:= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog README THANKS )
+
+src_configure() {
+	econf \
+		--enable-editcomplete \
+		--without-local-libedit \
+		$(use_enable ipv6) \
+		$(use_enable ssl) \
+		$(use_with socks5 socks)
+}
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index f8ebe389432d..e10c415282f9 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -25,5 +25,5 @@ DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f
 DIST vsftpd-3.0.5.tar.gz 197778 BLAKE2B c197a070f7eef8c97ef0adc1ebb883520e7613d67ba0eabb1380b3adaae272f4ef79110e79ce4aad5ddebd6100fb059308d905203249c5445d3ea64c29dc5ec2 SHA512 9e9f9bde8c460fbc6b1d29ca531327fb2e40e336358f1cc19e1da205ef81b553719a148ad4613ceead25499d1ac3f03301a0ecd3776e5c228acccb7f9461a7ee
 EBUILD vsftpd-3.0.3-r4.ebuild 3700 BLAKE2B afd82fb42398d3ff80e3ac6caea0353be89742c79a419876d415c9eb2283ef2548fec791d945a78e2039cb66b39a7348b5e2d2b41422122032ef743c0fd1f8fb SHA512 29ee6f8547e35bad5861bc7ae2818b6f55aee69cdb909965931c698c3c05e40504b8b198869819531a223f03850d73350d03e7f7baaeccf3c2aaa74222bcc8f2
 EBUILD vsftpd-3.0.4-r1.ebuild 3691 BLAKE2B c59a4d4579e99b2e6137658b70d2f6341c4d907f6f492a0ec6e57a7090d072dde5cd0a9e5c333bad96f1fe025ff838c9f6c4f6ac737d85648bcf8480d5ba4973 SHA512 8c6b75ea2f16ed9f916194e3d2e9a266f455459c4effee22ec13c7a31324c722f3f4c7d439fead4cf507ec6860d10ade01a5e1f3c0bc8d5686dec337ca58eb3e
-EBUILD vsftpd-3.0.5-r1.ebuild 2325 BLAKE2B f6fe9c84d80997c8461d0a9877380c3592850f66f72127fc8ac5561bb8b0cfb34ec6180db18f71537fc9ec3e8847e560a1e81564a0c0fc830b1c7c81c5b740a0 SHA512 f0f5fb74c81c4c516890e8d012f5b1ad3b18f99fb1a9830469e50f1399198dd270a0c945339a84e2cdef3ee5131e08e4a706767dd03b29877ff30953b846a62e
+EBUILD vsftpd-3.0.5-r1.ebuild 2323 BLAKE2B d229314af4ed4346f968bee8ab687fb6efa8c8b94cef2140e6d881d4932dbdc17b2b5070fd52996d2eefee222513a144d6c6c51945cd33c0487bbab828f60f71 SHA512 5addbc3f78ceeb7c86ad7a6dd8543685204c63c3052dc37f32b65a13826e7134df1345506a58b7da84b68e5a23ec43db3898efeb4166ecdf96cc3670131e1ccf
 MISC metadata.xml 219 BLAKE2B 92feec299114ee9e14d6e84d01a8b845b76d520cb5c0d7ca7efcb519e0b49c63a5900724b51ec250bf48275083031b1bae2dfd3b38eb188393275eb6538f966e SHA512 d57180760f0844d3cba2a9680717aa134fc2592573c7bec1c5ef5dff1d02d5b7bedf6b3846e27b1db05aa5a519e5c1e37f70932742e083bfab2a8d8915b6df0b
diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 42443b775d2e..2c78311a5560 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="