gentoo resync : 16.04.2022

28 files changed, 84 insertions, 958 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 145e63cb55b5..06119940e44c 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/cmdftp/Manifest b/net-ftp/cmdftp/Manifest
index 8f5ce5246105..aa420fec38c9 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 425 BLAKE2B 6c87d265242ba1c41c10032d14cfe69f8442583061c4571775400d80b6faf1ebc5941af454a2c8cc05733d728ed160ba689391236f7c6380645da533e897e027 SHA512 f6b3df51a0cac100c65d5f9ad0b0755046647a1b28a03e9f07b2b66d87544cf603599a1e48f7b227af4c74671d57544e219464e910c891ec0c34fe972e75ae7e
+EBUILD cmdftp-0.9.8.ebuild 432 BLAKE2B 2388cd9dbd1de899298e14e42bdc411d85dd1263ab8621839342e51306e4da2c8148eecd42ec4a8154ef0976a7339af4b63e2788ddd3f1c14d18b422832d316a SHA512 0c39f9ca2cdcc84084b1fcf9140b1747aa11c5627b614d0e210f8d51e01c57729a2916f2a7916ea39b3eeb1877aad2d7ac5b6e40add1d6b9ac25dd1d068303af
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
index 0e11dd145c5e..c25a8815551c 100644
--- a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
+++ b/net-ftp/cmdftp/cmdftp-0.9.8.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DOCS=( NEWS README AUTHORS )
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 82e50260d5ae..d06cf0c7b555 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -10,6 +10,7 @@ DIST FileZilla_3.56.0_src.tar.bz2 4918048 BLAKE2B c671f1a2d0164f7083841d03e6e378
 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
+DIST FileZilla_3.59.0_src.tar.bz2 4946231 BLAKE2B db8651490444aed547c7e26eaa8b13a1920ba4fcf6e0343ddbc021861db44f750aa4cf537c943d895110ee2b7b2a72f17f060198d3d16a0ceaf9642db87ce50d SHA512 063de23e7b529ee7422479ebb1af00ab86a82ee25cf0e7e1e06995bf897aeeb25aab161ab202de889ea750c796a0ac1317c5a08dcb89fa1f4cbdb79caa3cbfc7
 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
@@ -18,4 +19,5 @@ EBUILD filezilla-3.56.0.ebuild 1575 BLAKE2B f28646fdfa607ddc764edd52f1e8fc857978
 EBUILD filezilla-3.56.2.ebuild 1575 BLAKE2B df0cd70ac3470ee498456100773c3fa0d1e833e3e34e41f51f93acc77b96d9a6067a0711ba53f73d10a2e5dbf6c6c2cb96a5974e5118bbf4010193452317a6b3 SHA512 830d610fc41467007cc3152443786330df0859def3fd2e2e32ae980d6d43abb0e77a9d5054e10463c5478af63ac3a139c66726b6d18536a21b2f30bcc93c5824
 EBUILD filezilla-3.57.0.ebuild 1569 BLAKE2B 25794ae1d8f270b0858a1179010501de8466750c5ccb7216b3bf31cdc712a205185ae6c8ef651f29512e0ed818749c5710c161efb798f3f2a1838b5def6ad8a4 SHA512 299d641c7b9f6e27a34f5e0802ad2524ea979707910c5f4f635da7f3840188b72415f9b0626124bb46f6b04718a5ff67087ac6a5acc2a74c45e5516b71d04665
 EBUILD filezilla-3.58.0.ebuild 1569 BLAKE2B e87b9cf181e530f9de1eceb4f22f290518a55f30887bde0f32891d688a2426b2433669f24f9f2169aaba1caf174fc2bcb8ab8f5b3b34da0a1435c14c6d6424b5 SHA512 fb59b680389bb9a09f578aa728df1d055e4808a9fb6d908ad93899ef30a23afa06133e92e4a43485d257488b22291f3ef58231269e9d50a17e815f03bd1bfe14
+EBUILD filezilla-3.59.0.ebuild 1569 BLAKE2B e87b9cf181e530f9de1eceb4f22f290518a55f30887bde0f32891d688a2426b2433669f24f9f2169aaba1caf174fc2bcb8ab8f5b3b34da0a1435c14c6d6424b5 SHA512 fb59b680389bb9a09f578aa728df1d055e4808a9fb6d908ad93899ef30a23afa06133e92e4a43485d257488b22291f3ef58231269e9d50a17e815f03bd1bfe14
 MISC metadata.xml 460 BLAKE2B 7690f57ee9bf1ea095d672904d4361d4563969d28fc61a9afbf9efaa4965eb1aee775c6555b7959fb2bd17ae80827cd84874dbc79657cd8884b96b7e6740dfe4 SHA512 4afeb15bd88c8926ff25032d2c1cfcd4915cfba862fed4f54e68b471249e03da9d487ab1c0a05350cd4a289eb5b06cab1cc597e5aeab226655405e49a1088338
diff --git a/net-ftp/filezilla/filezilla-3.59.0.ebuild b/net-ftp/filezilla/filezilla-3.59.0.ebuild
new file mode 100644
index 000000000000..b78ee06bceba
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.59.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/ftp/Manifest b/net-ftp/ftp/Manifest
index 5c616b99c18a..a9727eb1a897 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,5 +1,5 @@
 DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5 SHA512 083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d SHA512 6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718
-EBUILD ftp-0.17.34.0.2.5.1.ebuild 1500 BLAKE2B f5bf5def80db031f48d9abbe0d003dbb931b264e43733c805b9ced619369cb4f27a6f32e27fee124f46a68bcb95654e7bf929001bea8fa5fb532a084884e4f90 SHA512 d8d09c710b516097d77b1159ac80cb24ded127eca81e8cc1b0bedcba225c4cc8538982d231d8366a375a36043421b49731561e3cc3a213e0a8aceb4478d7cfb8
+EBUILD ftp-0.17.34.0.2.5.1.ebuild 1507 BLAKE2B 11473a162ef03ae30414308b40edcc55e9a9e6aa5ed78c07caca0630f9e89f545a571c36b27a3f8f43962e720b7d7b7404e0283d7278c9e9bb2e0389eae4b77b SHA512 6656ced60a327119cdaf7c82558b9a892a0217e03ef4d50d609089cb46f69dfe8b5e8c0c1462b036d4807464fa6fd2557cce9e1fa269211812c9e14a59a2308f
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index d722a0bce751..a25ce7b145e0 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.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
@@ -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 ~riscv ~s390 sparc x86"
 IUSE="ipv6 readline ssl"
 
 RDEPEND="
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index ef7a31a213bf..b2d46146327c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -30,4 +30,4 @@ EBUILD proftpd-1.3.7b-r2.ebuild 8592 BLAKE2B 10f54080274f391a72ad06219d017c7aacc
 EBUILD proftpd-1.3.7c-r1.ebuild 8586 BLAKE2B d997f82ee97cda8a41cbaf354774e8299b6e304523bf551f8d243a81ab9b41912313c7320cd477cb1d2d1d439db00d37d12406394e6c12331733b292ac25f0fa SHA512 0b4e695957d8ffc803d01cdc73e6e4e8201e93376d7e76e967df2bdda06739bce058405a0461888b851cf0f5a8453e865c6969421032a91ebe2d8b755d6f39e9
 EBUILD proftpd-1.3.8_rc1-r3.ebuild 8549 BLAKE2B 3b01e038d93ad6cd7851e980d7b81b7252e661dbf59161a2df40cc69dc2d03faac2352ed239f1ad707a25f978a06ebacce25398cd67b189d6a52f386ae8a3581 SHA512 4957afbfec8e0afd677d1b0cdd1accee0bcb97f8e08b738766ad76e44394492913e8fea98538555c1894d300f6c32b57b394501fe35bc06f8376ae75f9250780
 EBUILD proftpd-1.3.8_rc2-r2.ebuild 8543 BLAKE2B f67f093117544e4471b3c293772a451de1cf01b23e3b2b2508b3f1393b97cec9d1fd8feaef18fa92b80de30191793ff31d279d60f5c81c4980cd40895843431a SHA512 21aecc2e5c423ba4deaa3be26683906108190438781b2a66b9fbf2540da0c3e0433f9c86a74b690b7b3be43c778220e25f5888d4c3e7128bdb05d992079d8423
-MISC metadata.xml 2890 BLAKE2B 8d8df910c291d064a62eab80f05ba0524fbfc777eae7a0dc65809bd01eccc23f356dbbe4a1af4df43f2d83d964370cd38eb40421c7851dd130aefc5011eb6722 SHA512 99679d7d9c8ed947aa736e79da5031fccf4555a558ea8891b059f4a2989037e6a266a197d5e168f7a9c4d787f8dafb53277bcd4418532d91d8f089e3e56a57c9
+MISC metadata.xml 2878 BLAKE2B ae5adc72367a39976876cd318cb5bad39b56e47794a8333d96d3140f5df02c1b14b3c9ff539a4881b607285783c8a9a0aa6e317c0b2b87cf9a6d4ca1dbb59230 SHA512 0fab9c309a539e3c97bb47ef1e3624f47588e81f057c9fc4aabaea48b321264eaea6443eef2235b7fc43ab5866d35e95bdf39bc630ae69894e7b856b787207f8
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 8b0715aefd77..21976ea2f9ed 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -39,6 +39,6 @@ server.</longdescription>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">gssmod</remote-id>
-		<remote-id type="github">Castaglia/proftpd-mod_vroot</remote-id>
+		<remote-id type="github">proftpd/proftpd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 9433bbf81b99..f0b4f6ca5bbd 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,7 +1,3 @@
-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
+EBUILD tnftp-20210827.ebuild 827 BLAKE2B 11d07e0873d7539687576b4b95a301fba6257e5ebedf61b123b93ff82802a39481b84234717dfca40c00ef54daefab7f737fe1e6bc517e0488d2d08a7ff6f683 SHA512 a525852f56618fe4bc67cd72e7259a1716c4a530e848e382300d8b198b03f2105f546c4e4f44c72b45e93abd259f462c6b1e4eb75980e3a6b119392551e70e33
 MISC metadata.xml 245 BLAKE2B 6458c0b0aca10d6fe15ed3c72599e6144d86236c49c69d8fa210ea09790b43658adadd645b98f3444fd2a097894c8b7da37de1728fbe0f1cb49f311e6a3968cb SHA512 abec8962af24666c9c0c3d373d94d951504906d03e83bfc474bd4906b7c45b731d4c711588ff4156bb526e6303715abbbe1afebb5537a76ce9b05393800a524b
diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild
deleted file mode 100644
index c83cf2e1b931..000000000000
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	socks5? ( net-proxy/dante )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-editcomplete \
-		$(use_enable ipv6) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog README THANKS
-}
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
deleted file mode 100644
index a6e7d8ae08d3..000000000000
--- a/net-ftp/tnftp/tnftp-20151004.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	socks5? ( net-proxy/dante )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-editcomplete \
-		$(use_enable ipv6) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog README THANKS
-}
diff --git a/net-ftp/tnftp/tnftp-20210827.ebuild b/net-ftp/tnftp/tnftp-20210827.ebuild
index ff6a5f77bfbb..0c915cffcf44 100644
--- a/net-ftp/tnftp/tnftp-20210827.ebuild
+++ b/net-ftp/tnftp/tnftp-20210827.ebuild
@@ -10,8 +10,9 @@ 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"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 socks5 ssl"
+REQUIRED_USE="socks5? ( !ipv6 )"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	dev-libs/libedit
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index e10c415282f9..57f7b6a4ab39 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,29 +1,13 @@
-AUX vsftpd-2.1.0-caps.patch 575 BLAKE2B 14054434d98e0904aec7f872cbd8d5ad367e5c29da0309629e6f603b79b1c9e4c1a20c1a73b6dc8d98a60d7844ce828c7a72ddc195e5664c8dd6bc6045af47cd SHA512 aeb407d9d0cf3940bc0fb1ef76c23cd19f68293e64d8a6a64e2a271b624a237fa3721b6a3476d59f0c6fabf69a418f9577fde351aba0e9aa96dc1362c02e1524
-AUX vsftpd-2.2.0-dont-link-caps.patch 806 BLAKE2B e843ffdfeda282415e186bca706f68b2f6ab9f460a14ad6053a71b70404098d3b27dff860981cc499f80325b4d004c9dfde212f1cd56390af4337afee21766e1 SHA512 b162f3afcc135bdecea63ef24a1f321e6723a1218a96a8897b3db67338f5cdceb6178c7cd0a155dee80af3e7b9198610562de7cff6986e7dfc93df79b5ee501c
 AUX vsftpd-2.3.2-kerberos.patch 842 BLAKE2B 6dbe5c401014d2ef9f4f61b7a27fb337a030fc054e8542382d0df0394e51d1ab4d820943f439af09cb518fe2fac8b9445488c184d31188154a394d7b294e5f34 SHA512 94c743b4f78f41aba4427b6e75b8d85d57a1eec6eb89e0ca93f47c0e5ccdb31a80eb28cfeb3c50cce5cbf5909646150aec762d8b250650dcfbaa6ad190271af8
-AUX vsftpd-2.3.5-gentoo.patch 8560 BLAKE2B 9fbaef148e1feadd7dbebc1a7eb04f5916cc50b987aa6f7e6148c432c4ff7106386f77bc90d6da9ba5b92b81b3c20b7b72b09f43ba71a4bc1a8467d8e1bf552a SHA512 dbe8a022b9dd4bfdf5c0138aa0ad13311d4a52e7671888fc2018992e7906c2aab53355d2ab24cc4e1f19c358a5202eb9965bf3ca9180d6b9d369d451c7c656b3
-AUX vsftpd-3.0.0-Makefile.patch 1093 BLAKE2B 90f842b4da91253f2d95b256fdda1aff82ecbd2e1f1c38e33cf932aa4fe61acbb61e7e5507b178f3ffbf41b315f90dc0ec1b5eab41d3f8f29dcee15e21df6085 SHA512 66217e5be8e5a7b819c0a38ee8ac9e84ea5937c7285843d1de5b8361211ea86816551b440bf9d5c89c9f874e867c9f50590a2e8a50dbd313fcde1d5d4ea6ab4e
 AUX vsftpd-3.0.2-alpha.patch 525 BLAKE2B 8d3e0ce8a6cd79862ae0071ab61f1bd9db5a69481eb782bc1f53e9be08ad670e98b72b698cae1ce26744b8250d58298476c012fe3a73105c5eb4edb060b12984 SHA512 5d9639bf7fa08bfce5cbbc79c59445e099c42adec6dc1a3e14e6a9586c53a082e0c712625a3de62418fd0f0bd253b6b673a700157be07ab114770707739a6c38
-AUX vsftpd-3.0.2-remove-legacy-cap.patch 1739 BLAKE2B ee1d4461ec1ca783a2f704797f504f40f6fbde93707e27044031d03a67e105ecf02be524b1c60bc3ee5ec1624403adab4362637c120de6336aab76a3bf4397a8 SHA512 b0c2b91f0ba3b73706c352ac391e35b048b544fbab1ab3cd223be7f5ca33516143a775456871ded354a05bf74f0403436f4659d06ae9345e8d6a6d1b21addd42
 AUX vsftpd-3.0.3-sparc.patch 462 BLAKE2B bb63dab9f38ba46aa622a1cbacd4d42c1e24a6e413b57e2c47d98235f4fc99684b42ee2a729d12b4e11c14ca063aa51afae25fcbfa9c01b8ab8733801470d397 SHA512 6bbee5674969d6ea356722196cb54c4b8f5da5802b05af560595b0cc48b63af6666ecb58cff085f5a77a95eb8c03590e7406fadf5e38cbce8354e6df66c989cf
-AUX vsftpd-3.0.4-dont-link-caps.patch 592 BLAKE2B 2ffb1c375c4869acdb24a89d245104d5b8407f143dd7a4820776b583e914e99891305c03904f6dfee7dd88941940065864d104a17ae3038a713092726c636d62 SHA512 2cb131c8879462047d7ec9348424fbdb0536c783e9047d2a43b8c011b82aa54c57c0aa20caf4aeb50862bfdce31930c79beb5afc1bb0ffa6f47abf7027795ac1
 AUX vsftpd-3.0.5-seccomp.patch 657 BLAKE2B 087294e1693eae62bd652674ac40c656aff539d4586321c09670c9c6cd158ba791b831f87124156e18526f01bcbb90297e6f37f16d95107d6e58b2a6f58504e7 SHA512 f619653d0f764149ffffe6b6dc376b52b42c88fb18d168085b49986159e623dcaf20b51cacf3449db956e8e39414f908102b7451ea10ae02669601956ea93328
-AUX vsftpd-checkconfig.sh 785 BLAKE2B c856a268dbfbcda6bbae38fcf444b1c64986c32d426c890bd67da15c65ecb9082b76f4f8382534f519d6d1c34d50cd5d9bd917f41e5e393af68483b666eb4ebf SHA512 541702557231c79413ae77cf26c28398fea3cb332375f8d22e0c0a45706b04db954d268addd76fecbb8b0ab3109f1009c18b0599394ed33c4a6fc8dc647d889e
-AUX vsftpd-disable-seccomp-sandbox.patch 362 BLAKE2B 47aeb759113e6c6c401c6e135d742f06435490a51bad1a3b72778c60ed5a6ccbb4ea6ab3eeb87948b7658bcf539c277bc75674284474f05d0c4b76e9690c5cb7 SHA512 efa4529a30dc306c190840f47b0e7c4f99321e6d83254015a98018d287c7e624a2472effdd7e7fa1e11a25ca00e876539fd4bc63dc6b0d859c065a7c48e2b0ac
-AUX vsftpd.conf 3733 BLAKE2B 17b92df3ffebd556a9a8e6b7d5ee819528e29615c270afbac82694c31dc8ebb86e844780e49f84fdedfe84a70c6ace998969c026b9ff8aa1ddac27ecd60cd665 SHA512 417b2ebdffe41073d7ee8a1f414ba5bfe4b15411e37b99444443c240fa540c97b0c247f9151ef306f84775dd78370f5985121417267bf25a76f87d259d843719
-AUX vsftpd.init 1319 BLAKE2B 8fd753979e553aa88aefb80e20e65602c8d96fbfdd727a4b375e873315aa24da204900786966846105dc17166aff70f7a8a1b2f4dae8a9cb82897db00a1122c4 SHA512 b367c412f2aebdfa90fae912467ebf227b39be04b45f686c5ea5f66df6addc81a2f130dd616dae932a55108337169e19ef53012f27127eb1970852ed5ea697c0
 AUX vsftpd.init-3.0.5 409 BLAKE2B 021c15a42472c7ce055f95fe9d81dd28c7f551a10eb6d3f838fd29006502b9dbd236635800788a80f9a7fee4cca7448a9802437daa34c8c1bca4e4e84e98b540 SHA512 4ba1fce992886726a39e54f39de60837781201bcd171f7a1c7d62e4bbe68b0c6c4dc2a4176dcb069d67cec7bd1e209310bb75849b89144619ac652b81940ae3f
 AUX vsftpd.logrotate 54 BLAKE2B fcf5395a656ce427c48f806c01d967af06e9f1f795f2af85c51951db59b4fa30209c2211bc1dd44f2cc8a45911531c87d45ea277b722a0c036ed3a99494fd285 SHA512 cee63caaf5e3db620e57132dc1a531cfd39ce790ac64e22b649cf3fac8b825cf188425bdf19cd376aa3f31ea114c8889ee307b6e7f9a2cbd155324f64084d5fc
-AUX vsftpd.service 218 BLAKE2B 1e09f0e822616ee2ef01e1de6777907dfa6141ef6b09bb995b916d7ba51f77bd9cbfc261687165cbc2ce47e5f326200e8fd9684e40880b54ccdd37c202b242af SHA512 f032f64ed5fab15b1c9543579090cdca007d0a759073e7c4aa0f0ef0f852f6787610f776ce63d0d922ccfbadd480df81ed9a62e6e0f399327d770f9b70c34df9
 AUX vsftpd.service-3.0.5 151 BLAKE2B 7cec27497c121f57321322347109883d074548973b2e90a0f748082ffcab7b0c2da9682af36364b43923acc3b14ece7294e1bd2a9f924a5da39c8457b1d6091b SHA512 d00dda23f99c0eb18976cd5c2a3cd261721a7d4992f6558d6bc79ab22f4ebdfeb2b423761f106efd288d3b9db171479dda51d65b1c23b7f3a522c206f9e93329
 AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba9dc10100419855ca7b988d750764eecc5713e3f2af80030a7892712acbb0562d52809e706b7ff2 SHA512 4c56607dde0ccc4773edf905c1d52b66fff774e6aa8b20a23f9443a04838a9ad8a1df535a0bb27660e9a4528d1d7c90b53fd6dd1fa3d4862e87ed06a1a8a87b7
 AUX vsftpd.xinetd 284 BLAKE2B 4285c817a156dc01b846c9811f356ab892a24482dd441f2708f6bfb4316ba5af18f792ae6fed85da829a6f2b07d1faa29bfe7c338e615b11e471925c954294d9 SHA512 27d2be36587dd89507d734cc267bb60eb62f33aea7766d1034806d4d8d1f832fb498a213791d18a57ff43c7a9a56864c36640b5520cb07f59cac6d0146828f52
-AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
 AUX vsftpd_at.service-3.0.5 125 BLAKE2B 6c4a3fca5f73d0df5df8d2b59af3c50226f8701f74cfc5ecc72b451e87798f446d64c97e4db58d7c154946501fa488407ef12cc471beb66c96e9a0ce9240b681 SHA512 f94fb5fef72d31015cd8e7d3625788a0f1a57544f851bbaa0377c5208a6d2b64140dea0f2c1c49594ca9965ac77ed6edefb538648c918d931b17303e4bbb4b48
-DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f38cdb63033804c72d7482666f7e1a400777e2cff4170f0999d79f9d384339ade3ad48f2a7567b2e684e48817 SHA512 a4c3b28ef7bd762dcfe53f5c9b68fc1bb371d2eb61dc88038959cc9f5efba8cc2c45a15956a7fddbac3b1ce03d8555df8fb7b86300e273a78e632f3dac15c2e3
 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 2323 BLAKE2B d229314af4ed4346f968bee8ab687fb6efa8c8b94cef2140e6d881d4932dbdc17b2b5070fd52996d2eefee222513a144d6c6c51945cd33c0487bbab828f60f71 SHA512 5addbc3f78ceeb7c86ad7a6dd8543685204c63c3052dc37f32b65a13826e7134df1345506a58b7da84b68e5a23ec43db3898efeb4166ecdf96cc3670131e1ccf
 MISC metadata.xml 219 BLAKE2B 92feec299114ee9e14d6e84d01a8b845b76d520cb5c0d7ca7efcb519e0b49c63a5900724b51ec250bf48275083031b1bae2dfd3b38eb188393275eb6538f966e SHA512 d57180760f0844d3cba2a9680717aa134fc2592573c7bec1c5ef5dff1d02d5b7bedf6b3846e27b1db05aa5a519e5c1e37f70932742e083bfab2a8d8915b6df0b
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch
deleted file mode 100644
index bd29762e9f48..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur vsftpd-2.1.0.orig/sysdeputil.c vsftpd-2.1.0/sysdeputil.c
---- vsftpd-2.1.0.orig/sysdeputil.c	2009-02-23 18:23:26.000000000 +0100
-+++ vsftpd-2.1.0/sysdeputil.c	2009-02-23 18:23:51.000000000 +0100
-@@ -160,10 +160,8 @@
- #include <sys/capability.h>
- 
- #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP)
--#include <linux/unistd.h>
- #include <linux/capability.h>
--#include <errno.h>
--#include <syscall.h>
-+#include <sys/syscall.h>
- int capset(cap_user_header_t header, const cap_user_data_t data)
- {
-   return syscall(__NR_capset, header, data);
diff --git a/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
deleted file mode 100644
index debcf06279e3..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur vsftpd-2.2.0.orig/vsf_findlibs.sh vsftpd-2.2.0/vsf_findlibs.sh
---- vsftpd-2.2.0.orig/vsf_findlibs.sh	2009-08-23 22:15:39.000000000 -0700
-+++ vsftpd-2.2.0/vsf_findlibs.sh	2009-08-23 22:16:31.000000000 -0700
-@@ -44,17 +44,6 @@
- # For older HP-UX...
- locate_library /usr/lib/libsec.sl && echo "-lsec";
- 
--# Look for libcap (capabilities)
--if locate_library /lib/libcap.so.1; then
--  echo "/lib/libcap.so.1";
--elif locate_library /lib/libcap.so.2; then
--  echo "/lib/libcap.so.2";
--else
--  locate_library /usr/lib/libcap.so && echo "-lcap";
--  locate_library /lib/libcap.so && echo "-lcap";
--  locate_library /lib64/libcap.so && echo "-lcap";
--fi
--
- # Solaris needs this for nanosleep()..
- locate_library /lib/libposix4.so && echo "-lposix4";
- locate_library /usr/lib/libposix4.so && echo "-lposix4";
diff --git a/net-ftp/vsftpd/files/vsftpd-2.3.5-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.3.5-gentoo.patch
deleted file mode 100644
index 7f1af4beb8c7..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.3.5-gentoo.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-Index: vsftpd-2.3.5/defs.h
-===================================================================
---- vsftpd-2.3.5.orig/defs.h
-+++ vsftpd-2.3.5/defs.h
-@@ -1,7 +1,7 @@
- #ifndef VSF_DEFS_H
- #define VSF_DEFS_H
- 
--#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd.conf"
-+#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd/vsftpd.conf"
- 
- #define VSFTP_COMMAND_FD        0
- 
-Index: vsftpd-2.3.5/tunables.c
-===================================================================
---- vsftpd-2.3.5.orig/tunables.c
-+++ vsftpd-2.3.5/tunables.c
-@@ -250,7 +250,7 @@ tunables_load_defaults()
-   /* -rw------- */
-   tunable_chown_upload_mode = 0600;
- 
--  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
-+  install_str_setting("/usr/share/vsftpd/empty", &tunable_secure_chroot_dir);
-   install_str_setting("ftp", &tunable_ftp_username);
-   install_str_setting("root", &tunable_chown_username);
-   install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
-@@ -258,11 +258,11 @@ tunables_load_defaults()
-   install_str_setting(".message", &tunable_message_file);
-   install_str_setting("nobody", &tunable_nopriv_user);
-   install_str_setting(0, &tunable_ftpd_banner);
--  install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file);
--  install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file);
-+  install_str_setting("/etc/vsftpd/vsftpd.banned_emails", &tunable_banned_email_file);
-+  install_str_setting("/etc/vsftpd/vsftpd.chroot_list", &tunable_chroot_list_file);
-   install_str_setting("ftp", &tunable_pam_service_name);
-   install_str_setting("ftp", &tunable_guest_username);
--  install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file);
-+  install_str_setting("/etc/vsftpd/vsftpd.user_list", &tunable_userlist_file);
-   install_str_setting(0, &tunable_anon_root);
-   install_str_setting(0, &tunable_local_root);
-   install_str_setting(0, &tunable_banner_file);
-@@ -275,7 +275,7 @@ tunables_load_defaults()
-   install_str_setting(0, &tunable_hide_file);
-   install_str_setting(0, &tunable_deny_file);
-   install_str_setting(0, &tunable_user_sub_token);
--  install_str_setting("/etc/vsftpd.email_passwords",
-+  install_str_setting("/etc/vsftpd/vsftpd.email_passwords",
-                       &tunable_email_password_file);
-   install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
-                       &tunable_rsa_cert_file);
-Index: vsftpd-2.3.5/vsftpd.8
-===================================================================
---- vsftpd-2.3.5.orig/vsftpd.8
-+++ vsftpd-2.3.5/vsftpd.8
-@@ -21,7 +21,7 @@ itself will listen on the network. This
- recommended. It is activated by setting
- .Pa listen=YES
- in
--.Pa /etc/vsftpd.conf .
-+.Pa /etc/vsftpd/vsftpd.conf .
- Direct execution of the
- .Nm vsftpd
- binary will then launch the FTP service ready for immediate client connections.
-@@ -33,7 +33,7 @@ as root. Any command line option not sta
- as a config file that will be loaded. Note that config files are loaded in the
- strict order that they are encountered on the command line.
- If no config files are specified, the default configuration file of
--.Pa /etc/vsftpd.conf
-+.Pa /etc/vsftpd/vsftpd.conf
- will be loaded, after all other command line options are processed.
- .Pp
- Supported options are:
-@@ -47,14 +47,14 @@ their appearance on the command line, in
- config files.
- .El
- .Sh EXAMPLES
--vsftpd -olisten=NO /etc/vsftpd.conf -oftpd_banner=blah
-+vsftpd -olisten=NO /etc/vsftpd/vsftpd.conf -oftpd_banner=blah
- .Pp
- That example overrides vsftpd's built-in default for the "listen" option to be
--NO, but then loads /etc/vsftpd.conf which may override that setting. Finally,
-+NO, but then loads /etc/vsftpd/vsftpd.conf which may override that setting. Finally,
- the "ftpd_banner" setting is set to "blah", which overrides any default vsftpd
- setting and any identical setting that was in the config file.
- .Sh FILES
--.Pa /etc/vsftpd.conf
-+.Pa /etc/vsftpd/vsftpd.conf
- .Sh SEE ALSO
- .Xr vsftpd.conf 5
- .end
-Index: vsftpd-2.3.5/vsftpd.conf
-===================================================================
---- vsftpd-2.3.5.orig/vsftpd.conf
-+++ vsftpd-2.3.5/vsftpd.conf
-@@ -1,4 +1,4 @@
--# Example config file /etc/vsftpd.conf
-+# Example config file /etc/vsftpd/vsftpd.conf
- #
- # The default compiled in settings are fairly paranoid. This sample file
- # loosens things up a bit, to make the ftp daemon more usable.
-@@ -87,7 +87,7 @@ connect_from_port_20=YES
- # useful for combatting certain DoS attacks.
- #deny_email_enable=YES
- # (default follows)
--#banned_email_file=/etc/vsftpd.banned_emails
-+#banned_email_file=/etc/vsftpd/vsftpd.banned_emails
- #
- # You may specify an explicit list of local users to chroot() to their home
- # directory. If chroot_local_user is YES, then this list becomes a list of
-@@ -98,7 +98,7 @@ connect_from_port_20=YES
- #chroot_local_user=YES
- #chroot_list_enable=YES
- # (default follows)
--#chroot_list_file=/etc/vsftpd.chroot_list
-+#chroot_list_file=/etc/vsftpd/vsftpd.chroot_list
- #
- # You may activate the "-R" option to the builtin ls. This is disabled by
- # default to avoid remote users being able to cause excessive I/O on large
-Index: vsftpd-2.3.5/vsftpd.conf.5
-===================================================================
---- vsftpd-2.3.5.orig/vsftpd.conf.5
-+++ vsftpd-2.3.5/vsftpd.conf.5
-@@ -4,7 +4,7 @@ vsftpd.conf \- config file for vsftpd
- .SH DESCRIPTION
- vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
- default, vsftpd looks for this file at the location
--.BR /etc/vsftpd.conf .
-+.BR /etc/vsftpd/vsftpd.conf .
- However, you may override this by specifying a command line argument to
- vsftpd. The command line argument is the pathname of the configuration file
- for vsftpd. This behaviour is useful because you may wish to use an advanced
-@@ -138,7 +138,7 @@ chroot() jail in their home directory up
- different if chroot_local_user is set to YES. In this case, the list becomes
- a list of users which are NOT to be placed in a chroot() jail.
- By default, the file containing this list is
--/etc/vsftpd.chroot_list, but you may override this with the
-+/etc/vsftpd/vsftpd.chroot_list, but you may override this with the
- .BR chroot_list_file
- setting.
- 
-@@ -177,7 +177,7 @@ Default: NO
- .B deny_email_enable
- If activated, you may provide a list of anonymous password e-mail responses
- which cause login to be denied. By default, the file containing this list is
--/etc/vsftpd.banned_emails, but you may override this with the
-+/etc/vsftpd/vsftpd.banned_emails, but you may override this with the
- .BR banned_email_file
- setting.
- 
-@@ -433,7 +433,7 @@ anonymous logins are prevented unless th
- file specified by the
- .BR email_password_file
- setting. The file format is one password per line, no extra whitespace. The
--default filename is /etc/vsftpd.email_passwords.
-+default filename is /etc/vsftpd/vsftpd.email_passwords.
- 
- Default: NO
- .TP
-@@ -764,7 +764,7 @@ passwords which are not permitted. This
- .BR deny_email_enable
- is enabled.
- 
--Default: /etc/vsftpd.banned_emails
-+Default: /etc/vsftpd/vsftpd.banned_emails
- .TP
- .B banner_file
- This option is the name of a file containing text to display when someone
-@@ -803,7 +803,7 @@ is enabled. If the option
- is enabled, then the list file becomes a list of users to NOT place in a
- chroot() jail.
- 
--Default: /etc/vsftpd.chroot_list
-+Default: /etc/vsftpd/vsftpd.chroot_list
- .TP
- .B cmds_allowed
- This options specifies a comma separated list of allowed FTP commands (post
-@@ -864,7 +864,7 @@ This option can be used to provide an al
- .BR secure_email_list_enable
- setting.
- 
--Default: /etc/vsftpd.email_passwords
-+Default: /etc/vsftpd/vsftpd.email_passwords
- .TP
- .B ftp_username
- This is the name of the user we use for handling anonymous FTP. The home
-@@ -987,10 +987,10 @@ the manual page, on a per-user basis. Us
- with an example. If you set
- .BR user_config_dir
- to be
--.BR /etc/vsftpd_user_conf
-+.BR /etc/vsftpd/vsftpd_user_conf
- and then log on as the user "chris", then vsftpd will apply the settings in
- the file
--.BR /etc/vsftpd_user_conf/chris
-+.BR /etc/vsftpd/vsftpd_user_conf/chris
- for the duration of the session. The format of this file is as detailed in
- this manual page! PLEASE NOTE that not all settings are effective on a
- per-user basis. For example, many settings only prior to the user's session
-@@ -1026,7 +1026,7 @@ This option is the name of the file load
- .BR userlist_enable
- option is active.
- 
--Default: /etc/vsftpd.user_list
-+Default: /etc/vsftpd/vsftpd.user_list
- .TP
- .B vsftpd_log_file
- This option is the name of the file to which we write the vsftpd style
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch b/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch
deleted file mode 100644
index 5df3b03f3fa9..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: vsftpd-3.0.0/Makefile
-===================================================================
---- vsftpd-3.0.0.orig/Makefile
-+++ vsftpd-3.0.0/Makefile
-@@ -1,16 +1,16 @@
- # Makefile for systems with GNU tools
--CC 	=	gcc
-+CC 	?=	gcc
- INSTALL	=	install
- IFLAGS  = -idirafter dummyinc
- #CFLAGS = -g
--CFLAGS	=	-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
--	-Wall -W -Wshadow -Werror -Wformat-security \
-+CFLAGS	+=	-fPIE -fstack-protector --param=ssp-buffer-size=4 \
-+	-Wall -W -Wshadow -Wformat-security \
- 	-D_FORTIFY_SOURCE=2 \
- 	#-pedantic -Wconversion
- 
- LIBS	=	`./vsf_findlibs.sh`
- LINK	=	
--LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
-+LDFLAGS +=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
- 
- OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
- 		tunables.o ftpdataio.o secbuf.o ls.o \
-@@ -26,7 +26,7 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
- 	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
- 
- vsftpd: $(OBJS) 
--	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
-+	$(CC) -o vsftpd $(LDFLAGS) $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
- 
- install:
- 	if [ -x /usr/local/sbin ]; then \
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch b/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch
deleted file mode 100644
index 2401f37c7e88..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=450536
-Patch by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
-
-Probe the preferred version
---- vsftpd-3.0.2/sysdeputil.c.org       2013-01-05 18:32:13.241288839 +0100
-+++ vsftpd-3.0.2/sysdeputil.c   2013-01-05 19:41:53.038148078 +0100
-@@ -561,11 +561,17 @@
- }
-
-   #ifndef VSF_SYSDEP_HAVE_LIBCAP
-+static struct __user_cap_header_struct sys_cap_head;
- static int
- do_checkcap(void)
- {
-+  int retval;
-+
-+  /* Store preferred version in sys_cap_head */
-+  vsf_sysutil_memclr(&sys_cap_head, sizeof(sys_cap_head));
-   /* EFAULT (EINVAL if page 0 mapped) vs. ENOSYS */
--  int retval = capset(0, 0);
-+  retval = capset(&sys_cap_head, 0);
-+
-   if (!vsf_sysutil_retval_is_error(retval) ||
-       vsf_sysutil_get_error() != kVSFSysUtilErrNOSYS)
-   {
-@@ -579,17 +585,13 @@
- {
-   /* n.b. yes I know I should be using libcap!! */
-   int retval;
--  struct __user_cap_header_struct cap_head;
--  struct __user_cap_data_struct cap_data;
-+  struct __user_cap_data_struct cap_data[2];
-   __u32 cap_mask = 0;
-   if (!caps)
-   {
-     bug("asked to adopt no capabilities");
-   }
--  vsf_sysutil_memclr(&cap_head, sizeof(cap_head));
-   vsf_sysutil_memclr(&cap_data, sizeof(cap_data));
--  cap_head.version = _LINUX_CAPABILITY_VERSION;
--  cap_head.pid = 0;
-   if (caps & kCapabilityCAP_CHOWN)
-   {
-     cap_mask |= (1 << CAP_CHOWN);
-@@ -598,9 +600,9 @@
-   {
-     cap_mask |= (1 << CAP_NET_BIND_SERVICE);
-   }
--  cap_data.effective = cap_data.permitted = cap_mask;
--  cap_data.inheritable = 0;
--  retval = capset(&cap_head, &cap_data);
-+  cap_data[0].effective = cap_data[0].permitted = cap_mask;
-+  cap_data[0].inheritable = 0;
-+  retval = capset(&sys_cap_head, &cap_data[0]);
-   if (retval != 0)
-   {
-     die("capset");
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch
deleted file mode 100644
index 75e0e3e7cfd3..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/vsf_findlibs.sh
-+++ b/vsf_findlibs.sh
-@@ -47,14 +47,6 @@
- # For older HP-UX...
- locate_library /usr/lib/libsec.sl && echo "-lsec";
- 
--# Look for libcap (capabilities)
--# Note that link may fail with:
--# /usr/bin/ld: cannot find -lcap
--# If the libcap-devel package isn't installed.
--locate_library /usr/lib/libcap.so && echo "-lcap";
--locate_library /lib/libcap.so && echo "-lcap";
--locate_library /lib64/libcap.so && echo "-lcap";
--
- # Solaris needs this for nanosleep()..
- locate_library /lib/libposix4.so && echo "-lposix4";
- locate_library /usr/lib/libposix4.so && echo "-lposix4";
diff --git a/net-ftp/vsftpd/files/vsftpd-checkconfig.sh b/net-ftp/vsftpd/files/vsftpd-checkconfig.sh
deleted file mode 100644
index e1d1e5231b67..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-checkconfig.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-VSFTPD_CONF="${VSFTPD_CONF:-/etc/vsftpd/vsftpd.conf}"
-
-if [ ! -e ${VSFTPD_CONF} ] ; then
-	echo "Please setup ${VSFTPD_CONF} before starting vsftpd" >&2
-	echo "There are sample configurations in /usr/share/doc/vsftpd" >&2
-	exit 1
-fi
-
-if egrep -iq "^ *background *= *yes" "${VSFTPD_CONF}" ; then
-	echo "${VSFTPD_CONF} must not set background=YES" >&2
-	exit 1
-fi
-
-has_ip=false has_ipv6=false ip_error=true
-egrep -iq "^ *listen *= *yes" "${VSFTPD_CONF}" && has_ip=true
-egrep -iq "^ *listen_ipv6 *= *yes" "${VSFTPD_CONF}" && has_ipv6=true
-if ${has_ip} && ! ${has_ipv6} ; then
-	ip_error=false
-elif ! ${has_ip} && ${has_ipv6} ; then
-	ip_error=false
-fi
-if ${ip_error} ; then
-	echo "${VSFTPD_CONF} must contain listen=YES or listen_ipv6=YES" >&2
-	echo "but not both" >&2
-	exit 1
-fi
-
diff --git a/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch b/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
deleted file mode 100644
index 10266e36a87e..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Disable buggy seccomp sandbox code by default
-
-Bug: https://bugs.gentoo.org/443898
-
---- a/tunables.c
-+++ b/tunables.c
-@@ -226,7 +226,7 @@
-   tunable_isolate_network = 1;
-   tunable_ftp_enable = 1;
-   tunable_http_enable = 0;
--  tunable_seccomp_sandbox = 1;
-+  tunable_seccomp_sandbox = 0;
-   tunable_allow_writeable_chroot = 0;
- 
-   tunable_accept_timeout = 60;
diff --git a/net-ftp/vsftpd/files/vsftpd.conf b/net-ftp/vsftpd/files/vsftpd.conf
deleted file mode 100644
index 3f2658e772ab..000000000000
--- a/net-ftp/vsftpd/files/vsftpd.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Example vsftpd config file
-#
-# See man 5 vsftpd.conf for more information.
-#
-
-# Enable vsftpd to run as a standalone daemon
-# Comment these two out to run under inetd or xinetd
-background=YES
-listen=YES
-
-# Allow anonymous FTP?
-anonymous_enable=YES
-
-# Uncomment this to allow local users to log in.
-#local_enable=YES
-
-# Uncomment this to enable any form of FTP write command.
-#write_enable=YES
-
-# Default umask for local users is 077. You may wish to change this to 022,
-# if your users expect that (022 is used by most other ftpd's)
-#local_umask=022
-
-# Uncomment this to allow the anonymous FTP user to upload files. This only
-# has an effect if the above global write enable is activated. Also, you will
-# obviously need to create a directory writable by the FTP user.
-#anon_upload_enable=YES
-
-# Uncomment this if you want the anonymous FTP user to be able to create
-# new directories.
-#anon_mkdir_write_enable=YES
-
-# Activate directory messages - messages given to remote users when they
-# go into a certain directory.
-dirmessage_enable=YES
-
-# Make sure PORT transfer connections originate from port 20 (ftp-data).
-connect_from_port_20=YES
-
-# If you want, you can arrange for uploaded anonymous files to be owned by
-# a different user. Note! Using "root" for uploaded files is not
-# recommended!
-#chown_uploads=YES
-#chown_username=whoever
-
-# Activate logging of uploads/downloads.
-xferlog_enable=YES
-
-# If you want, you can have your log file in standard ftpd xferlog format
-#xferlog_std_format=YES
-
-# You may override where the log file goes if you like.
-xferlog_file=/var/log/vsftpd.log
-
-# You may change the default value for timing out an idle session.
-#idle_session_timeout=600
-
-# You may change the default value for timing out a data connection.
-#data_connection_timeout=120
-
-# It is recommended that you define on your system a unique user which the
-# ftp server can use as a totally isolated and unprivileged user.
-nopriv_user=nobody
-
-# Enable this and the server will recognise asynchronous ABOR requests. Not
-# recommended for security (the code is non-trivial). Not enabling it,
-# however, may confuse older FTP clients.
-#async_abor_enable=YES
-
-# By default the server will pretend to allow ASCII mode but in fact ignore
-# the request. Turn on the below options to have the server actually do ASCII
-# mangling on files when in ASCII mode.
-# Beware that turning on ascii_download_enable enables malicious remote parties
-# to consume your I/O resources, by issuing the command "SIZE /big/file" in
-# ASCII mode.
-# These ASCII options are split into upload and download because you may wish
-# to enable ASCII uploads (to prevent uploaded scripts etc. from breaking),
-# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
-# on the client anyway..
-#ascii_upload_enable=YES
-#ascii_download_enable=YES
-
-# You may fully customise the login banner string:
-#ftpd_banner=Welcome to blah FTP service.
-
-# You may specify a file of disallowed anonymous e-mail addresses. Apparently
-# useful for combatting certain DoS attacks.
-#deny_email_enable=YES
-# (default follows)
-#banned_email_file=/etc/vsftpd/banned_emails
-
-# You may specify an explicit list of local users to chroot() to their home
-# directory. If chroot_local_user is YES, then this list becomes a list of
-# users to NOT chroot().
-#chroot_list_enable=YES
-# (default follows)
-#chroot_list_file=/etc/vsftpd/chroot_list
-
-# You may activate the "-R" option to the builtin ls. This is disabled by
-# default to avoid remote users being able to cause excessive I/O on large
-# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
-# the presence of the "-R" option, so there is a strong case for enabling it.
-#ls_recurse_enable=YES
diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init
deleted file mode 100644
index d49dc001404e..000000000000
--- a/net-ftp/vsftpd/files/vsftpd.init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-
-VSFTPD_NAME=${SVCNAME##*.}
-if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then
-    VSFTPD_PID="/var/run/vsftpd.${VSFTPD_NAME}.pid"
-    VSFTPD_CONF_DEFAULT="/etc/vsftpd/${VSFTPD_NAME}.conf"
-else
-    VSFTPD_PID="/var/run/vsftpd.pid"
-    VSFTPD_CONF_DEFAULT="/etc/vsftpd/vsftpd.conf"
-fi
-VSFTPD_CONF=${VSFTPD_CONF:-${VSFTPD_CONF_DEFAULT}}
-VSFTPD_EXEC=${VSFTPD_EXEC:-/usr/sbin/vsftpd}
-
-depend() {
-	need net
-	use dns logger
-}
-
-checkconfig() {
-	VSFTPD_CONF="${VSFTPD_CONF}" \
-		/usr/libexec/vsftpd-checkconfig.sh || return 1
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec ${VSFTPD_EXEC} \
-		--background --make-pidfile --pidfile "${VSFTPD_PID}" \
-		-- "${VSFTPD_CONF}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	local retval=0
-	if [ -f ${VSFTPD_PID} ]; then
-		start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1
-		pkill --full ${VSFTPD_CONF}
-	else
-		ewarn "Couldn't find ${VSFTPD_PID} trying to stop using the config filename ${VSFTPD_CONF}"
-		pgrep --full ${VSFTPD_CONF} > ${VSFTPD_PID}
-		start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1
-		pkill --full ${VSFTPD_CONF}
-	fi
-	eend ${retval}
-}
-
-# vim: ts=4
diff --git a/net-ftp/vsftpd/files/vsftpd.service b/net-ftp/vsftpd/files/vsftpd.service
deleted file mode 100644
index 1445f2769861..000000000000
--- a/net-ftp/vsftpd/files/vsftpd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Vsftpd ftp daemon
-After=network.target
-
-[Service]
-Type=simple
-ExecStartPre=/usr/libexec/vsftpd-checkconfig.sh
-ExecStart=/usr/sbin/vsftpd /etc/vsftpd/vsftpd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-ftp/vsftpd/files/vsftpd_at.service b/net-ftp/vsftpd/files/vsftpd_at.service
deleted file mode 100644
index 5380b83ffcfe..000000000000
--- a/net-ftp/vsftpd/files/vsftpd_at.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Very Secure FTP Daemon
-
-[Service]
-Type=simple
-# Note: Do not use ExecStartPre=/usr/libexec/vsftpd-checkconfig.sh, as it
-# requires one of the listen options to be enabled.
-ExecStart=/usr/sbin/vsftpd /etc/vsftpd/vsftpd.conf -obackground=NO -olisten=NO -olisten_ipv6=NO
-StandardInput=socket
-SuccessExitStatus=2
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild
deleted file mode 100644
index e3ad887f7e16..000000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-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"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( sys-libs/pam )
-	!pam? ( virtual/libcrypt:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-	xinetd? ( sys-apps/xinetd )"
-
-src_prepare() {
-	local PATCHES=(
-		# kerberos patch. bug #335980
-		"${FILESDIR}/${PN}-2.3.2-kerberos.patch"
-
-		# Patch the source, config and the manpage to use /etc/vsftpd/
-		"${FILESDIR}/${PN}-2.3.5-gentoo.patch"
-
-		# Fix building without the libcap
-		"${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-		# Fix building on alpha. Bug #405829
-		"${FILESDIR}/${PN}-3.0.2-alpha.patch"
-
-		#Bug #335977
-		"${FILESDIR}"/${PN}-3.0.0-Makefile.patch
-
-		#Bug #450536
-		"${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
-
-		#Bug #630704
-		"${FILESDIR}"/${PN}-3.0.3-sparc.patch
-
-		# https://bugs.gentoo.org/443898
-		"${FILESDIR}"/vsftpd-disable-seccomp-sandbox.patch
-	)
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
-		eapply "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
-
-	default
-}
-
-src_compile() {
-	# Override LIBS variable. Bug #508192
-	LIBS=
-	use caps && LIBS+=" -lcap"
-	if use pam; then
-		LIBS+=" -lpam"
-	else
-		LIBS+=" -lcrypt"
-	fi
-	use tcpd && LIBS+=" -lwrap"
-	use ssl && LIBS+=" -lssl -lcrypto"
-
-	CFLAGS="${CFLAGS}" \
-	CC="$(tc-getCC)" \
-	emake LIBS="${LIBS}"
-}
-
-src_install() {
-	into /usr
-	doman ${PN}.conf.5 ${PN}.8
-	dosbin ${PN}
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING || die "dodoc failed"
-	newdoc ${PN}.conf ${PN}.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/${PN}
-	newins ${PN}.conf{,.example}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd" ${PN}
-	fi
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	keepdir /usr/share/${PN}/empty
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vsftpd-checkconfig.sh"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
-	systemd_dounit "${FILESDIR}/${PN}.socket"
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd openRC init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild
deleted file mode 100644
index d68b28925225..000000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-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"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( sys-libs/pam )
-	!pam? ( virtual/libcrypt:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-	xinetd? ( sys-apps/xinetd )"
-
-PATCHES=(
-	# kerberos patch. bug #335980
-	"${FILESDIR}/${PN}-2.3.2-kerberos.patch"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	"${FILESDIR}/${PN}-2.3.5-gentoo.patch"
-
-	# Fix building without the libcap
-	"${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Fix building on alpha. Bug #405829
-	"${FILESDIR}/${PN}-3.0.2-alpha.patch"
-
-	# Bug #335977
-	"${FILESDIR}"/${PN}-3.0.0-Makefile.patch
-
-	# Bug #450536
-	"${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
-
-	# Bug #630704
-	"${FILESDIR}"/${PN}-3.0.3-sparc.patch
-
-	# https://bugs.gentoo.org/443898
-	#"${FILESDIR}"/vsftpd-disable-seccomp-sandbox.patch
-)
-
-src_prepare() {
-	# Configure vsftpd build defaults
-	if use tcpd ; then
-		echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h || die
-	fi
-
-	if use ssl ; then
-		echo "#define VSF_BUILD_SSL" >> builddefs.h || die
-	fi
-
-	if ! use pam; then
-		echo "#undef VSF_BUILD_PAM" >> builddefs.h || die
-	fi
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
-		eapply "${FILESDIR}"/${PN}-3.0.4-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
-
-	default
-}
-
-src_compile() {
-	# Override LIBS variable. Bug #508192
-	LIBS=
-	use caps && LIBS+=" -lcap"
-	if use pam; then
-		LIBS+=" -lpam"
-	else
-		LIBS+=" -lcrypt"
-	fi
-	use tcpd && LIBS+=" -lwrap"
-	use ssl && LIBS+=" -lssl -lcrypto"
-
-	tc-export CC
-
-	CFLAGS="${CFLAGS}" emake LIBS="${LIBS}"
-}
-
-src_install() {
-	into /usr
-	doman ${PN}.conf.5 ${PN}.8
-	dosbin ${PN}
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING
-	newdoc ${PN}.conf ${PN}.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	docinto examples
-	dodoc -r EXAMPLE/*
-
-	insinto /etc/${PN}
-	newins ${PN}.conf{,.example}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/${PN}.xinetd ${PN}
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-	keepdir /usr/share/${PN}/empty
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/vsftpd-checkconfig.sh
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
-	systemd_dounit "${FILESDIR}"/${PN}.socket
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example || die
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd openRC init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}