gentoo resync : 13.10.2019

33 files changed, 464 insertions, 49 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 820dc458a1e6..0fb9fe603317 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/cmdftp/Manifest b/net-ftp/cmdftp/Manifest
index 99ff983f6bf8..0b3bef2b6545 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 470 BLAKE2B faaa876620e67f2930b03ad78602c67216cd6a6e99dcc370024ad972212369d56ce8282c4848621b3132d5a24aac060f2d965925d91cdf866922793a0533d6df SHA512 bb02f80475154839e0f509b145c718ae12bd9188b7f55134f4be75fbfd066e2196656564be3f972d5abac8ecb41b3df6439f5c07ed6e9f2e54a64fb931d90a95
+EBUILD cmdftp-0.9.8.ebuild 460 BLAKE2B d45e2d2e03959be50d745fa07b38c07a00743243ec300dd9ce492c9dcea932ebcbad7df7cea20a8d99155f070be53d795bd66bdcdddff52d99d3a4b289066772 SHA512 1fcd97c077db38727423c7eed70202176db1434ea3e62db55adf6681a2f1d66d037babd1495dc6af72960fcf8faedb33b140a13af0ca08ff3c7e7700eb431d3e
 MISC metadata.xml 293 BLAKE2B 0089cfa2bdd58e719ee1a13ed7e2f95b3b61343c4f9b8a6b4c7e383df377d8e03f866573108752091636c33307f86294b05dbb79c34a2cf9f05cb48486908faf SHA512 01e38ab096f216f988b87309b37964f88d2856e0d4d7618598350e0184bdf4f6507fcdb57ddba37831a6ad85ccf51d4e6aa20571472eb3d0be1b21a61a508f9e
diff --git a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
index 5f78333248ab..ecc0224ef1e2 100644
--- a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
+++ b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index cabc1fa6a9f3..fe6477e28165 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -5,10 +5,12 @@ DIST FileZilla_3.43.0_src.tar.bz2 4544635 BLAKE2B 13c99918dd7674fe3f2f0217b39ebe
 DIST FileZilla_3.44.1_src.tar.bz2 4606669 BLAKE2B 407697467d7f9511b1b4e2e11505cf8815dd950609eabf242e283918e577d70f9b732fef930bbe97ba60fdffa484d77e0f7d74bb3ade8d1fcd0296ce91384301 SHA512 fa2e8c65621c7c6003e45f99f5153177e507ca34dde49d86d6f59e8b985abdeb80b779d71e554fc6acb891a695a0ef4c275bf0950af1b4cb67ff5ddb4c51e3b7
 DIST FileZilla_3.44.2_src.tar.bz2 4619337 BLAKE2B 11d61b14fcf464706dabe491fa8cbfa28fb516c3e1aafd887679ed6f1a80ba835dc43403c32b1344854f00f5b56f7e27c72bbca197cfadc92e69d92ebb0b1458 SHA512 9d4678a3a06f0ecac5ecfbae33f83df5f07e26da4f4a7e922fe5b00a5e59d5728af028667f6fa56210a23ecaa1c2a661d1874b218c2511a783644ed2b03e36ad
 DIST FileZilla_3.45.0_src.tar.bz2 4647043 BLAKE2B 9fd164ccbcd80e8d2369420bd00d6e082525ece5e4bd9e0d612f9f2482b080f1c41c250163769539b063207bf038d1cdce9ae3b2588eeae31c6ec2bb1cf296d7 SHA512 4e9683c1ab0fbb2fa1e03e46bbf11564ef9482dad0c302b5d13e083cd5d966662c6c620c24d7eb295e41df36b1d0bd15572fe2a14c194e2245f326c8b6a1d238
+DIST FileZilla_3.45.1_src.tar.bz2 4649083 BLAKE2B 8d3113e5ce96d2115a6ec02109f2617d3d58109464c527284baecacea733d2f564206779cd32be4060171d7fcd8768b0296b445842b8c2964b173ca360983082 SHA512 feb267b85ad2843baea0c6df66ed86866121f33e2295fcb9003a8bc2603ad684f4fe801ea842cb291e3fb5cd7195ccb2d21bfa95711a61be6b4debfd4e1c7822
 EBUILD filezilla-3.39.0.ebuild 1802 BLAKE2B f15137701d47484e96588c8f306511d913e6fb23077e5a72680adbbde91a004ae59bc6f4b084df90a782fcd9fd852845ca0ddbf7457e7f0088631643bca5175d SHA512 f858b3d7b283a215e4a2eeba84f8a1f64959eff1b7c55e14f3eae219cfe3688f3ce319b7c3b924ac6d1c8e49f85397c2e91f85f5726ae325abe04b0d76af8d17
 EBUILD filezilla-3.42.1.ebuild 1856 BLAKE2B b8f950120a699ed5b773f58dbae9b82d93cf5b5e4f2a030a28ee0e796db51c4dee1da5e363eeb70c14d280acfd33d7a4cc00be410e57eb0b040c9bf244d98141 SHA512 1d207f94ce3a81463bdb79f6d027643c06b0c92bb9697e0bba3217f481a458cf7627e2454d66196de77ca28edcf2cf27f599bdcb5f6635ba74e0912373766eba
 EBUILD filezilla-3.43.0.ebuild 1856 BLAKE2B 2ad0b83621a4f350b915bfa058a85bbf478d219bbd10bea8ad0358f1a887b23ee871f2fb922219f74f993d3e4a93fe2d0ce2bb487298df26c561b6353b9b4220 SHA512 e4e992bfed08b5df44658debd65c3f7730ca1cd5dc5264506143af885313761237a749f86a2ad5c0cfb44b5a0bc499eec9f8d36fe53bbc3b30599ec5dd260f11
 EBUILD filezilla-3.44.1.ebuild 1856 BLAKE2B 31c76c3b6c5bfa13797d2daece233435da356a336335d241650f5970e88226a7ad59f388eeb8c3e1dbf49387df2d1c48c1a3f8bde8655ddacbb8469d4e2281cb SHA512 1bf3f77d126b977ffc61914f3d32263854d1a18c2f1c4b1fd3e7d9d750566f2784e4f437cc6364e47fde79066ab9bc3d478cf3c52aa6f82077d60081c396f70b
 EBUILD filezilla-3.44.2.ebuild 1856 BLAKE2B 6b03d65184c14aea243d18e362a8700abf4092cd2836efd59f50070f482d1df7d6465a88d7bd3c02759f310fe434109e5bc5ebf35358e199a35afa155ce0dee8 SHA512 253d2f5cd8f0b74730307951808173a899a03a262f7708b42e324015664fa441bbee948f07f6d7d919352df50446a4aaf386309acce21e0f96f0381bb299b20e
 EBUILD filezilla-3.45.0.ebuild 1856 BLAKE2B 3aa6945f043dbfd09c83e769908d3aa5ba4d60384b008e67b6b0fde57ef3e6fad3b4a898ef026f28a4201ecdd8770504c45cfbcca430874653b2d42cbab6705c SHA512 e2667408e7857988d3ec6b66588c1105a00d5570b76c565968074ad1f892d50e4f67fda7cfee23b7a9df0679142858061c50d41ef4db6329d9d26ecff56bf2a0
+EBUILD filezilla-3.45.1.ebuild 1856 BLAKE2B 3aa6945f043dbfd09c83e769908d3aa5ba4d60384b008e67b6b0fde57ef3e6fad3b4a898ef026f28a4201ecdd8770504c45cfbcca430874653b2d42cbab6705c SHA512 e2667408e7857988d3ec6b66588c1105a00d5570b76c565968074ad1f892d50e4f67fda7cfee23b7a9df0679142858061c50d41ef4db6329d9d26ecff56bf2a0
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.45.1.ebuild b/net-ftp/filezilla/filezilla-3.45.1.ebuild
new file mode 100644
index 000000000000..4f7a1a0848d7
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.45.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.18.2
+	<dev-libs/libfilezilla-0.19.0
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index d32611268bab..ac25704a0732 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,6 +1,6 @@
 AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r2.ebuild 1458 BLAKE2B a2763b32a7389ca38bb21ab08ecc5c57e21d780b19ab15376b691a5b2ca69d8d89f6b3700d2c7dbcfac0c1433e7bfc6dd2d34e2f722d11a320fc03b59a3a167c SHA512 805822794d7e960d2862f95a07b376426351b0a6b6d1d2ef26fcb9fd54b4908900fd1dd0fafae4c917eefd321299d5ae064af0b9e2dea2dfea9cb39302daa696
-EBUILD ftpbase-0.01-r3.ebuild 937 BLAKE2B 1c906ffa3a167f9adeb77833eeabbd92126d0982480b355d0374bfaad71b894a8efb24d276011911f37a01dbc5df8adc5e79d1beb11b0ed8658039285e7e27a5 SHA512 9d178d78df945d6404e67b9f2fe77c0a30f6cc60ed714442d2ef511f7c992dfa7c59b021cb351703a9cdb13a92f9894c7ecb355389717a8ed94c0163ff994012
+EBUILD ftpbase-0.01-r2.ebuild 1446 BLAKE2B a0110890fbe381b7facd47dbef24eecc9d20077e8a162a57aa431f29fe8dde8ea77b9f3259f88b0188af541eb371f239d7b097303dbf14797738f3630af0cd84 SHA512 ce63497757547f916e94e6c42e7e174d30b1a6865011330fb77296d32917707bb3ac406de9e66bcb65186c3040b125db39239d2a1b7a1eb42263db191bc31044
+EBUILD ftpbase-0.01-r3.ebuild 916 BLAKE2B ff3044d2c9411ab76df784d83081bb502ec4556e3b3649b4918ede39975744448db18d1dcf912b45b3f507d8509c7c7354ffdbefd3b30f451061236a513150c4 SHA512 8053ee744deb339d1bc4b93b6fe4ef19c0baf76a4a5edbf8393f7a379dac71481bf2119f64300b335818eaf49ae42c62df5ed623fc3b6db01f8a3d4129e78fad
 MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
index 96a75eac1211..370bb9c1a29a 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -11,10 +11,10 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam"
 
-DEPEND="pam? ( virtual/pam )
+DEPEND="pam? ( sys-libs/pam )
 	!<net-ftp/proftpd-1.2.10-r6
 	!<net-ftp/pure-ftpd-1.0.20-r2
 	!<net-ftp/vsftpd-2.0.3-r1"
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
index c333840faa18..e6aa6b99df8c 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
@@ -11,10 +11,10 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam"
 
-DEPEND="pam? ( virtual/pam )
+DEPEND="pam? ( sys-libs/pam )
 	!<net-ftp/proftpd-1.2.10-r6
 	!<net-ftp/pure-ftpd-1.0.20-r2
 	!<net-ftp/vsftpd-2.0.3-r1"
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index fcb6d21d1725..d7c2b24cec40 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,5 +1,5 @@
 AUX gftp-2.0.19-desktop.patch 837 BLAKE2B a9199ab915aa43dfc9138066da05524020a443f8053aed3e71a910df947f912118f2d82988580e91c4d06c3c3d9169157f887e2f96f26db1f122c5b0033a25e9 SHA512 c71c10eca36e767e4778c4664723f04ea23a20cb6b96e2b0e45c439ed83a1daa325919683663695c17ab26317021090d4855f9f5b6e952f70a400980b0ebfe69
 AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 BLAKE2B 4733b21dae4e801ac9b22c0bf460f0de23ffcc95ca184035cb19ca331e84a0deba9a8d22c8aa67b279cb3b92f9706a08bede3e374659b296598ad5297b3a0e47 SHA512 4ee09d50955fc91dea33bb71d8bd65a7c481f02c7bdf6dce53bbd630307c2ab898b533babe7597b1e434d0defdde3be6e145c0c5344d21e8a23c1537eb5f2bbf
 DIST gftp-2.0.19.tar.bz2 1687167 BLAKE2B b7cd5409c7dfe4672a383417554c39a848b9afa341de498eea76bd02a2099559f14d7d0ceebe13d52842c311a4b242a0d558aa017dd7062a3369a7c2c3af19a0 SHA512 59968786d66aaf6fb520f73d52ed0f8b57751a5ed222a5c65a7257628cd9addfd0ff3213206311bfd24441d7e6cc6d245d74d6687a1ad9739361da61ca078172
-EBUILD gftp-2.0.19-r3.ebuild 943 BLAKE2B 4c2f6d913457a22588b0eca40ccc5b453daa40a8a1e158ccc8d50a3c8a146827c511c44eee3a828d5eb5736a7a1eeb026267261d7af8e652ef2047be9629a600 SHA512 9373c5ee4685fb5dcb366bc47866efad6e4d5dc8f6366c5a954f7de08078c999b1e04078b24234006ee9ae02f4e79cac3c830701b1eb17e7cd096d7fb4642c44
+EBUILD gftp-2.0.19-r3.ebuild 933 BLAKE2B 422c0c19eb70ddc0c631ac93d74a90b03a2841fc0d351e272b648099f5e283933748c564f589de107478be18a1c61de2a3eb99969155405b728ee6ad331d1955 SHA512 b72dc0a2bfc77ad712218caa37ee8ab93c8bc561494aa56e6875bdb51d663a10ed319ae7c238617210bbf7223a386bc44e5b025e2c81654ea047b5a33936897e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index 23abfe2fe2de..57a51c790a94 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gftp.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="gtk libressl ssl"
 
 RDEPEND="
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 9c8c4ed9558e..043c6c69f26e 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -9,6 +9,6 @@ AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd
 AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1fc12afedf9eae52e5aaa34aad518cbee5ab225fca3a524e21efc583ab9e103bb8dafa6c9154da18962d4b03400a939d0 SHA512 a48e46873d9134693452cc55c2562d1a7d7b6bb7124dba061db029e6e1c611ed9787518c86043213629683727cf0fff07afc8ce7298a30fd237941300a1aeae0
 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6
 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
-EBUILD lftp-4.8.4-r1.ebuild 2643 BLAKE2B 96e8ee692fb8804c5183efa1b8a6458bd3f42972b46f818208ae6e4d206a21773a37cedb28b0cab13b0bc5506658957e5b69292af50ba889723c4ac1017ffcea SHA512 1d38b19021814efccc070d48773168f42bf56894752864a34ab1ae80eff607737f09213861d774663cf40bf46bc1b8b02cb73fc71b8d70d7a26a85e27cbfd99e
-EBUILD lftp-9999.ebuild 2437 BLAKE2B 9acf0cd0125d59d96feeb9268f519e56dd5746704ffb9f10c8c77c1c4ca88db53b1c4c862513d71eb483765e3c724f68d51b25144402bcad721ee8c4886f420d SHA512 05ef650aa2470f8a3b00249d552892415f54b5279016db303226133a7ac03e2aaf269116d7da67bde001590a875e8fe4234f1e101cb29e23e7ed3b437b9d8f25
+EBUILD lftp-4.8.4-r1.ebuild 2634 BLAKE2B 98da9f84fb59f04c4f3bb17a0a1e611a28ae376ac36d764386e9380a8390f478f13fe5f01cbccfc6273027008396683c0824e7b16504eca6e8d81e405008a15c SHA512 c02de1c806a914dfaeeec002eacad48e3f1fc23ab00d8ac80464ebb7498dae227a2b4cab3197b80dffa261ecc0de26a74c35c72ba69be0939c027b3962b887e2
+EBUILD lftp-9999.ebuild 2438 BLAKE2B 4061f2513e9a5695288c66590604fafd4641280e9a72a4be1a60d5c9a6337088d082734291f9d54d35083cbff0c634b18495bcd7b963b09abc82a22d6f841a72 SHA512 71a5ab649e24cb8f49d686830bb3a0a56a0cd4cd15d5a563a2fed2592c46ae71f0d3630d3479bf5ac7a8c22e70214523354e054872d0be5145e13ac6efb40e38
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
diff --git a/net-ftp/lftp/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
index a814be2121be..239987fda9a7 100644
--- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
 RESTRICT="test"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	idn? ( net-dns/libidn2:= )
 	socks5? (
 		>=net-proxy/dante-1.1.12
-		virtual/pam
+		sys-libs/pam
 	)
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index ae490e6c7f39..44b55978713a 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	idn? ( net-dns/libidn2:= )
 	socks5? (
 		>=net-proxy/dante-1.1.12
-		virtual/pam
+		sys-libs/pam
 	)
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index e773dc319b6f..b769746c1929 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,3 +1,3 @@
 DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc8106a8618a66eab5d9def258d2ee9c2b709e1a637b9d833513ef87b652f4ab0ff518dc9d67d90a7dd43941d3c SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199
-EBUILD ncftp-3.2.6.ebuild 1058 BLAKE2B 2d63b053ffd75968f7e19b4c27511e510293a7171382b08c4714740d6ea3b8025ef78fca819b1747d1a50156048e53be730392c59ef838fbc4bbb322ccf08768 SHA512 3425f30eaa416e7a03f25de9914e0d814f9104fec7714cae9dfbc9ec06121b8a5367831914fe1b811e0330e2fda50a11a1554413c603b60a8f8bf7565178659b
+EBUILD ncftp-3.2.6.ebuild 1048 BLAKE2B 866ebac7950de5ff4a62c71f3d3a6d2a4ff9555938631e7504d386b9c9e551cc49252cad2be8af9c6d47cf7ef3adb4a935cea4eb38989e0c75e80b6ca16586b3 SHA512 7a468af48b1a9598fae257c7b691323c2b24185480ff5d838cb15a0edc1adb66edeec038b6cab5c9544d1a68a866c05cca9d772266e4695543ffa08d30c8d883
 MISC metadata.xml 738 BLAKE2B 98d564b3063dd25384758125efec702f385768f3f0c4066ef5b0e6748f9c27d0ef838c4a669e7113bbb70ff74882b1d4c3b0e09011f3ff5f01dad3eea56c6b16 SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3
diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild
index 6186cd069fa7..b590ebd27be8 100644
--- a/net-ftp/ncftp/ncftp-3.2.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 1d822ef05a45..f1e59d6d681c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,3 +1,4 @@
+AUX proftpd-1.3.6-EINTR-like-EAGAIN.patch 2271 BLAKE2B e040216b0c7fa3590b26f62363680e56b01c6d88bc22d878ab1a29370b3916af569f7a50800d990135826cd7cc371f38d9619a775d97bd717ad8a52ee7e25e04 SHA512 699a42fc05b64309f55e3d4f2e9b5acc3cd05f4e81ec724227ff7a0800d62f00cd08b05fe6a806735e854b4eac01e0bb2192f7469fefd94c7f0981ed3472cb14
 AUX proftpd-1.3.6-mod_copy.patch 3069 BLAKE2B 08b9afdfa32e17d50d1762f4bf8a932b4c5106b91814b707b92e5745835f79c569d07ee18021c53aa961970a7167760a90e967388f0ac64956cde3899d72942c SHA512 2df01ce88d340b097523c10e0287c0a02484daaa11c3acd8975471c2cd346429fe9ef84f372943251af264d8d2713dfd1d259fb7fb30bc6aa75fab7559e8b4ef
 AUX proftpd-1.3.6-mysql-8.patch 750 BLAKE2B e8d9a48b2af603f1b50298ba5102242d575eb9b2321508a574ec3e6e0a0e54d058d248706aa2bfc9b85172ee6404ce5e16354e600e5332d8bc388649d10751e9 SHA512 15213f045427611f8ab5af9e064f4aadd448514a1789558f65c83b0703710df547178c15b254a368c1913c82d9fb533c47fd95d42326527809d4150191869bdd
 AUX proftpd-1.3.6-sighup-crash.patch 2145 BLAKE2B 60e24fe7f8ee4fdac4a95b73c5e6d76862d6163e6dfbc1a15970f18ab6a38e715bace0adad487606a29dc9de39bbb2987b3d4c5e0283d6468864f877c2030b6f SHA512 d16515e7bf14d1d3a147b93fea330b0342db3ad501f366dd4f1d872262829902cb3c197fe68b20b86048bc3bbe0e5c22470d6d81bf08c72c192a33770c3d499a
@@ -19,5 +20,6 @@ DIST proftpd-1.3.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbc
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
 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
-EBUILD proftpd-1.3.6-r5.ebuild 8705 BLAKE2B 0176ff479e7f829d8fd0513d15471f65c3671f30e1971fe1880e0c190112cf1e834ed7c78fe890ded4fb50e41efb1b0fec97a98eee8720eaf5009a5c39ee3ced SHA512 147205e27f2378a740174e73f523b1f86f7d2c3d8f6976026a64bc71b83e992e9db2fa11230f913f0157510a69ba34bc73455770aae9e0737fd820591112e1e7
+EBUILD proftpd-1.3.6-r5.ebuild 8696 BLAKE2B c03fabf7f49be982302ea74eee75580304dae1393d7a452e9aacadfb5790b6b49a82320999ef4a9863f90e26d48788301ae423262172d3f1c04a5e18008cf0e9 SHA512 e64ad6c8e38b8b81dfc1dcef02c05e0ae591972baede8642df393b521499652075e2c970e6cd33cc1bda2e0f853dc79ea7277ba85d4a5df4ce081cb540d323cc
+EBUILD proftpd-1.3.6-r6.ebuild 8756 BLAKE2B f38b4a1066f45b044497f72f4f7467e09c7fcec70cb68ac09095f65aa872f8d4c91124007c6f62bf04e88fec45e56b3a687936fef476ac5f8ca182a241cf7328 SHA512 6a7963148c4526cf8234ffc964165f290968d1164b140e4e85764248140c990efc58217f87b58f18c18cfb7998294347747d5dd884af92b3d4c216b694141898
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch b/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch
new file mode 100644
index 000000000000..43608d96492c
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/695972
+https://github.com/proftpd/proftpd/commit/f09f0c661621eb22cb1ce579194478007ba62866
+
+From f09f0c661621eb22cb1ce579194478007ba62866 Mon Sep 17 00:00:00 2001
+From: Justin Maggard <jmaggard@netgear.com>
+Date: Tue, 10 Oct 2017 18:20:06 -0700
+Subject: [PATCH] Bug #4319: Treat EINTR like EAGAIN
+
+This bug described a situation where an ongoing transfer would be
+prematurely aborted when one of our timers fired.  The timer could have
+fired for an unrelated reason, but if we were in the process of reading
+or writing with pr_netio_read() or pr_netio_write(), those calls would
+be interrupted with errno set to EINTR, and an error would be returned.
+Then pr_data_xfer() would abort the transfer.
+
+EAGAIN was already being handled properly, and we can just use the same
+treatment for EINTR so that we only respond to the timers we should
+actually care about.
+---
+ src/data.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/data.c
++++ b/src/data.c
+@@ -1143,7 +1143,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
+         while (len < 0) {
+           int xerrno = errno;
+  
+-          if (xerrno == EAGAIN) {
++          if (xerrno == EAGAIN || xerrno == EINTR) {
+             /* Since our socket is in non-blocking mode, read(2) can return
+              * EAGAIN if there is no data yet for us.  Handle this by
+              * delaying temporarily, then trying again.
+@@ -1265,7 +1265,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
+       while (len < 0) {
+         int xerrno = errno;
+ 
+-        if (xerrno == EAGAIN) {
++        if (xerrno == EAGAIN || xerrno == EINTR) {
+           /* Since our socket is in non-blocking mode, read(2) can return
+            * EAGAIN if there is no data yet for us.  Handle this by
+            * delaying temporarily, then trying again.
+@@ -1362,7 +1362,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
+       while (bwrote < 0) {
+         int xerrno = errno;
+ 
+-        if (xerrno == EAGAIN) {
++        if (xerrno == EAGAIN || xerrno == EINTR) {
+           /* Since our socket is in non-blocking mode, write(2) can return
+            * EAGAIN if there is not enough from for our data yet.  Handle
+            * this by delaying temporarily, then trying again.
+-- 
+2.23.0
+
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 679d8c8859e4..738991828ea1 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
@@ -54,7 +54,7 @@ CDEPEND="acl? ( virtual/acl )
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:= )
 	sodium? ( dev-libs/libsodium:0= )
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild
new file mode 100644
index 000000000000..050cf75b3bbb
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.11rc"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.6"
+MOD_MSG="0.4.1"
+MOD_VROOT="0.9.4"
+
+DESCRIPTION="An advanced and very configurable FTP server"
+HOMEPAGE="http://www.proftpd.org/
+	http://www.castaglia.org/proftpd/
+	http://www.thrallingpenguin.com/resources/mod_clamav.htm
+	http://gssmod.sourceforge.net/"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
+	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
+	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
+	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
+	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
+	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
+	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+CDEPEND="acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcache? ( >=dev-libs/libmemcached-0.41 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nls? ( virtual/libiconv )
+	ncurses? ( sys-libs/ncurses:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	pam? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
+	"${FILESDIR}"/${PN}-1.3.6-sighup-crash.patch
+	"${FILESDIR}"/${PN}-1.3.6-mod_copy.patch
+	"${FILESDIR}"/${PN}-1.3.6-mysql-8.patch
+	"${FILESDIR}"/${PN}-1.3.6-EINTR-like-EAGAIN.patch
+)
+
+RESTRICT=test # tests corrupt memory. need to be fixed upstream first
+
+in_dir() {
+	pushd "${WORKDIR}/${1}" || die
+	shift
+	"$@"
+	popd
+}
+
+src_prepare() {
+	# Skip 'install-conf' / Support LINGUAS
+	sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
+	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
+
+	# Prepare external modules
+	if use case; then
+		cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
+		cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
+	fi
+
+	if use clamav ; then
+		cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
+		eapply "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
+	fi
+
+	if use diskuse; then
+		in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
+
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
+	fi
+
+	if use msg; then
+		in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
+
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
+	fi
+
+	if use vroot; then
+		in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
+
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
+	fi
+
+	if use kerberos ; then
+		in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
+
+		# Support app-crypt/heimdal / Gentoo Bug #284853
+		sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
+
+		# Remove obsolete DES / Gentoo Bug #324903
+		# Replace 'rpm' lookups / Gentoo Bug #391021
+		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
+			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
+			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.in}  || die
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
+
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local c m
+
+	use acl && m="${m}:mod_facl"
+	use ban && m="${m}:mod_ban"
+	use case && m="${m}:mod_case"
+	use clamav && m="${m}:mod_clamav"
+	use copy && m="${m}:mod_copy"
+	use ctrls && m="${m}:mod_ctrls_admin"
+	use deflate && m="${m}:mod_deflate"
+	if use diskuse ; then
+		in_dir mod_diskuse econf
+		m="${m}:mod_diskuse"
+	fi
+	use dynmasq && m="${m}:mod_dynmasq"
+	use exec && m="${m}:mod_exec"
+	use ifsession && m="${m}:mod_ifsession"
+	use ifversion && m="${m}:mod_ifversion"
+	if use kerberos ; then
+		in_dir mod_gss-${MOD_GSS} econf
+		m="${m}:mod_gss:mod_auth_gss"
+	fi
+	use ldap && m="${m}:mod_ldap"
+	use log-forensic && m="${m}:mod_log_forensic"
+	use msg && m="${m}:mod_msg"
+	if use mysql || use postgres || use sqlite ; then
+		m="${m}:mod_sql:mod_sql_passwd"
+		use mysql && m="${m}:mod_sql_mysql"
+		use postgres && m="${m}:mod_sql_postgres"
+		use sqlite && m="${m}:mod_sql_sqlite"
+	fi
+	use qos && m="${m}:mod_qos"
+	use radius && m="${m}:mod_radius"
+	use ratio && m="${m}:mod_ratio"
+	use readme && m="${m}:mod_readme"
+	use rewrite && m="${m}:mod_rewrite"
+	if use sftp ; then
+		m="${m}:mod_sftp"
+		use pam && m="${m}:mod_sftp_pam"
+		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
+	fi
+	use shaper && m="${m}:mod_shaper"
+	use sitemisc && m="${m}:mod_site_misc"
+	use snmp && m="${m}:mod_snmp"
+	if use softquota ; then
+		m="${m}:mod_quotatab:mod_quotatab_file"
+		use ldap && m="${m}:mod_quotatab_ldap"
+		use radius && m="${m}:mod_quotatab_radius"
+		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
+	fi
+	if use ssl ; then
+		m="${m}:mod_tls:mod_tls_shmcache"
+		use memcache && m="${m}:mod_tls_memcache"
+	fi
+	if use tcpd ; then
+		m="${m}:mod_wrap2:mod_wrap2_file"
+		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
+	fi
+	use unique-id && m="${m}:mod_unique_id"
+	use vroot && m="${m}:mod_vroot"
+
+	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
+		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
+		m="${m}:${PROFTP_CUSTOM_MODULES}"
+	fi
+
+	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
+
+	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable caps cap) \
+		$(use_enable ctrls) \
+		$(use_enable dso) \
+		$(use_enable ident) \
+		$(use_enable ipv6) \
+		$(use_enable memcache) \
+		$(use_enable ncurses) \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable pam auth-pam) \
+		$(use_enable pcre) \
+		$(use_enable sodium) \
+		$(use_enable test tests) \
+		--enable-trace \
+		$(use_enable userland_GNU shadow) \
+		$(use_enable userland_GNU autoshadow) \
+		${c:1}
+}
+
+src_test() {
+	emake api-tests -C tests
+}
+
+src_install() {
+	default
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
+	rm -rf "${ED}"/var/run
+
+	newinitd "${FILESDIR}"/proftpd.initd proftpd
+	insinto /etc/proftpd
+	doins "${FILESDIR}"/proftpd.conf.sample
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/proftpd.xinetd proftpd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
+
+	docinto html
+	dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	systemd_dounit       "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 777b74aef3dc..b020c238ea5f 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -9,8 +9,8 @@ AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda
 DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
 DIST pure-ftpd-1.0.48.tar.bz2 487653 BLAKE2B 6edf1ae191fba657907121a0ff6d57cfaf1df2b237fcd66f8523cf84b9fbcb737752624c031f33ca16b8d0c8345391fa876556ccfb8027cfb3c7d36045e0649d SHA512 eabcc8ba6d37e3aceb57871e80129a1db1a3ea7d2b9f57626a21f42b4978570a84006a941fe254b6af50b2432d1d391725ea512f7569fcaecfa7eb77179c2f54
 DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef
-EBUILD pure-ftpd-1.0.47-r4.ebuild 4097 BLAKE2B 98a2d3ea239d600917e647d3c58e722144cfdeb2d09ddf7ba7fb6803b58f9b6ca5c777c9b5b28b158c8e55b21d3a4488f8c0dda26ec7d0e1c2bf826d8a5488ff SHA512 fc743d0ca9db2c752defb7a18034595ab2b50e6bc46484a1272d1141914be4c0d007a6d85b18ebf8aec4f230c00a3818eed8dc5e17f6bc1893c4a29973a6afd2
-EBUILD pure-ftpd-1.0.48.ebuild 3845 BLAKE2B 56a14f48d7956335dac49ee534b7a153fc1188d88cd6a851cd1cde706096c3da722c567877b5eda406eac41ac9ba68e9b1b3bb4c0e1131b3fcc2106a4dd21597 SHA512 ae59a7fab14bed0931a7eb36e31cb7dec6670d0773ac4cf42b6a2a6c5e9f1efda42fc298e296982edbff0b263c33432439e16fd87a67d2b405ad20e5e89e5570
-EBUILD pure-ftpd-1.0.49.ebuild 3845 BLAKE2B 56a14f48d7956335dac49ee534b7a153fc1188d88cd6a851cd1cde706096c3da722c567877b5eda406eac41ac9ba68e9b1b3bb4c0e1131b3fcc2106a4dd21597 SHA512 ae59a7fab14bed0931a7eb36e31cb7dec6670d0773ac4cf42b6a2a6c5e9f1efda42fc298e296982edbff0b263c33432439e16fd87a67d2b405ad20e5e89e5570
-EBUILD pure-ftpd-9999.ebuild 3845 BLAKE2B 56a14f48d7956335dac49ee534b7a153fc1188d88cd6a851cd1cde706096c3da722c567877b5eda406eac41ac9ba68e9b1b3bb4c0e1131b3fcc2106a4dd21597 SHA512 ae59a7fab14bed0931a7eb36e31cb7dec6670d0773ac4cf42b6a2a6c5e9f1efda42fc298e296982edbff0b263c33432439e16fd87a67d2b405ad20e5e89e5570
+EBUILD pure-ftpd-1.0.47-r4.ebuild 4098 BLAKE2B 93c666f13b86af87258fc2c827d67979a905efcd7246b4a3bdb4642eb05221582b476eb4a5b234f28c0c26beaf81641ae49d2dfa0f5b3be6ea2a0c656801e43b SHA512 9e87cd8db2d70d42dbbc900d82c3dc9399e8319dc66dba338f58d82fb9d53a843005834ad0ffa286f4d4aa3c42848a766bd9f1389c8f171473fefb2704ccb4a6
+EBUILD pure-ftpd-1.0.48.ebuild 3846 BLAKE2B dc5f70aab97afac2562ec71ad1d53cb1f3f8d234c4a938fc4a6424c01b1b41fb649c870984454792733c5eccae9b8a07fea6783fddc26778b21c81ed0e4e89c7 SHA512 da6fdc53427d5079b0b6d7b0447498f3f0c4e79d7f4d8836a360737a9be689f6dcb329ec13c62fafc569f43107c00b7138dce43249c8da9dd1ca161468e8be0a
+EBUILD pure-ftpd-1.0.49.ebuild 3846 BLAKE2B dc5f70aab97afac2562ec71ad1d53cb1f3f8d234c4a938fc4a6424c01b1b41fb649c870984454792733c5eccae9b8a07fea6783fddc26778b21c81ed0e4e89c7 SHA512 da6fdc53427d5079b0b6d7b0447498f3f0c4e79d7f4d8836a360737a9be689f6dcb329ec13c62fafc569f43107c00b7138dce43249c8da9dd1ca161468e8be0a
+EBUILD pure-ftpd-9999.ebuild 3846 BLAKE2B dc5f70aab97afac2562ec71ad1d53cb1f3f8d234c4a938fc4a6424c01b1b41fb649c870984454792733c5eccae9b8a07fea6783fddc26778b21c81ed0e4e89c7 SHA512 da6fdc53427d5079b0b6d7b0447498f3f0c4e79d7f4d8836a360737a9be689f6dcb329ec13c62fafc569f43107c00b7138dce43249c8da9dd1ca161468e8be0a
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild
index 7091bdd479ed..e1e9feb5178d 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild
@@ -26,7 +26,7 @@ DEPEND="caps? ( sys-libs/libcap )
 		dev-db/mariadb-connector-c
 		dev-db/mysql-connector-c
 	) )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.48.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.48.ebuild
index 30e10ab43e3a..5f4d78cdd36f 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.48.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.48.ebuild
@@ -29,7 +29,7 @@ DEPEND="caps? ( sys-libs/libcap )
 		dev-db/mariadb-connector-c
 		dev-db/mysql-connector-c
 	) )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49.ebuild
index 30e10ab43e3a..5f4d78cdd36f 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49.ebuild
@@ -29,7 +29,7 @@ DEPEND="caps? ( sys-libs/libcap )
 		dev-db/mariadb-connector-c
 		dev-db/mysql-connector-c
 	) )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
diff --git a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
index 30e10ab43e3a..5f4d78cdd36f 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
@@ -29,7 +29,7 @@ DEPEND="caps? ( sys-libs/libcap )
 		dev-db/mariadb-connector-c
 		dev-db/mysql-connector-c
 	) )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index acad0ab5f72f..2e0c6183bd05 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -4,5 +4,5 @@ AUX tftp.service 119 BLAKE2B a2d50dba1103fb7c868e070331c8a2000e65364801abc85d969
 AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e4209e83e7d6d273583b2cd9104ba611e3acca0018d915f4313860039a3b0003e556f49f82917ef1 SHA512 d49cdbb7e265aa98d989f8ae96e2c80bfd5887ae0efc6bfcd726d5fa4d83ffc480f5f374e30b8564b05d9690eb2a0c0ed0077982a74946edfbce5d19066d0564
 AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5
 DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394
-EBUILD tftp-hpa-5.2-r1.ebuild 1313 BLAKE2B 8298b1ff2e483c46f26d1f5dc694021c6788513d462567f2cb39421567ee8eb3130db841b3105c1124f19c39a842497e3980d20467bb0e4666fe256d4b770d44 SHA512 4c1c1ca350efc504dcddb5268bc8699ac38fa40995216f4dcec8268510fd5b7b9f1bd2cb80271be3569bfdf9f8b29bcc8ec3eeff0e2e28a905f1939a1025420a
+EBUILD tftp-hpa-5.2-r1.ebuild 1314 BLAKE2B 69222c38c7f2a5162a3895a2142b06c724ffac4f830e7ead107083843ee03391f6f4097557fb56e04e53f25e80a793369e85fe08455455b09ad0949765634eb4 SHA512 ea75db5ccddec62558244a0bd0c261d993370eed42232c8c38a2f75589bf2264f7f8e19a13afd2f96984005f5880d8c050ab7924b293fadf593c1c4d287d82af
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
index a0de442dd025..d34763b41f02 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -7,11 +7,11 @@ inherit systemd eutils toolchain-funcs
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/"
-SRC_URI="mirror://kernel/software/network/tftp/${PN}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
 IUSE="ipv6 readline selinux tcpd"
 
 CDEPEND="
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 563d795c536d..2448a38dab4d 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,5 +1,5 @@
 DIST tnftp-20141104.tar.gz 613180 BLAKE2B d9882b7793873abcd0cd00273a29adb2427ea5cdab822c744b02de08ccc88fb62a064ff42ceeec3ea20df68101a2ac5c8cb34bda8c9948078aab2f19f4206fab SHA512 e3d99215d36d27d3d841d946975c2a2723c6ca227cc7d9469f30dbc398f32bdd5c0922933dd12d9e822d7e85826a74619fb7712a6c5a97d1ee721c79d5728d55
 DIST tnftp-20151004.tar.gz 613482 BLAKE2B 3f63a4a57d11b4bfa871fdcac0de6cd4f20743f0e4e02c2b36d341c72dd12d45227ab813c59704b5da07cfed35f2e6e7777c9f34896960bc8f2acbb8ed46acbd SHA512 0702dc26c072599eebbe8731924452575eab93ab72245d4703497daa6e5e4a2c050b28278c0a20b4dbb86cee25949f216fc80a581ed73457a78c1616f484ed6e
-EBUILD tnftp-20141104.ebuild 830 BLAKE2B 9d0d11b45c8ba533f2eeec8c680c3afcd1b1db453ba4c47afe4de3d31a67f9f6397917f0444a17f99e95caeec3e88ba9297e57253a4c775dc8f6948fefae5cc6 SHA512 73391c0064f2b44ba6294110061ad4512749f41ee07d1c2c84674a8f54474ce4e21be254b0783d20a29c6c5578ed126af02d43c243b58e7f778599ad6a0da266
-EBUILD tnftp-20151004.ebuild 833 BLAKE2B de6caf1e04d308bb24397dafcd7a8fdb60a330f991098fe9158b0dc88aa6ba8ed90510616b537faebfba1f2824f200ea26dc9b2d90b38abd5f7ac22226eb82d9 SHA512 2a5032e2360498784849c6666696f62bf59fd9b1e6578d31cb61a177ea4a3c25e0639f40cb03164a24970b67ffc147f057090a4273c150b2b1e2ca2d28bf9b3e
+EBUILD tnftp-20141104.ebuild 820 BLAKE2B d50d124b4eb8512de19d818611f9107d592336dd88b277553e44e1b5aceb75439d434f5fc49c781c0b19e3f9de1e16d95993cf5af03cc8d8b7626bfa5ad26357 SHA512 415a04d5ff242d2754430d6f6a0e0191c164df5da555cdc2dbaeac59b0e22875cf2e5142d02ee11a4267ed1bc2904a9e342b0620fcde33690326856e2e8d3d39
+EBUILD tnftp-20151004.ebuild 823 BLAKE2B 814d04766c0d521c8d3751c5722b43223cc2f0b2769f4582be9fc7392dede79d4888e4072046c867476f0610777d23adf76d50f97cff866105605deecf19bd3e SHA512 d75302490a31cea1297e1423b5fc03651c5175063eacdd43dce6fa3298fe36e086e1fa35169f8e63082452169cbca59114ce7554f1433ba9f3aeb557c6b0320f
 MISC metadata.xml 244 BLAKE2B b8494e7c2226498b1c13fbe3ed6fee9604ac640c457c28d1068d8ecdcdf020979e3839c7de35b3839763cf45ee9c9cc92f7885aa2db543d18ae51861fc648b4f SHA512 adc80bf7dbc87f746bd124d3c0c2d6d2191501671ae7f944dfb34aae5343b2fa66a796ca8df729a9661e7c97113f6a2fbb6007f67c8f0aa6d67cad771a22d13a
diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild
index 4e837a6af1dc..d36fa9f33364 100644
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ b/net-ftp/tnftp/tnftp-20141104.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 
 SLOT="0"
 LICENSE="BSD-4 BSD ISC"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 socks5"
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
index 5751cef0d265..c39d0e1b907c 100644
--- a/net-ftp/tnftp/tnftp-20151004.ebuild
+++ b/net-ftp/tnftp/tnftp-20151004.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 
 SLOT="0"
 LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 socks5"
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index b071b4647a50..3decd6d42ad1 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,7 +1,7 @@
-DIST uftpd-2.6.tar.xz 93532 BLAKE2B 472b6dec74d5df50a93c27f85cff1ceff9bac8bcf3343d7ca7842e2bd51813ba8c0b5b679062eba5dccca0d5ec586302ad7889dd69273b4e08fe6330d70b7dbd SHA512 56e893cda1e807b01021130a763d6409a0e480f7dfb03e3ac9378d76d459a38c9c602d7fac523c3cf353fe972a61e2f8c131003e7dd0c07e5588f3a18b3e3c4d
+DIST uftpd-2.10.tar.xz 161948 BLAKE2B 9a6c72758e12cf8190b9aaea72c337997bd544c4fbee1f6de44de178e698ccf2eb1ddfcb0b48de23ebe669aa2d0d0d74ae0510b48e8e3f2b4d50d3f39f4e9901 SHA512 d9fbeca46b7bf8cbc258e501591e1e1af26ed380578276eacc2fdf0331cb66bbee6e715ee3d2021366b7884022f2e733b6d676f72649e97acff7d8dc3045be9e
 DIST uftpd-2.7.tar.xz 161608 BLAKE2B fb759cb4e3f0495ac28bd84c36f46a7ff54565d729602427b2b44d0fea5b42f97df5397e095d4c3c428bbe87d97dced470f93129c8bf84c348a6e15bb226329c SHA512 0cdf7ba82fec53d067baf15c7ad84bbdfeb9dfbba4459c9eca497915f987d44573db0c47db451abd2b5936fd3135e7644ce0c734c6efe2c8e3ad5c172f5137ac
 DIST uftpd-2.8.tar.xz 160920 BLAKE2B 53816a12e23fa5ebf80590c51ac5d713f84ef452248da3849116236cdf26e84b2aed91c92df49dc2346593f3b9b3536a681b869cbbb6ada60419fc233c54bd71 SHA512 d6668729f572fc62cd4060b9fbff26bdcd4055d6faf2f733e4f54c160783d573e808e4ad09341b25571ebc983aa19ada11a5513ab986742cbd12883cc495329c
-EBUILD uftpd-2.6.ebuild 513 BLAKE2B 40927218cccbe80700c23723d4f96e2134e76039bbe2dc6887e9b743f4397f7af5ebd7b2afb37e12f5731be4d7b6217e0f02c24c7a731cd9f52bef4859c4a31a SHA512 b836ceee94a9b610c50ae864b320830cb2855093e4fa922caf5fbd7c8767f63a1b4fce0db196d1a2d20df5cbe88da12d78f16561aaa670c16169b5e32056327b
+EBUILD uftpd-2.10.ebuild 454 BLAKE2B c69bf9e3e15ce56b12991305dc30a77185ce80fcbe9a6101f4105c6975143bfbedbed20723abb2c21057d543dbb1cc7c8725b1ffad04a231c17e4d85fe68586e SHA512 1115d7ab9a907c509efdc5c5ea19fb31f4f5684226e4d9805e7e8f5053cc0f6fd2082db5371882f684502f88f1c68da87f25a54970b5d85ad1329a5854f9d81f
 EBUILD uftpd-2.7.ebuild 522 BLAKE2B 7838d70f6397faed4708105708d8cc6917ffa512bf64630f724e07bb4c34e3bf3356afb01fcc600ba684ac35945e520d40a3e3839e490bfba0d4d267fbf5b03b SHA512 4e91bf8b5b6ce5c6b84ecf16be508c43c60b9ae2d8a6ba18faee2c96eee697da280528c6619129f7205fbd20410258e162aadc1ef85db51620bed510dacfd803
 EBUILD uftpd-2.8.ebuild 522 BLAKE2B 7838d70f6397faed4708105708d8cc6917ffa512bf64630f724e07bb4c34e3bf3356afb01fcc600ba684ac35945e520d40a3e3839e490bfba0d4d267fbf5b03b SHA512 4e91bf8b5b6ce5c6b84ecf16be508c43c60b9ae2d8a6ba18faee2c96eee697da280528c6619129f7205fbd20410258e162aadc1ef85db51620bed510dacfd803
 MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.6.ebuild b/net-ftp/uftpd/uftpd-2.10.ebuild
index db164de0144d..5f894de40797 100644
--- a/net-ftp/uftpd/uftpd-2.6.ebuild
+++ b/net-ftp/uftpd/uftpd-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,14 +13,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	dev-libs/libite
-	dev-libs/libuev"
+	>=dev-libs/libite-1.5
+	>=dev-libs/libuev-2.2"
 
 RDEPEND="
 	${DEPEND}
 	!net-misc/uftp
 	!net-ftp/atftp"
-
-src_install() {
-	emake DESTDIR="${D}" install doc_DATA=README.md
-}
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index d1f427f24551..83624b3e98fa 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -15,5 +15,5 @@ AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba
 AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e2642fe37aa122b59c0a3fe509d00a5435eaf4c300962c9cb5712b083e7d7d927ffbc148d0bd6a5b8 SHA512 30fb4ae07f55011b9b29625db072062a0f1df4f1c7578041231f35febfb90ad2d2dfe1deb964e34fde5c660f0e3ffc3df3d77af1b2f3a1f724176f691a53a182
 AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-EBUILD vsftpd-3.0.3-r2.ebuild 3702 BLAKE2B 65c8a9dca3d4dd9340f44a879a4a213039afd30cb9389570d14427b8e09c29cb5df693f154efa0e2ca36aa55a8c2d5c7e3027e60de2e8513fdce83a2ee3e7a97 SHA512 7b3a1c477ecc8c9ae7243a488cd8fd426e0b64ba37579a612a52a98d31d0e90bbd7469d42b520c5d1b23748a4eee2307056542b4632ee852907270881569e487
+EBUILD vsftpd-3.0.3-r2.ebuild 3690 BLAKE2B 77d886e438d678a19b00d6306abaf0fc4c295e1ba5ca275573ea2563a7dbff915c18c8a00dc78f73717db3d3664269cb72c1d14f0cef549fb72ba03e8b6e3b83 SHA512 892090dda11710bfd611bfd8cdb4685153563d7a7adcec2a7ac48a77d898d0ec9e625f7fa49cb485ac00428171ec78abe5a8fd07328134ca45c61d71d938ea21
 MISC metadata.xml 289 BLAKE2B 3792154c21dd99e4a6e68a711493e3086ddf124a40275c43d8d6aca47f01dd76e7992eea16b235302d83529483a13843c8fb254ae2e436e9c2bd398908d65bcf SHA512 89cacd404713612a2347edb25dccf6c25c565d2b18ecdceb8614b5b5c5a913cd5ac0fe0b2ca32918854a69817e7b43300612eb6248655b59cf147b6d03922360
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index b821c334513e..6559c9946105 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,11 +11,11 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )