gentoo resync : 12.05.2022

37 files changed, 412 insertions, 588 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 06119940e44c..03aa72c2fcc9 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 89d767885771..a6c95f4d1a73 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -4,5 +4,5 @@ AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1
 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
 DIST atftp-0.7.5.tar.gz 253626 BLAKE2B aa0a0311d29fd52b77f8ae021407221f815a39fe85cabac36ee18dce8918a5b0accda455e2df5fecf34f09e93e583bfbc86162b60a7237bd6d34b0c658ec2970 SHA512 457101136e59f7a1657ce591e9ea678ab9091a59219d41b6c522fad4a3555c5cbcb8c9e0c3267fd871940d99b5f8673ab4ce5ec9737dee52f017e5c80a4e59d7
-EBUILD atftp-0.7.5.ebuild 1440 BLAKE2B 1611bd0149e27e5b329e7fffc902c2d4e356c2ab21c65a015a1f62944bbd019f4d4fd814f5f9684c46b181fdafd70b9bd5fe1b211481a8032b1345260ff9be40 SHA512 fe97c2f312a28b62c6f3bc459b3df09e8cedd3200f6f2761746686fd370d0ab1bb6a583cfccc854229f94298e0dfac8be641a6978d80d3cf05e0bda26ee7f971
+EBUILD atftp-0.7.5.ebuild 1452 BLAKE2B adde7d73031fbfa0bdddd4755b8bc0835eba3c2fadfb41c8e7bc127f625576241652c6924c501a40cbffb5ca9d13c0c365d72e81cebebc729a8f4c6cacef06e4 SHA512 b547a622c18051067effa2ef59d10c0982efb1deeea00cbdf6303b5d8cc757cc61739360fcca22134a59ca245e9e471b35c8f8c01e7ec0f6ff7bc8207d024419
 MISC metadata.xml 369 BLAKE2B bda58276c6f791d7acca2ad53faa8411be0fecf3f63966d7c940926b4bf66c9e6bc1657d3b3bcd2a43fc83bcb3d767aa558a373682d7236d9ce68a9020e22e6f SHA512 d12e08830646352971bf624cfeda13895436eb6e35cd751fa043edc3909574e3dcd62b3afe578c9f3e94d3ec68541dafc48ee71db631d4b458e7fea0cbb84607
diff --git a/net-ftp/atftp/atftp-0.7.5.ebuild b/net-ftp/atftp/atftp-0.7.5.ebuild
index a4680708a6b5..d1bddd7ae938 100644
--- a/net-ftp/atftp/atftp-0.7.5.ebuild
+++ b/net-ftp/atftp/atftp-0.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index d06cf0c7b555..f5a824bddff6 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,22 +2,8 @@ AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a
 AUX filezilla-3.47.0-disable-shellext_conf.patch 699 BLAKE2B 9d0209166f8e76b0575be47e8a13b1d07f159ed05aaf9e8624030fa1ea2ce1ab63a7283336511bc14b6a922c8536d9ac992a231cf53f9c825299b4b588512c62 SHA512 3c0e6178f8fcc3793cbc722fcb91b2b2834eccda17ab6260243d1262198debe3c71ced1c2443ada8245a7bcf02b5fbb5fffdb16bdab948dc3badc149576ab027
 AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c
 AUX filezilla-3.52.2-slibtool.patch 723 BLAKE2B f051ae8d8b1d9c75bf4752d009a3b710b742accb50ec46ad6d1be0d7c5f88ab77996e47b55e3f87432a9d5aee2fef61e915ed36c09e988e01bbf68943a64144b SHA512 7a7f1adc4144c5535d60e6dd6f18aecc04c93ff2c98f52660fa576dcbce9ff7bb53175eef2fee7671c472181ea7f5c388ccc8697e70b8841759fdec06e62d1a1
-DIST FileZilla_3.53.1_src.tar.bz2 4844262 BLAKE2B 1ae9bab7b3812df106340a2267d5634c3e3e3078a5fbb3dcbf526c28ea5bfefe619e380b739533754ec9f4e200d08a398d6ebe0c984a7b18679f0165f3a03e29 SHA512 85109c68c9acaf2d3fb7d2ed98bdeae636cc359993535484ca404bd34e8287927628e255364bdb03681fcc47bff02423e954fd304b2e304bf18efaf2c0784eaa
-DIST FileZilla_3.54.1_src.tar.bz2 4847815 BLAKE2B 86d219e6c26c15bfd5597e486fafc7892aa3d085d62e6780fb0518a0e10f984a2e7f562666149fd8650f3cd00ad86901daf459095c542460f3bc229c047fa3e2 SHA512 d41b9fb303c11c81ceb0577fa5d40d6f5d9d1dc70a6a6bb6dac5c4cb7f8fc22cf06c2cf2e7415d922d11d5d4262832db89647acc34fa9a6cd92105b7700901df
-DIST FileZilla_3.55.0_src.tar.bz2 4910040 BLAKE2B 9955ddff5bfdd7fe7fadf5dad73638c8fd32bfe52411e6b7ad5f147bd076d6e184ed7deec5ff127f0de904a0ecd01c1c3ae770c70a6d6dd6491366f2af1fe7eb SHA512 8a1221e97719610be900d66f7feba90d1c5053a618b38084e93e8f2b11e51fc523336e11e110f51828eba3f17f60cea1fcd8060bd0cc5e7fdb3d24f35a4c1732
-DIST FileZilla_3.55.1_src.tar.bz2 4910935 BLAKE2B 7a901f7c73c6223c92100138989cedc83f8abf0f9657e08b31e8454892c39f2dccf6880350bb42742639dcec0326f50c46d1afd2d9d931529f11378f7e18bfa0 SHA512 07f1ccc596cac64aca0e82a97725f2ade26de78116441ba5aefaa8bd1396a483be88d9820820b9767e77686abbfd0eb6190684303e1f4d9ec45ef0b1f2cf0170
-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
 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
-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 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
+EBUILD filezilla-3.58.0.ebuild 1565 BLAKE2B bdf1629d582336fb0ae0067ca3eb7d93cba75ff30e2c4579875d02a782d57cecbb0ee72b4e1e7585e0248ac46662f86274ea40b704e2d75cb2399b256d42f650 SHA512 ecec5519f89c3b59fc7167313b1203a7cfc9382b4bdbe87c282670dfed2d8e7e7fa698c4844a6d6addfa3b1dee1ffa5c36203975a4e9c7b2de8d495e1e8c0cdb
+EBUILD filezilla-3.59.0.ebuild 1576 BLAKE2B 868071665c907abc7db4867107838a1b21f0f177ea279ee21a4c30375e936aa698fe4e3db47445d90ba16270ec3114d732902a3224b9100526a0d2e97e6cdc33 SHA512 2527e6952ebbdd80008f7e444f89d9a0cf850f66847f02d5399bc333ad447f3649f64b04bf594d4a4654307147c4f5d2febea3bbfc678e2ce422700f8a582431
+MISC metadata.xml 567 BLAKE2B 4dcbcf5d4032411a71789d653f7194ccd0f44610d24ea24cc0bfdbab63961776d31f606ac4f327e3e1b668ed40973c561532af2dc0c006493612e6eb7ddb2029 SHA512 9b255c02a0bc9fad8ff1c40f8fb263c94816f9bdcaa3d7ac4f5192c673ae6c4b9b82473ca0c1f80481b7f195a4a2c67ddbe190915ae3481fcdd6544029058997
diff --git a/net-ftp/filezilla/filezilla-3.53.1-r1.ebuild b/net-ftp/filezilla/filezilla-3.53.1-r1.ebuild
deleted file mode 100644
index 3ccd1f882cbf..000000000000
--- a/net-ftp/filezilla/filezilla-3.53.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.26.0:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	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/filezilla/filezilla-3.54.1.ebuild b/net-ftp/filezilla/filezilla-3.54.1.ebuild
deleted file mode 100644
index 2a533aafc612..000000000000
--- a/net-ftp/filezilla/filezilla-3.54.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.28.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/filezilla/filezilla-3.55.0.ebuild b/net-ftp/filezilla/filezilla-3.55.0.ebuild
deleted file mode 100644
index b1b7891fa0e0..000000000000
--- a/net-ftp/filezilla/filezilla-3.55.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.30.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/filezilla/filezilla-3.55.1.ebuild b/net-ftp/filezilla/filezilla-3.55.1.ebuild
deleted file mode 100644
index 666311f34514..000000000000
--- a/net-ftp/filezilla/filezilla-3.55.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.31.1:=
-	>=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/filezilla/filezilla-3.56.0.ebuild b/net-ftp/filezilla/filezilla-3.56.0.ebuild
deleted file mode 100644
index 84d30c5e5865..000000000000
--- a/net-ftp/filezilla/filezilla-3.56.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.34.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/filezilla/filezilla-3.56.2.ebuild b/net-ftp/filezilla/filezilla-3.56.2.ebuild
deleted file mode 100644
index c8582b1cb1c8..000000000000
--- a/net-ftp/filezilla/filezilla-3.56.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.34.2:=
-	>=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/filezilla/filezilla-3.57.0.ebuild b/net-ftp/filezilla/filezilla-3.57.0.ebuild
deleted file mode 100644
index 07b8bc826a8a..000000000000
--- a/net-ftp/filezilla/filezilla-3.57.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.35.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/filezilla/filezilla-3.58.0.ebuild b/net-ftp/filezilla/filezilla-3.58.0.ebuild
index b78ee06bceba..62c01301368b 100644
--- a/net-ftp/filezilla/filezilla-3.58.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.58.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~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.59.0.ebuild b/net-ftp/filezilla/filezilla-3.59.0.ebuild
index b78ee06bceba..1a1a0c69c8f1 100644
--- a/net-ftp/filezilla/filezilla-3.59.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.59.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="dbus nls test"
 RESTRICT="!test? ( test )"
 
@@ -26,7 +26,7 @@ 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/libfilezilla-0.37.1:=
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
diff --git a/net-ftp/filezilla/metadata.xml b/net-ftp/filezilla/metadata.xml
index 1c3480b84cca..01dfad8c2758 100644
--- a/net-ftp/filezilla/metadata.xml
+++ b/net-ftp/filezilla/metadata.xml
@@ -9,6 +9,10 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">filezilla</remote-id>
   </upstream>
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 1d555cdabe19..d3e6e6d60626 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -2,5 +2,7 @@ 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
+DIST gftp-2.9.1b.tar.xz 872308 BLAKE2B 3588321689a1c6d8e0585e0439507f774b30e05630f774d7909f32fd66c289a961602b84cde97377de47d0c63fe4cf5452ec1e0b986c578958a6080cf5814fc8 SHA512 31d0aa4d3c5adf3d9ac2c2517402f9bdcab5fb1187df521a978acf41c1997a120797056dd1ca7bedc32e0dec0ac7c06c1790e47821660277fb6572205ce0fe93
 EBUILD gftp-2.0.19-r3.ebuild 956 BLAKE2B c6da7f7b7be9775101f2493b19c3ba83941d3a5852086b6ced665e62443a76e34023ea9803d6a5502eec98e107953d05ab0233c0e2ab1c901f198261c704db49 SHA512 db454dca8bd2cc841f10b193ac21b71c90583ef21004acb0cb9f2853d9e389a49b7ef4ab4b02aabc6c68192d2317fc5e04ca19f3d6a7c6041494acdf3700467d
+EBUILD gftp-2.9.1b.ebuild 765 BLAKE2B c9c1335ee4109086d7eba927a7fb577af6e7d848c37033d6712a67a4f26f17ee3909afb3c857811f378c8f3a27b6a93141e48007c8be8e0134e1dd7997fe6ff0 SHA512 bede98a70353f3bc3d343407c24400756674cdf6172c18b3aa9c020f088ef5b1838a49ae237e89b86897f0380e1335bc599749f10e0dc2feb941acdf9572895b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-ftp/gftp/gftp-2.9.1b.ebuild b/net-ftp/gftp/gftp-2.9.1b.ebuild
new file mode 100644
index 000000000000..4cbd3b794981
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.9.1b.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="a free multithreaded file transfer client"
+SRC_URI="https://github.com/masneyb/gftp/releases/download/${PV}/${P}.tar.xz"
+HOMEPAGE="https://github.com/masneyb/gftp"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk ssl"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/ncurses:0=
+	sys-libs/readline:0
+	gtk? ( x11-libs/gtk+:2 )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable gtk gtkport) \
+		$(use_enable ssl)
+}
+
+src_install() {
+	gnome2_src_install
+	dodoc docs/USERS-GUIDE
+}
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 89f8e72a2bc3..57ddfed15d4a 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -10,6 +10,6 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8
 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
 AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.9.2.ebuild 2577 BLAKE2B 94dcc9876ae14b7d351f1df5edbf25aa65531b7f76e977002f1e736146958e803753941877041a70548cef5dcc81f4e382e7776cc74d5d5dda7889d7b8b5e070 SHA512 b69e5c0c7786de2ee4adb7d43fac3766c7378c04fe1a13c610a3188080cec122306ac84c36612a72c10f8b0b44c01feb7f5873551fdd51683be78427679986c3
+EBUILD lftp-4.9.2.ebuild 2584 BLAKE2B 92db441ae1e3c985db59568f2bedc3ea2f0b94b7acdf0ed4d7cb257eadc6ebf8dd185459e8c71f6ab6e6cf427a855700afecb26bd7abf1e7ee317eec2c4506ea SHA512 d32de85536f7f2a812c0148c9934408e4ec56b3d89b821bbd89c3830a2431a304acee57bc7f6e87d4c18f1c387bb9b96d23036b24c5940a404a68e1519aadc3c
 EBUILD lftp-9999.ebuild 2372 BLAKE2B bba2c782aa65d11736ff859793425c38f4d3cc9c2130db3755e99a0e5af3f68ef9cc21076219913182d8c351c7807a79e6f94853e2671a6ad91a77bfac0e6989 SHA512 34c37decd8a2de8965ee521aacd34a505c9a36f5369f48a13f9980497e199e2ac331c98c590dc7b5cd63f3f97d774b97c8f069ccc4110535492b58fa7526ccd6
 MISC metadata.xml 481 BLAKE2B 7a61be735ad5538cf472fa7bdd22a17449c02584804d2711b626433945dc62db58746302cd0ae83ce35350627720e2bce8297757858deb2d66bb30f0c9981e33 SHA512 4977624bcad3dce392d8e42d28071918a50c1850c6ad139c56aaa59195869f517c1654dbd2c18a0ea6335a984299c2472b22f139fcd67808f55e92f0e6a5ecb0
diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index de89ecd8c304..9f9b8e1d00ef 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.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
@@ -10,7 +10,7 @@ SRC_URI="http://lftp.yar.ru/ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls socks5 +ssl verify-file"
 RESTRICT="test"
 
diff --git a/net-ftp/linksys-tftp/Manifest b/net-ftp/linksys-tftp/Manifest
index c2c7d9843db7..8d7b06a455df 100644
--- a/net-ftp/linksys-tftp/Manifest
+++ b/net-ftp/linksys-tftp/Manifest
@@ -3,5 +3,5 @@ AUX linksys-tftp-1.2.1-r1-clang.patch 4206 BLAKE2B bf7fda154ac8341bd15c6c3ee8998
 AUX linksys-tftp-1.2.1-r1-fno-common.patch 231 BLAKE2B 412c90ea110ded87aca95df6132d1825189b0f21ce2be21ac57a754980f5c99dfbfb426a093a58d179e9562cc2e4d2a09bfdcae9d47100ad7a7899a9bcd1ea3f SHA512 ed36e569a8d5d75c4c1674591a44f9b83eb40b9a3b29e847f8760417c4dbce62b2e7e95e65f9513d40d1e996dc6061d538d11f76995d81ab91f30e9f6472974e
 AUX linksys-tftp-1.2.1-r1-header.patch 959 BLAKE2B 7db548e0ecc70528c0ca974ca6cc1244615138aaead1f7f0e6384e35217532493f1e6d5fc167e54ab44e36cf241e5e821400cd60ec1ac900aee217e7e8478725 SHA512 8d59f13f16b9b512488d5773904ac0f617d2bbbff567040e009e8033012435c713d0ebac5ea145add5adb8881a66eefef4926a8aab2adc6590826744549356f7
 DIST linksys-tftp-1.2.1.tar.bz2 11124 BLAKE2B 44a3bb1a11c9dae6014c3ec5f0c56c2a056e542f2f7f1d7a805479925beedebe9a79a8cddc64ce2455b459d8fa4436f16d52c6d86d8595fa1f05aa747f14bc78 SHA512 7d99cd7cc2144396fe008ed0fbc21053ef4e614021d6d2e24adca799d8eabd1b3c177b4bee20e14034170bc234d36e9eeaaf8e825513ef6f37e73643b91667fc
-EBUILD linksys-tftp-1.2.1-r3.ebuild 642 BLAKE2B 10ff536014310c4c5200381566968e0b4c6fd66b66948e61f923b6edc58947e4560f8b09d39cc4440f7931122d599cd7d1b974f62ea745a32ce551d1a58a689b SHA512 6ad9d3c50bed561d3a02fff787b61c7eefb3d318f78382ad09fbd08498c55336e2f48026930ed0361104b4c8cbb15858e041e0aba72f398f8cd19a74a973360b
+EBUILD linksys-tftp-1.2.1-r3.ebuild 649 BLAKE2B 04585ea91b68224fd3fa236f4080eed96ba1cedba009d55c22909a2f425147c472da2e4dbbbd9712005eca4ac9039d7d964f6e19263254970e86dd2405064a99 SHA512 c7824520d402a63cfb04685e616fb9a371ec1ea657bcdddc34780c1712b43be49d459e659d7b5ad6cc3f8fe67189a04b93dccebe24f0ee0c40b3a17894d416c9
 MISC metadata.xml 258 BLAKE2B e1772b5ecee1d7ca291a0bd383d440d99d8eac562d2c84158cbc0f326719db5d90e47e0b364d707056f2305071394a4f0effa576473d461288302223b61c8979 SHA512 d4a988758da96d1c44b774d316038c0bef3477955ace607c9555ee51ae867dd3b54a5cec0b424b91c52d3a32071df22433e1e9be1c440599aaee76f84cfc63c2
diff --git a/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild b/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
index ba390c758671..9b2e2ad93ba2 100644
--- a/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
+++ b/net-ftp/linksys-tftp/linksys-tftp-1.2.1-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=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.redsand.net/solutions/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-r1-header.patch"
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index b2d46146327c..7dde0d0af82c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -25,9 +25,9 @@ DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
-EBUILD proftpd-1.3.7a-r3.ebuild 8653 BLAKE2B 688e5e00368427d4a09ee78d848bd27473c22bfc83ffce936ec85adeeb864de5e593344eadd6c47583c72d230fdd4c5023058f15711eb022df392dc94b13898f SHA512 4dd5946e4b4ca08517f9d878a81055d7d6d67ccaa443be03cce8b809105352379b8e93203dd45c680f140fa3ea9f8c63a4509e9aa27acf7a4760a8bf135a38c4
-EBUILD proftpd-1.3.7b-r2.ebuild 8592 BLAKE2B 10f54080274f391a72ad06219d017c7aacc0f44f6c155e7194dcecedd9eb713c3f3e76d7295b0ca9005fb4a5fb7f0998bd8e76d8a868e3c48e8789b8ab8b7fd8 SHA512 a87f6208a92d9edc19ebd16215ab98ad99724e960cfb6841093773786c34dc12904923b03afa983bb774f445c5b5d43ecc5cead3249592db81fb9233ba766923
-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
+EBUILD proftpd-1.3.7a-r3.ebuild 8647 BLAKE2B eb6dbe5f174b5c4f4f470ea66ac141c63d042c034b739c0288695cc86384663ed59146b1486bb37c119f7725a6e4026eaaf64041ddcfc0c9d116451be2bf78c4 SHA512 2de34c8054a837a335505bff7b31fca866ec7f646a1d996c0daca5e3a8f113f1d1d6044864f99f80ae52380301765d7ecea265f2591660a4593872f8190f260f
+EBUILD proftpd-1.3.7b-r2.ebuild 8586 BLAKE2B a716309aa32e0c5fef7ff1b737a43d8b3ab7fbf39bf1ce8933e1474b6c200954dacb6e2f19bc72aa1deeee82be25c3436f7a6d5ba06c9255f7cd3f95e2fc9798 SHA512 c15de59172e50223fcb30c54f51ecc55dc0b9eebac16d05e62117ee0084d5ddfb133b86f3986a036074c27e62e6a359dce242107cb323c66f5a2b3928fa4c926
+EBUILD proftpd-1.3.7c-r1.ebuild 8580 BLAKE2B 58a011ed55a3431d8715c9e1d2437e40cd48a497c5ea255d58735968f1a4f796f90bd6b4ddcaecfd46cd58d4aef77fd6fa6b192986524627ab0e0d2142458af7 SHA512 d6852b23f2065d5a72db4145f0193444abe3995217312b4a3e1458db7ca661fde86c4d1a02b3e6d6845ae0dbe368900a82ce9781a956b30db4015fb54660b6a0
+EBUILD proftpd-1.3.8_rc1-r3.ebuild 8543 BLAKE2B 8ab90d140a40a0a868985c0946bf913bd09390577d5916321a8a15e83093b72ffe73b02ddd70268a257a7d9de9afdbd62ecaf771d7fd602d44791a8062495286 SHA512 8af29cea44e81eec037ce5601424e61af3c897142352f2439397e9c1f538818e8ad1c95dbb7b8546cb52306da704b49cf33be5d8a16cfa7f97fba1e9862189b1
+EBUILD proftpd-1.3.8_rc2-r2.ebuild 8544 BLAKE2B 9f439ee29ae6a3850e2d02c7ea73d661669811c7697ec4f466acf5a12ffe5e4b00280df0af29602ab35de14d5742ddb1c5d2784b08844e5687c17ad5e03b19f0 SHA512 bb4baeda34f50689b60d99efd8fb0b5efdce16ab6481223978a963a7d47b45028fa8ebfb33de73ff82a6d575c2da7a03df7b8fdfacacd646698f9654e3a50014
 MISC metadata.xml 2878 BLAKE2B ae5adc72367a39976876cd318cb5bad39b56e47794a8333d96d3140f5df02c1b14b3c9ff539a4881b607285783c8a9a0aa6e317c0b2b87cf9a6d4ca1dbb59230 SHA512 0fab9c309a539e3c97bb47ef1e3624f47588e81f057c9fc4aabaea48b321264eaea6443eef2235b7fc43ab5866d35e95bdf39bc630ae69894e7b856b787207f8
diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
index c3f063f49b27..cc90efaadad2 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild
index 85ccd857198b..1ef44adafcf2 100644
--- a/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
index ad2ce6dcf9d1..77dd4ba321ed 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
index 58c91dffc600..b55c7ab226b8 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
index b21589b1457e..2f368e288ee7 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 8319ba3390ec..4cf70a7469cc 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,14 +1,21 @@
+AUX pure-certd.initd 562 BLAKE2B 21431b74d2a745b13daa7772748b4484e18a640ffc07252ed60867b297a8f31267f583ceb408ee31c11bbc43de3fcda0b51e4324279b50c8a4a19ea6f1342945 SHA512 1a7a7dcba98e92e86ae3f35c33c5fe970c6530f1059692f32cdc851de1d8492720020b252e70c646eff6fdbbb32dfb99b1ae449acaea5fd0fe5541dc89891301
+AUX pure-certd.script 678 BLAKE2B 09a27afc2b1d885b051988d0d5af4ab3fe3ffff68a37a01071a7cfe5334d7f62b0510865381f5d226f12558a04214afdc3fc158e22cc7e2c940617997c9453cf SHA512 807598a1e7e2ad92e1b5e52b0f2321a45d032a74e806435fddbf4f6b99ca2663617ee6accbeeb187c17f8a35668d1b097b13a8930be24ddfd4fb5818e3b1523c
 AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba
 AUX pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch 898 BLAKE2B ccccd0302184a768ac522197628b2021374579afcda595a70041dc14f3cab05317ac373a2fadf9d0565a95c0d730c87590c3dc13efa944e8d496264b3f0e4ab1 SHA512 7930dddc7e58bd00fdeb4cd0da49491d59907334f47f23d12433f71a9a2103a8b5cc503c5d4d461b110cdea61f2f6ef974bf123d96394334f668aacdb747f830
 AUX pure-ftpd-1.0.49-do-not-call-ar-directly.patch 609 BLAKE2B 5f3ac69ae824cd07a16629afdbed9d1d55718184fb0da09063ae5beacf189861263bb21bc4e3f6d9f853757169f8125221db4728002bbd2697992c8035201585 SHA512 91d15fbcf4d99100072bae5a7121122a0ae0e912a4df5a7d9645419506bdd7de70ce09d586b9a3ec83838fd98cddee6d744cda7b6383985f80278859ff5200e4
 AUX pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch 847 BLAKE2B f7e12194d219bb5a410a7b55743cdb2b8eb268a60aef8b8d9826e242264989a4502bb2378503c3a7ed8913fce4d95b681fcd185d184ef54e04dcda6b4853d99e SHA512 ff4aefeffd92f9e01e7c57779cc9ed59c0972a40a02431fa4e63696071ebbf28e4a0f83b6b6c878d4b62fed7efa05ff90e9d604e8c7e6a9358bc8853105731f1
 AUX pure-ftpd-1.0.49-quota_maxfile_size_check.patch 994 BLAKE2B 8a3a840af77642b1b00e7cc05dc095631400e4332a7f5ece140ea5034cd6cbf5f2d9509cfe1138dd4bc968dca60d848ef238a0bd0d7d0f44a978dde15cd9ad62 SHA512 7e5d79984355765dd1c167e23018cda5f17102424769a439a03e642ebc66838d2f9410af99151ce0d47056cbead6979df335a65e4468da5025b8555a84d4c798
 AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393
+AUX pure-ftpd.confd-r4 170 BLAKE2B d552480bea7503066ef3f0e90a082660a30f35cf809e26860ba9b49fcbb2fcdafdfe35041510fdd73f1b42cb35b7d90caa37ed9722de769750558818ebfbfe43 SHA512 6afde5a6e0f8e3a14bd23a6f861e18754980ab1b845defe06378493ed58e693628f4af71b591b3160037a0fdf6cc750c2a0d156a47c48a2a1d58c0032e389a1f
+AUX pure-ftpd.initd-r12 519 BLAKE2B 6271067b195de1b662ffe1577aaf3e6e2badd44494e17f27671f9f70e3f1bb955326af390b709a4ff9cefd2ba48e1ef77efaaac5595a5dccbbb75e9376db7153 SHA512 2189b8761aa51b68bd4b5b5c79e3f7220c9f96e5187bf17ed55a50a74ebe0989b3d5f2c9d8b3bdc89d184ce7f97d16e1c51e46b3d178feacc72864090717b8a1
 AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
+AUX pure-uploadscript.confd 368 BLAKE2B 675e5349b2f808dd2a3cbaf2536a0541f40d42d300b7411163bc8232470c6f63a1d92cef393271693a02bcb5129624d38de77a99ca030a77bab00cc1fbe797c4 SHA512 2632be874a5afb25b8c8c1acbdfef929542d80dc9a8f280b4a9b0b6878be63f901ccd2c29c2ae0f9f74f45e41df1b7e69d1cef6f77e93c9b235709a7094480af
+AUX pure-uploadscript.initd-r1 776 BLAKE2B 1e382300a92fabb5308aa2636de2f427418d8595859fa2d7e6ee0a62297a0a17386f2f4c55de03ad282ed0545cc97ea6c0df67fe5fe6af736789d01e18c69f97 SHA512 3bb735bf0dc12434bc283ea9948c5b7feeaf72a26382a65a3c8eaec87a13f82239699e4687e5b36be5478bcab801974633b17771d9a583b6be508503118899e4
 DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef
 DIST pure-ftpd-1.0.50.tar.bz2 520167 BLAKE2B 0c694ed48e896be13d907a71a24357f8676daf2c66bdaac41d31b162741164fe5ab1560499acc08b11e4fdb2a678c81c81c03e65a8181fcfd960ffbfe4b731d4 SHA512 8fbd24fb0450b9ed8e47335c97c3bc1cbcd0ee2ac7ebea95721b9dbddb7f61d8bedaa1710ba94213d96c79e12ec9b2b555ddb5f494c8961ca2339b176a52fe12
-EBUILD pure-ftpd-1.0.49-r6.ebuild 4393 BLAKE2B 9faa4fd08707b498fdf813545ccabff8a693d4ec349c095c97176196adec89e65dda12adc7822a43887cd944bdb622b624525691cbbfdfcb3ed9770deedc0bbc SHA512 7140052d7d1a0e2c62740296a20c18ad5c0721e9d8274978de824b458ffb318499d3ba3db780dd54137c40dc053d7744f58495038fc4f9978eaccd4460cb1b31
-EBUILD pure-ftpd-1.0.50-r1.ebuild 4107 BLAKE2B e1eba63ae010ae137848d110366de1d30f0b39d3257fcdba06db6c7029caf36bfdfbdd48f4ace82965c83bae2d57b5e066a4ac2b2bca22d4a29ed18d33d510d8 SHA512 0d2a677fb96bed769a01d170f93cdc7ce02ec625481d5a82f331810cb492e6e095ab608610136ead40af9d772bba6e56cf29f114555437b7170aed527c9f27b9
-EBUILD pure-ftpd-9999.ebuild 4107 BLAKE2B e1eba63ae010ae137848d110366de1d30f0b39d3257fcdba06db6c7029caf36bfdfbdd48f4ace82965c83bae2d57b5e066a4ac2b2bca22d4a29ed18d33d510d8 SHA512 0d2a677fb96bed769a01d170f93cdc7ce02ec625481d5a82f331810cb492e6e095ab608610136ead40af9d772bba6e56cf29f114555437b7170aed527c9f27b9
+EBUILD pure-ftpd-1.0.49-r6.ebuild 4399 BLAKE2B 11f875c1345ffde82632d1f7cb70c934f571a460bbe85583c381c1d9ee1cde305e9e413595afb034d34ad695e06bbccd2f695c560202f0a483524a149510737a SHA512 18f4236c55ff0d1f0fd059cf44bfa8fa8f1ddec4d225384bc66c21fefd17ee003e316f9a6f9cafcd6d658ad2ef66bd5d9858b8d05e629cc0071b7fc94453bd1c
+EBUILD pure-ftpd-1.0.50-r1.ebuild 4113 BLAKE2B b60eaf0982ea54aae3b738100017901b264e063c22d4b905358b4710e12c54a0785d58a0f024d04157db9e78be2eaaa61cc7cacdae8a37d02c8acad910155306 SHA512 0b5fd18b202a61ce01d749c5190d4b66ca843e55964891af26a618ce3c3aba16189741de421abaff582ee8d7b4e9420591ab58e25937c0976e3c439f2e42910e
+EBUILD pure-ftpd-1.0.50-r3.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7
+EBUILD pure-ftpd-9999.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7
 MISC metadata.xml 1177 BLAKE2B 7662da71f87d60d342e0a304c73c02f95a1006a0e6614c40ee3f3333a01430cb0a50ebd7e190569fcac25f9cefdd48fef68649c97006846977a2596333d78c34 SHA512 6c79218bba944381fbf0bfc86e27adde1e95e5e2ac5e7e2c5d637820f8fb4bb1bbd5e91a53f6fbc4ef641d03be6490e1d137895176576f7e2da798662590fb0a
diff --git a/net-ftp/pure-ftpd/files/pure-certd.initd b/net-ftp/pure-ftpd/files/pure-certd.initd
new file mode 100644
index 000000000000..1d254e5274a9
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-certd.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+certd_scriptfile="/etc/${SVCNAME}.sh"
+certd_socketfile="/run/${SVCNAME}.sock"
+pidfile="/run/pure-certd.pid"
+
+command="/usr/sbin/pure-certd"
+command_args="--pidfile ${pidfile} --run ${certd_scriptfile} --socket ${certd_socketfile}"
+command_background="true"
+
+start_pre() {
+	if [ ! -f "${certd_scriptfile}" ] ; then
+		eerror "The file ${certd_scriptfile} does not exist!"
+		eerror "Please create and configure the script."
+		return 1
+	fi
+}
diff --git a/net-ftp/pure-ftpd/files/pure-certd.script b/net-ftp/pure-ftpd/files/pure-certd.script
new file mode 100644
index 000000000000..77aa1bf9f702
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-certd.script
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Set default ssl directory
+SSL_DIR="/etc/ssl/pure-ftpd"
+
+# Check SNI and select certificate
+case "${CERTD_SNI_NAME}" in
+	domain1.tld)
+		FILE_CERT="${SSL_DIR}/domain1.tld.crt"
+		FILE_KEY="${SSL_DIR}/domain1.tld.key"
+	;;
+
+	domain2.tld)
+		FILE_CERT="${SSL_DIR}/domain2.tld.crt"
+		FILE_KEY="${SSL_DIR}/domain2.tld.key"
+	;;
+esac
+
+# Print selected certificate for 'pure-certd'.
+# You can modify 'action' for your needs.
+# See man page of 'pure-certd' for more information.
+echo "action:fallback"
+echo "cert_file:${FILE_CERT}"
+echo "key_file:${FILE_KEY}"
+echo "end"
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.confd-r4 b/net-ftp/pure-ftpd/files/pure-ftpd.confd-r4
new file mode 100644
index 000000000000..d49b6c509c58
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.confd-r4
@@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Optionally depend on started Pure-Certd
+# RC_NEED="pure-certd"
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.initd-r12 b/net-ftp/pure-ftpd/files/pure-ftpd.initd-r12
new file mode 100644
index 000000000000..c971125784b7
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.initd-r12
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ftpd_configfile="/etc/${SVCNAME}.conf"
+pidfile="/run/pure-ftpd.pid"
+
+command="/usr/sbin/pure-ftpd"
+command_args="${ftpd_configfile}"
+command_background="true"
+
+depend() {
+	need localmount
+	use netmount
+}
+
+start_pre() {
+	if [ ! -f "${ftpd_configfile}" ] ; then
+		eerror "The file ${ftpd_configfile} does not exist!"
+		eerror "Please create and configure the configuration file."
+		return 1
+	fi
+}
diff --git a/net-ftp/pure-ftpd/files/pure-uploadscript.confd b/net-ftp/pure-ftpd/files/pure-uploadscript.confd
new file mode 100644
index 000000000000..4b8fca0deb8f
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-uploadscript.confd
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# If you want to process each file uploaded through Pure-FTPd, enter the name
+# of the script that should process the files below.
+# Use man pure-uploadscript to learn more about how to write this script.
+# UPLOADSCRIPT="/path/to/uploadscript"
diff --git a/net-ftp/pure-ftpd/files/pure-uploadscript.initd-r1 b/net-ftp/pure-ftpd/files/pure-uploadscript.initd-r1
new file mode 100644
index 000000000000..5914c875fdf1
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-uploadscript.initd-r1
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ftpd_configfile="/etc/pure-ftpd.conf"
+pidfile="/run/pure-uploadscript.pid"
+
+command="/usr/sbin/pure-uploadscript"
+command_args="${UPLOADSCRIPT}"
+command_background="true"
+
+depend() {
+	need localmount
+	use netmount
+}
+
+start_pre() {
+	if [ -n "${UPLOADSCRIPT}" ] ; then
+		eerror "The file ${ftpd_configfile} does not exist!"
+		eerror "Please create and configure the uploadscript file."
+		return 1
+	fi
+
+	if ! grep "^CallUploadScript" "${ftpd_configfile}" ; then
+		eerror "You cannot start this uploadscript,"
+		eerror "unless you enable the option CallUploadScript"
+		eerror "in your main Pure-FTPd configuration file ${ftpd_configfile}"
+		return 1
+	fi
+}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild
index d54809d44fa9..784e79dcafc5 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 
 IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild
index 4be40c54c4ef..e78b1e52dc2e 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 
 IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
new file mode 100644
index 000000000000..712fefda22b2
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
+HOMEPAGE="https://www.pureftpd.org/project/pure-ftpd/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git"
+else
+	SRC_URI="
+		ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+REQUIRED_USE="implicittls? ( ssl )"
+
+DEPEND="
+	dev-libs/libsodium:=
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap )
+	ldap? ( >=net-nds/openldap-2.0.25:= )
+	mysql? ( || (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	ssl? ( dev-libs/openssl:0=[-bindist(-)]	)
+	sysquota? ( sys-fs/quota[-rpc] )
+	xinetd? ( virtual/inetd )
+"
+
+RDEPEND="
+	${DEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )
+"
+
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" )
+
+src_prepare() {
+	default
+
+	[[ "${PV}" == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# Those features are only configurable like this, see bug #179375.
+	use anondel	&& append-cppflags -DANON_CAN_DELETE
+	use anonperm	&& append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren	&& append-cppflags -DANON_CAN_RENAME
+	use anonres	&& append-cppflags -DANON_CAN_RESUME
+	use resolveids	&& append-cppflags -DALWAYS_RESOLVE_IDS
+
+	# Do not auto-use SSP -- let the user select this.
+	export ax_cv_check_cflags___fstack_protector_all=no
+
+	local myeconfargs=(
+		--enable-largefile
+		# Required for correct pid file location.
+		# Pure-FTPd appends "/run/pure-ftpd.pid" to the localstatedir
+		# path, and tries to write to that file even when being
+		# started in foreground. So we need to pin this to /
+		--localstatedir="${EPREFIX}"/
+		--with-altlog
+		--with-cookie
+		--with-diraliases
+		--with-extauth
+		--with-ftpwho
+		--with-language=${PUREFTPD_LANG:=english}
+		--with-peruserlimits
+		--with-privsep
+		--with-puredb
+		--with-quotas
+		--with-ratios
+		--with-throttling
+		--with-uploadscript
+		--with-virtualhosts
+		$(use_with implicittls)
+		$(use_with ldap)
+		$(use_with mysql)
+		$(use_with pam)
+		$(use_with paranoidmsg)
+		$(use_with postgres pgsql)
+		$(use_with ssl tls)
+		$(use_with sysquota sysquotas)
+		$(use_with vchroot virtualchroot)
+		$(usex caps '' '--without-capabilities')
+		$(usex noiplog '--without-iplogging' '')
+		$(usex xinetd '' '--without-inetd')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/pure-ftpd.initd-r12" pure-ftpd
+	newconfd "${FILESDIR}/pure-ftpd.confd-r4" pure-ftpd
+
+	newinitd "${FILESDIR}/pure-uploadscript.initd-r1" pure-uploadscript
+	newconfd "${FILESDIR}/pure-uploadscript.confd" pure-uploadscript
+
+	if use implicittls ; then
+		sed -e '/^# Bind/s@21@990@' -i "${ED}"/etc/pure-ftpd.conf || die
+	fi
+
+	if use ssl ; then
+		newinitd "${FILESDIR}/pure-certd.initd" pure-certd
+
+		exeinto /etc
+		newexe "${FILESDIR}/pure-certd.script" pure-certd.sh
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins pureftpd.schema
+		insinto /etc/openldap
+		insopts -m 0600
+		doins pureftpd-ldap.conf
+	fi
+
+	if use xinetd  ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# This is a new installation
+		elog
+		elog "Before starting Pure-FTPd, you have to edit the /etc/pure-ftpd.conf file!"
+		elog
+		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
+		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
+		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
+		ewarn
+	else
+		for v in ${REPLACING_VERSIONS} ; do
+			if ver_test "${v}" -le "1.0.50" ; then
+				einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!"
+				einfo "Please migrate your settings to the new configuration file."
+				einfo "Use /etc/pure-ftpd.conf to adjust your settings."
+			fi
+		done
+	fi
+}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
index 4be40c54c4ef..712fefda22b2 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
@@ -6,66 +6,63 @@ EAPI=8
 inherit flag-o-matic
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
+HOMEPAGE="https://www.pureftpd.org/project/pure-ftpd/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git"
 else
-	SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="
+		ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
-
 IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
 REQUIRED_USE="implicittls? ( ssl )"
 
-BDEPEND="sys-devel/autoconf-archive"
-
-DEPEND="dev-libs/libsodium:=
+DEPEND="
+	dev-libs/libsodium:=
 	virtual/libcrypt:=
 	caps? ( sys-libs/libcap )
 	ldap? ( >=net-nds/openldap-2.0.25:= )
 	mysql? ( || (
-		dev-db/mariadb-connector-c
-		dev-db/mysql-connector-c
-	) )
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		>=dev-libs/openssl-0.9.6g:0=[-bindist(-)]
-	)
+	ssl? ( dev-libs/openssl:0=[-bindist(-)]	)
 	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
+	xinetd? ( virtual/inetd )
+"
 
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
+	selinux? ( sec-policy/selinux-ftp )
+"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.28-pam.patch"
-)
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" )
 
 src_prepare() {
 	default
+
 	[[ "${PV}" == 9999 ]] && eautoreconf
 }
 
 src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
-		-i "${S}/src/ftpd.h" || die "sed failed"
-
 	# Those features are only configurable like this, see bug #179375.
-	use anondel 	&& append-cppflags -DANON_CAN_DELETE
-	use anonperm 	&& append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren 	&& append-cppflags -DANON_CAN_RENAME
-	use anonres 	&& append-cppflags -DANON_CAN_RESUME
-	use resolveids 	&& append-cppflags -DALWAYS_RESOLVE_IDS
+	use anondel	&& append-cppflags -DANON_CAN_DELETE
+	use anonperm	&& append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren	&& append-cppflags -DANON_CAN_RENAME
+	use anonres	&& append-cppflags -DANON_CAN_RESUME
+	use resolveids	&& append-cppflags -DALWAYS_RESOLVE_IDS
 
 	# Do not auto-use SSP -- let the user select this.
 	export ax_cv_check_cflags___fstack_protector_all=no
@@ -73,7 +70,7 @@ src_configure() {
 	local myeconfargs=(
 		--enable-largefile
 		# Required for correct pid file location.
-		# pure-ftpd appends "/run/pure-ftpd.pid" to the localstatedir
+		# Pure-FTPd appends "/run/pure-ftpd.pid" to the localstatedir
 		# path, and tries to write to that file even when being
 		# started in foreground. So we need to pin this to /
 		--localstatedir="${EPREFIX}"/
@@ -91,40 +88,41 @@ src_configure() {
 		--with-throttling
 		--with-uploadscript
 		--with-virtualhosts
+		$(use_with implicittls)
 		$(use_with ldap)
 		$(use_with mysql)
 		$(use_with pam)
 		$(use_with paranoidmsg)
 		$(use_with postgres pgsql)
 		$(use_with ssl tls)
-		$(use_with implicittls)
-		$(use_with vchroot virtualchroot)
 		$(use_with sysquota sysquotas)
+		$(use_with vchroot virtualchroot)
 		$(usex caps '' '--without-capabilities')
 		$(usex noiplog '--without-iplogging' '')
 		$(usex xinetd '' '--without-inetd')
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	local DOCS=( AUTHORS ChangeLog FAQ HISTORY README* NEWS )
-
 	default
 
-	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
+	newinitd "${FILESDIR}/pure-ftpd.initd-r12" pure-ftpd
+	newconfd "${FILESDIR}/pure-ftpd.confd-r4" pure-ftpd
+
+	newinitd "${FILESDIR}/pure-uploadscript.initd-r1" pure-uploadscript
+	newconfd "${FILESDIR}/pure-uploadscript.confd" pure-uploadscript
 
 	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
+		sed -e '/^# Bind/s@21@990@' -i "${ED}"/etc/pure-ftpd.conf || die
 	fi
 
-	keepdir /var/lib/run/${PN}
+	if use ssl ; then
+		newinitd "${FILESDIR}/pure-certd.initd" pure-certd
 
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
+		exeinto /etc
+		newexe "${FILESDIR}/pure-certd.script" pure-certd.sh
 	fi
 
 	if use ldap ; then
@@ -134,17 +132,30 @@ src_install() {
 		insopts -m 0600
 		doins pureftpd-ldap.conf
 	fi
+
+	if use xinetd  ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
+	fi
 }
 
 pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
 		# This is a new installation
 		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
+		elog "Before starting Pure-FTPd, you have to edit the /etc/pure-ftpd.conf file!"
 		elog
 		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
 		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
 		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
 		ewarn
+	else
+		for v in ${REPLACING_VERSIONS} ; do
+			if ver_test "${v}" -le "1.0.50" ; then
+				einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!"
+				einfo "Please migrate your settings to the new configuration file."
+				einfo "Use /etc/pure-ftpd.conf to adjust your settings."
+			fi
+		done
 	fi
 }