gentoo resync : 15.12.2019

24 files changed, 362 insertions, 432 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 8253f3fe382c..b6d211421488 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index fe6477e28165..9e5295522568 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,16 +1,10 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
-DIST FileZilla_3.42.1_src.tar.bz2 4987250 BLAKE2B 8cc6fd0a0cec336f34793520fe4be52a36a91ba5a4a3d41092d78c00a25899f73abd03f8d6339da40bc98a618dbae98063de2844a83cacb1431fc53f3b962383 SHA512 0dc9b3a6347803f60a71c56bb759700fb2b1b019dc29794aa639ce892ccd1ae53041112987f9d5e8e75ec7e07702a5aac8e1c131796bbc5f210d75d286276deb
-DIST FileZilla_3.43.0_src.tar.bz2 4544635 BLAKE2B 13c99918dd7674fe3f2f0217b39ebe7aa89effe411e3cf90e08c9177278ce143ac84a021e49be0bc0772af29a5c34c33b03ce93d54f0b9918e4ea1001875ea48 SHA512 12c518616508e1cbd7ab60f1b94f8c876c885bc4399674c4b2df34235141fde1297a1edc686078c0f93b040ea6e42984c22ace00c4da201c7f99b4c9b71f5bc1
-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
+DIST FileZilla_3.46.0_src.tar.bz2 4661100 BLAKE2B ccda60b590e85afd7de0edd064ee7b993e663e43643f262378db6d26a019730ec493518e0e2b39bce0710acafe888f47f84ecb098e35d3b32061f089a99a6a30 SHA512 26ffb039b4a6d51d6d1011ee452f3690f74514c91a9e58c79880dbf778296cfc81283fade52f65f81654b828449e2b7e703b1d6c1e2e84c08f54681d2aa92674
+EBUILD filezilla-3.39.0.ebuild 1830 BLAKE2B f3456ceeac58ed5fb0ebdb16091bdfd64282112179c74849cdef2750ef8b70217a747945f193b4852568c0cd7d022e155e3d5a9e8c829162c4405a09fce05576 SHA512 76ecbf6aee36f8000fdbcdfdee9fbc55628c5b6885148d4726a3cdc64be9a21272c0351fd39315fb54aea7215d7a5b5f71828fb7359aae201a5422f8a9c4ce5d
+EBUILD filezilla-3.44.2.ebuild 1884 BLAKE2B 5175bcabdcbb34dc8c6c2ee967b4aa2a487f04a5148469656b8f8014e325d5055cef22103d808a92d2323549b02d1b2cc8fd3a02fed89109ba604b36f378596d SHA512 25ca53bffa1e9729e4f9f3613f7b81582842fdd1bd076905a841bf1f993b8564d67833691316281f4603a6c93ac573ec626431e334d7f2de6d97a09ccb3d2485
+EBUILD filezilla-3.45.1.ebuild 1888 BLAKE2B 3a89bb7289cdb392e74572a707621c30afbdfacb3cb93510d18683a07039b286ede6ee8b62c63ee64f1c31bf1bc80f959a0fbbbcbbf2452cc46b87abf3c50c6b SHA512 ff7bdce8a143dd46860cd112283f69e02251b79879c12e850945b0f03af97bcbfac4400b789cc045c735d01bd2fde9203e58a0019fe2fe502a318fdb29dd1e51
+EBUILD filezilla-3.46.0.ebuild 1888 BLAKE2B 9682974c356117d373fa3b0db1f702689e779703152651190d5d667131cd6f2c573943e485d79221e2c86d5bb751035df2f91bccad436e93ab2fc37e002c13ce SHA512 cc272b8acdb871132fba72529fd3afcedae057502da09eb00b4740e21dda814a68d534c3697ceabaa288382cf266877abacbdd78a5082a39a7afc89b482a1be6
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.39.0.ebuild b/net-ftp/filezilla/filezilla-3.39.0.ebuild
index 73d5f0b6ec99..94eaa9c0660f 100644
--- a/net-ftp/filezilla/filezilla-3.39.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.39.0.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.11 )
 	test? ( >=dev-util/cppunit-1.13.0 )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 DOCS=(AUTHORS ChangeLog NEWS )
diff --git a/net-ftp/filezilla/filezilla-3.43.0.ebuild b/net-ftp/filezilla/filezilla-3.43.0.ebuild
deleted file mode 100644
index fcb905143ffe..000000000000
--- a/net-ftp/filezilla/filezilla-3.43.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.17.1
-	<dev-libs/libfilezilla-0.18.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/filezilla/filezilla-3.44.1.ebuild b/net-ftp/filezilla/filezilla-3.44.1.ebuild
deleted file mode 100644
index 564462ccd07d..000000000000
--- a/net-ftp/filezilla/filezilla-3.44.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.0
-	<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/filezilla/filezilla-3.44.2.ebuild b/net-ftp/filezilla/filezilla-3.44.2.ebuild
index 2b4fb7350c29..1231209ea1f5 100644
--- a/net-ftp/filezilla/filezilla-3.44.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.44.2.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.11 )
 	test? ( >=dev-util/cppunit-1.13.0 )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 DOCS=(AUTHORS ChangeLog NEWS )
diff --git a/net-ftp/filezilla/filezilla-3.45.0.ebuild b/net-ftp/filezilla/filezilla-3.45.0.ebuild
deleted file mode 100644
index 4f7a1a0848d7..000000000000
--- a/net-ftp/filezilla/filezilla-3.45.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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/filezilla/filezilla-3.45.1.ebuild b/net-ftp/filezilla/filezilla-3.45.1.ebuild
index 4f7a1a0848d7..a77103b6f2a8 100644
--- a/net-ftp/filezilla/filezilla-3.45.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.45.1.ebuild
@@ -23,8 +23,8 @@ IUSE="dbus nls test"
 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/libfilezilla-0.18.2:=
+	<dev-libs/libfilezilla-0.20.0:=
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.11 )
 	test? ( >=dev-util/cppunit-1.13.0 )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 DOCS=(AUTHORS ChangeLog NEWS )
diff --git a/net-ftp/filezilla/filezilla-3.42.1.ebuild b/net-ftp/filezilla/filezilla-3.46.0.ebuild
index e4f7d03cf422..16d30fb6b0ee 100644
--- a/net-ftp/filezilla/filezilla-3.42.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.46.0.ebuild
@@ -23,8 +23,8 @@ IUSE="dbus nls test"
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.16.0
-	<dev-libs/libfilezilla-0.17.0
+	>=dev-libs/libfilezilla-0.19.1:=
+	<dev-libs/libfilezilla-0.20.0:=
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.11 )
 	test? ( >=dev-util/cppunit-1.13.0 )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 DOCS=(AUTHORS ChangeLog NEWS )
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 08a05646b655..1a0495ee53ce 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,5 +1,5 @@
 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-r3.ebuild 916 BLAKE2B ff3044d2c9411ab76df784d83081bb502ec4556e3b3649b4918ede39975744448db18d1dcf912b45b3f507d8509c7c7354ffdbefd3b30f451061236a513150c4 SHA512 8053ee744deb339d1bc4b93b6fe4ef19c0baf76a4a5edbf8393f7a379dac71481bf2119f64300b335818eaf49ae42c62df5ed623fc3b6db01f8a3d4129e78fad
+EBUILD ftpbase-0.01-r3.ebuild 909 BLAKE2B 0d3cda7e792dd3025ff983cfb7d20ee574da2bdb33af303ee40ab00b84f683f437f17fad1a91c2639d3a600fad681327197f9566cc48406f3620d4fdfb031295 SHA512 f3797addbb1b77e6295a82c1fd6d7e18f25fb989937f36dbc9115a9111d6b1ae849934401bb3727b42f2ce581e616dddd4794ec4e1521171799a9e777896dae0
 MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
index e6aa6b99df8c..54fd9199f7a6 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
@@ -28,7 +28,7 @@ src_install() {
 	# The ftpusers file is a list of people who are NOT allowed
 	# to use the ftp service.
 	insinto /etc
-	doins "${FILESDIR}/ftpusers" || die
+	doins "${FILESDIR}/ftpusers"
 
 	cp "${FILESDIR}/ftp-pamd-include" "${T}" || die
 	if use elibc_FreeBSD; then
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 85f2774cf72d..c5b35def13d4 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -8,6 +8,7 @@ AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dca
 AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af3700ce4a09d7f31ca9b24c66e1a1306bbe26c243b553c1cb81c13cc9593ae36e93b03f28faeb64fe2ae2f834575e9dee402f73ee55 SHA512 d0dcc467289b4107aecee66edf122667b2fbb9b1f1a6a6ecea517f286090d22682200b9d11f503465cb9b5387e8fb749cc09c3033825282450fe1d6c0a4bb11d
 AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd
 AUX proftpd-1.3.6a-fix-libcheck.patch 726 BLAKE2B e971ccfd5d5cd708054096eef3d8b4910d380933b79d7616225194f71213a07c14139cc7bc76b9fcb4f86f0a97672288837d5a1e7ce68673665db65e75328252 SHA512 8e4aface4c7ca010808e0531b896f8554107ad66c7e1019f25168e71e5f8d2df3673511dd4717eb8bdeedb2ca07bd6a587caca4955c4903991bcfb020ed72636
+AUX proftpd-1.3.6b-tls-crl-crash.patch 1466 BLAKE2B dc8f5cd38d07d2194966005eaf3d52b0230a763e35cb3ccbdd7c603eed5fee26a76a49feb31c6422a8adddd355059f82b6b07ac577a328b90e3e35ee5ece242b SHA512 b32281c717c8b1d1cd1ea86bebb6dc8577596e8dc97ad7fc797c83d34a5bbce1141a72f021d59e81be6437844411635c563baf84ef18eb9c5d576e84c80a786d
 AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52
 AUX proftpd.conf.sample 1275 BLAKE2B db10306f79544b344856e065946e9ae0fa37d43507185f7d2407f23a962750a05bb2682e7c97e3979ca42dfe35921c3db7e98c095431796d82144869df0e324e SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df
 AUX proftpd.initd 1434 BLAKE2B a5d4b8c085925d08d7d0962ccd6a3eaad1a3a9227ea6cf553a217f9ef60c88841b5ab8fa8d249e68182a68ebae5940a421b220af4d2f30cf5c2af8ee4b6678dd SHA512 24875a5034813a12f1d24e1fa2c7a71330ffded96112d50dbe4fea6ea127f735eae48134e2f4c3faad168706eb9ff4e15f93dbbe7d6cb6ed0e0768e47aa1100b
@@ -26,5 +27,6 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a5239
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
 EBUILD proftpd-1.3.6-r5.ebuild 8696 BLAKE2B c03fabf7f49be982302ea74eee75580304dae1393d7a452e9aacadfb5790b6b49a82320999ef4a9863f90e26d48788301ae423262172d3f1c04a5e18008cf0e9 SHA512 e64ad6c8e38b8b81dfc1dcef02c05e0ae591972baede8642df393b521499652075e2c970e6cd33cc1bda2e0f853dc79ea7277ba85d4a5df4ce081cb540d323cc
 EBUILD proftpd-1.3.6-r6.ebuild 8756 BLAKE2B f38b4a1066f45b044497f72f4f7467e09c7fcec70cb68ac09095f65aa872f8d4c91124007c6f62bf04e88fec45e56b3a687936fef476ac5f8ca182a241cf7328 SHA512 6a7963148c4526cf8234ffc964165f290968d1164b140e4e85764248140c990efc58217f87b58f18c18cfb7998294347747d5dd884af92b3d4c216b694141898
-EBUILD proftpd-1.3.6b.ebuild 8636 BLAKE2B 2f5ef2ffcdf1ae77e4178d34a35c192aa9c8a5ca4cd6668c0c493acf345f2cb3a0cc1d37bcea31581f230f681e90757b01f6f2fbc40860d921c44d0add278870 SHA512 05612356e5c3054d8a1c9c87c806d6d533aa7140bba9fd9f7f276039d062633f9f278c8e724cc73bc71493eb5ad7d13f6efbd9ffa597f48150876a57820ed2d6
+EBUILD proftpd-1.3.6b-r1.ebuild 8691 BLAKE2B 96bdc1b96d5c06657908d5dbd0731f979870adcee85ff9b251699202c113b063ce4eed5515e16ae5d55f721fa0c3d914cda392e1ff1795b012eda603a75fc00f SHA512 218c27a740f0cac46f41cd09b3b389bb28f29778af457c7dead39dcaba14452cae38016993143804ee33da6ec104dfed53d6221615a92d909c9ac5f2d6773722
+EBUILD proftpd-1.3.6b.ebuild 8635 BLAKE2B c6493c2c8258c7fc836fd77e2da827a70bce2f57a596c9f13b9c8679ca5c0dcc3f31387fbc0c9d256502ba9279c432ba765df23035bc36009b7794ba77b9579d SHA512 c297d069ffbbb46ae354b11c8abb4d3d88350ad37dccfcf3ad77dc91bc8a831037969a027f88641e46cecb7fa78f084e5968a53185de6f6acc9f6148bd5a16b3
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch b/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch
new file mode 100644
index 000000000000..3cfd81867215
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/701814
+https://github.com/proftpd/proftpd/commit/be8e1687819cb665359bd62b4c896ff4b1a09c3f
+
+From be8e1687819cb665359bd62b4c896ff4b1a09c3f Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj@castaglia.org>
+Date: Sun, 24 Nov 2019 14:03:54 -0800
+Subject: [PATCH] Issue #859, #861: Fix handling of CRL lookups by properly
+ using issuer for lookups, and guarding against null pointers.
+
+---
+ contrib/mod_tls.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/contrib/mod_tls.c
++++ b/contrib/mod_tls.c
+@@ -9066,10 +9066,10 @@ static int tls_verify_crl(int ok, X509_STORE_CTX *ctx) {
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+     !defined(HAVE_LIBRESSL)
+-  crls = X509_STORE_CTX_get1_crls(store_ctx, subject);
++  crls = X509_STORE_CTX_get1_crls(store_ctx, issuer);
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L && \
+       !defined(HAVE_LIBRESSL)
+-  crls = X509_STORE_get1_crls(store_ctx, subject);
++  crls = X509_STORE_get1_crls(store_ctx, issuer);
+ #else
+   /* Your OpenSSL is before 1.0.0.  You really need to upgrade. */
+   crls = NULL;
+@@ -9088,6 +9088,9 @@ static int tls_verify_crl(int ok, X509_STORE_CTX *ctx) {
+         ASN1_INTEGER *sn;
+ 
+         revoked = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), j);
++        if (revoked == NULL) {
++          continue;
++        }
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+     !defined(HAVE_LIBRESSL)
+         sn = X509_REVOKED_get0_serialNumber(revoked);
+-- 
+2.24.0
diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
new file mode 100644
index 000000000000..a7cb7a64d240
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -0,0 +1,275 @@
+# 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.14rc2"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.9"
+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/
+	https://github.com/jbenden/mod_clamav
+	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://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-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.6a-fix-libcheck.patch
+	"${FILESDIR}"/${PN}-1.3.6b-tls-crl-crash.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 -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.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{,.ac}  || 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/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index f0f14731a897..72cb29f0cd9d 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.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"
+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"
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index b020c238ea5f..fc92d13cee42 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -7,10 +7,8 @@ AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c5778
 AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 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 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
+EBUILD pure-ftpd-1.0.49-r1.ebuild 4099 BLAKE2B 3723ab3562ea792ea7d939eb35f11f7fc31b82f002cb53a4c436a1a2ffb3a1883211ad083bb17527f43c9972a58cc079297ea01b1647453f0e62f10597bab3a9 SHA512 489ed9093dd16d6afea68fa288617221dbdd19ed25d642fce3d5ae0725c373497b84991f96924b91f878ed5752bc8e34d71d2ba04c3871058d145fa25d4c6457
+EBUILD pure-ftpd-9999.ebuild 4099 BLAKE2B 3723ab3562ea792ea7d939eb35f11f7fc31b82f002cb53a4c436a1a2ffb3a1883211ad083bb17527f43c9972a58cc079297ea01b1647453f0e62f10597bab3a9 SHA512 489ed9093dd16d6afea68fa288617221dbdd19ed25d642fce3d5ae0725c373497b84991f96924b91f878ed5752bc8e34d71d2ba04c3871058d145fa25d4c6457
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.48.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r1.ebuild
index 5f4d78cdd36f..d1be10cc99f1 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.48.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r1.ebuild
@@ -70,6 +70,11 @@ src_configure() {
 
 	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
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49.ebuild
deleted file mode 100644
index 5f4d78cdd36f..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-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"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-DEPEND="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? (
-		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	dev-libs/libsodium:=
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-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
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		--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 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)
-		$(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}
-
-	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
-	fi
-
-	keepdir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	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/conf.d/pure-ftpd 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
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
index 5f4d78cdd36f..d1be10cc99f1 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
@@ -70,6 +70,11 @@ src_configure() {
 
 	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
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 2448a38dab4d..c434c22ab486 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 820 BLAKE2B d50d124b4eb8512de19d818611f9107d592336dd88b277553e44e1b5aceb75439d434f5fc49c781c0b19e3f9de1e16d95993cf5af03cc8d8b7626bfa5ad26357 SHA512 415a04d5ff242d2754430d6f6a0e0191c164df5da555cdc2dbaeac59b0e22875cf2e5142d02ee11a4267ed1bc2904a9e342b0620fcde33690326856e2e8d3d39
-EBUILD tnftp-20151004.ebuild 823 BLAKE2B 814d04766c0d521c8d3751c5722b43223cc2f0b2769f4582be9fc7392dede79d4888e4072046c867476f0610777d23adf76d50f97cff866105605deecf19bd3e SHA512 d75302490a31cea1297e1423b5fc03651c5175063eacdd43dce6fa3298fe36e086e1fa35169f8e63082452169cbca59114ce7554f1433ba9f3aeb557c6b0320f
+EBUILD tnftp-20141104.ebuild 742 BLAKE2B 8787830d0e606dc05c16eafb9a7366e04545727d5e25937d7b8680789c5792dbc05e1ef7f37ae4835ab133d109034c1de126de2d6d4a761819ab3b796614ca22 SHA512 69f193a4c674c77bbd23a02d7c2e0beb8cad38bc714845488d18abeae01cdac714c6911981235bac409dc6ce611edf8302be77e56ea0de941010bb1fe6dab8fe
+EBUILD tnftp-20151004.ebuild 745 BLAKE2B 311f98f80b07e68ef5e7c6c4abbbd2205aafb24029c5b8255b6822d10c6b590e51ef3a1c0e4b383afac20c6954884ba4287b1d5b5bd0ff16879e00640530df93 SHA512 1de732849e9fb4ac61669bfb35bbfe22e3c4958c1184ddc2108bc9fb4310ac3a72c9d1a4dae82a58f05629916cddde38829f4cb4159f20751d9e8356b9d38813
 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 d36fa9f33364..b8180b5c2ab6 100644
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ b/net-ftp/tnftp/tnftp-20141104.ebuild
@@ -21,11 +21,10 @@ src_configure() {
 	econf \
 		--enable-editcomplete \
 		$(use_enable ipv6) \
-		$(use_with socks5 socks) \
-		|| die "econf failed"
+		$(use_with socks5 socks)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc ChangeLog README THANKS || die "dodoc failed"
+	emake install DESTDIR="${D}"
+	dodoc ChangeLog README THANKS
 }
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
index c39d0e1b907c..fff01fa2c0b8 100644
--- a/net-ftp/tnftp/tnftp-20151004.ebuild
+++ b/net-ftp/tnftp/tnftp-20151004.ebuild
@@ -21,11 +21,10 @@ src_configure() {
 	econf \
 		--enable-editcomplete \
 		$(use_enable ipv6) \
-		$(use_with socks5 socks) \
-		|| die "econf failed"
+		$(use_with socks5 socks)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc ChangeLog README THANKS || die "dodoc failed"
+	emake install DESTDIR="${D}"
+	dodoc ChangeLog README THANKS
 }
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 83624b3e98fa..9c8d2d3e92f6 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 3690 BLAKE2B 77d886e438d678a19b00d6306abaf0fc4c295e1ba5ca275573ea2563a7dbff915c18c8a00dc78f73717db3d3664269cb72c1d14f0cef549fb72ba03e8b6e3b83 SHA512 892090dda11710bfd611bfd8cdb4685153563d7a7adcec2a7ac48a77d898d0ec9e625f7fa49cb485ac00428171ec78abe5a8fd07328134ca45c61d71d938ea21
+EBUILD vsftpd-3.0.3-r2.ebuild 3623 BLAKE2B db6f1566dd210fccdb0333b0898b63e9dc950442946c98df9113af53336990eaabae8023c1e69be5af8f8599a136c7a403e62805c5371221d2977f66634d63f1 SHA512 33c2ac0bac9f67c2810b25b39950fa4dbe0fd372eb84c7ed22c45963e0db9314f0033a855cfcc3c20ad1a36c48bc394185642253b2443806aab74b9ca1c075b0
 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 6559c9946105..361b7f7bfc3f 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -81,7 +81,7 @@ src_compile() {
 src_install() {
 	into /usr
 	doman ${PN}.conf.5 ${PN}.8
-	dosbin ${PN} || die "disbin failed"
+	dosbin ${PN}
 
 	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
 		README README.security REWARD SIZE \
@@ -89,10 +89,10 @@ src_install() {
 	newdoc ${PN}.conf ${PN}.conf.example
 
 	docinto security
-	dodoc SECURITY/* || die "dodoc failed"
+	dodoc SECURITY/*
 
 	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/* || die "doins faileD"
+	doins -r EXAMPLE/*
 
 	insinto /etc/${PN}
 	newins ${PN}.conf{,.example}