gentoo resync : 25.11.2020

20 files changed, 66 insertions, 569 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 0a40e07381c7..3bc0c6e22bf2 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 354d5eb26d02..b4316add69cb 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,13 +2,9 @@ AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a
 AUX filezilla-3.47.0-disable-shellext_conf.patch 699 BLAKE2B 9d0209166f8e76b0575be47e8a13b1d07f159ed05aaf9e8624030fa1ea2ce1ab63a7283336511bc14b6a922c8536d9ac992a231cf53f9c825299b4b588512c62 SHA512 3c0e6178f8fcc3793cbc722fcb91b2b2834eccda17ab6260243d1262198debe3c71ced1c2443ada8245a7bcf02b5fbb5fffdb16bdab948dc3badc149576ab027
 AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c
 DIST FileZilla_3.47.2.1_src.tar.bz2 4733941 BLAKE2B 0517d43bfba8aa116ae4031d56e5070aadbcaf81ace2311f6cfddb47e7f67ec62396ae3690c139bcc1a8368be690776b3163dd6d53a6ebb27ee5e99300b3c67b SHA512 8919eab7762e0e30241637a8978fbf61f02ac4c52aac293191315b931d52b41ae228b753f4e3b7530835578836dfee7f91772841273e9fc2bdf75ff7ed48fafc
-DIST FileZilla_3.48.0_src.tar.bz2 4765599 BLAKE2B 0ab391c0862a34dd5ede7a80290afc82b4d85b2deaf42d3bacd243bddf15505f05028522f73eeada07e91d91e0af87676ad77081c843448fda53c3b2ac18a70d SHA512 c9d4eb17dc31894468ca4b7c4c8fda0f307d3931bf1b3b8fb44afd084a1b2c9309d39e5745f9ba287a5566d44089af32350703e324a559afd6a015af469433fb
-DIST FileZilla_3.48.1_src.tar.bz2 4774251 BLAKE2B a77b821640aae3deaad3350809f34dbac8ed63c336435f92393017301509b91ef5e613ea64cb934dd2385b55fe7ba711269f85b7523d43ef451ab0cf6634ab0a SHA512 58792f92bb4f6102166924abaf843c023faeca7f2979aaa47c26f2bb3f8449902b4a43c50a800d56584d39c9ddf64a6d3334558e46f56bda3b8515c7a3ff0a12
-DIST FileZilla_3.49.1_src.tar.bz2 4788452 BLAKE2B 63ee0ba462f918a357342f8e53dccb40e01a7cab52e25891e1b17bddb863d0386a51c67e09d0c875a4abf9b4e443a03c6616be3d7d39e585324e7343d19dfd14 SHA512 e6e69858aff3be6f557cc338ac4cd4391699d171742a2e815dff15e029a76cb1cc0651c15a3b4fb95644371b4e84b913e34a70846454a7fd5de6f05a7f461add
 DIST FileZilla_3.50.0_src.tar.bz2 4791977 BLAKE2B c0352eea9c4cd0a10d25b21b0a6982a762df6353a8da0703179270ef27be71bf151591011c45aae6e303437ac5ecca6a340635c392e2ed6db1a4a9d4002f4d7b SHA512 5edcb18aa7e4a0a59678d589d20996d7f6311f717e55a70c9dacafe42e3df6cba79be778bef34ff399672941dfb78a4732b83f21016b721702c763f0408b3e40
+DIST FileZilla_3.51.0_src.tar.bz2 4808717 BLAKE2B 67f614032145abe7f715254fd47756d3a537d2eca63be976c29351f79e15d3620e77c1bb7beccc2b61a1df8b86484334a3e77639402c93e8ce28d4b12eb8884f SHA512 b5e0f80b61eb168b41f7582bf10bf0067da76aec3165ffe13819e20eb842ffc0fb12b01c54843b3ec4e7355111c36be249db3526e2ea2eaa77ba4274ffa03e93
 EBUILD filezilla-3.47.2.1.ebuild 1991 BLAKE2B f3d922bc88cf3de4cb7c7b97713006d7699025cb9240f3602b2aebbda21e470a5b0f85980adfcc0c5548054e732bb4e0c2f56f4c515ceab73d0169dc5bacac9d SHA512 57275acd8ee50c2f5d4e42faf3e5b834d3d68267dac42c141f42a0d45da32be23f9b612c0ba54623b0b2ae672f45a060d2ec5245a02ed75bc5a5e22a63b21ee5
-EBUILD filezilla-3.48.0.ebuild 1994 BLAKE2B 97aac6517d88b3495cd8456a3d049dc0e6104794970a103dc4873d957b0965df66102becb3288466aa0ed32fc26fd6d922e82456abd85d921d8291de202c10aa SHA512 d5a7647862bee21f4b4af00c163a2ea8e7d0edb892779a4b8158bdca29fb75504f26947f80bc41146e9c4337d584aa0f9f92782d245cc5be07032b2d5731ea7e
-EBUILD filezilla-3.48.1.ebuild 1994 BLAKE2B 31e6def69a7904d2d8a3f3db5a5d555bb3cdee3944955cb1e1a03c9df512f83009c6fe2b2a16c97b5024d9501ff02cdf450d64285ff8a6600694ad05d26262f1 SHA512 253ae3736744b3b0e5181b3764275a9551ffd20b207688647920b8d80d2625d3222817e6eda96a7ae41334f5725f676b5e45d6b98c0efcad39f7f7d78205e3ae
-EBUILD filezilla-3.49.1.ebuild 1994 BLAKE2B 4bffcb92f92116e1f63f3978fd53a396e9f585a089ea9ef263608300e4bb00e170bc63a6250e97807efb9dc9112c44e2192b4dec01d7d07e9b722db76cffab91 SHA512 67140c7df984284b74556ad54b1de67ee59af0e6a21099d507decc749b703dbbad8015adb0bb2096d6e716a4e194d49b6949461ec835f84d0d8d00e1e8b8837d
 EBUILD filezilla-3.50.0.ebuild 1961 BLAKE2B af10edbedc83cd229573186d94fbc595e3860475ac0b0de392903dffb21a92dac9b22588ee4b5edbd4b55e3ec168c58a8203155db35cd751738c7bd42aa0539c SHA512 2f97de78b3c0b7907c05f988c3c07c788366975241f425beeee54127593fa0fc9a323477e0af64e73b766d011a13b32d3d9ca25aa75e2a18a665f6c43186dd87
+EBUILD filezilla-3.51.0.ebuild 1961 BLAKE2B 9e072f2cb2f0d21a53e3a420691b0731f89d999c0c594715b114e465ea28238a9e2723af936444af7614e81819aa3bd5ac2680836712079f23126246111760aa SHA512 0416cf2e4294bdbd422620981b59a654224d68b1bd4de5097f1436945e12846495c88ca2367efb6f3a5814dcd6c64e48fad2d90251a6fd60347b274cf5a0038d
 MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f
diff --git a/net-ftp/filezilla/filezilla-3.48.1.ebuild b/net-ftp/filezilla/filezilla-3.48.1.ebuild
deleted file mode 100644
index d5eb40b08dda..000000000000
--- a/net-ftp/filezilla/filezilla-3.48.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 ~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.22.0:=
-	<dev-libs/libfilezilla-0.23.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 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.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.49.1.ebuild b/net-ftp/filezilla/filezilla-3.49.1.ebuild
deleted file mode 100644
index 94b326890dae..000000000000
--- a/net-ftp/filezilla/filezilla-3.49.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 ~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.23.0:=
-	<dev-libs/libfilezilla-0.24.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 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.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.48.0.ebuild b/net-ftp/filezilla/filezilla-3.51.0.ebuild
index 9e6b4b3a1bff..3639ea6627fa 100644
--- a/net-ftp/filezilla/filezilla-3.48.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.51.0.ebuild
@@ -23,8 +23,7 @@ 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.21.0:=
-	<dev-libs/libfilezilla-0.22.0:=
+	>=dev-libs/libfilezilla-0.25.0:=
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index 7f93b8cfcf99..3dcdaf11c886 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -5,5 +5,5 @@ AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df
 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364
 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c
 EBUILD frox-0.7.18-r5.ebuild 1863 BLAKE2B 48fba76ac94415e82046d0486d9afe2c4b84a6e2e1694b7a30b9bda22ee70a373fa1a055fa5ac8865d0a344a85e8b9dcc7fa3dc892e8ac96239476dc843be63f SHA512 3490ec5fd9d7e25825b8d69ee23113dc565b2d7925b335441ce0b2b54051ce7d1d75e148a23f7471d90dec0d85af0ed8e78233c141f067183e28d5418f1acf98
-EBUILD frox-0.7.18-r6.ebuild 2015 BLAKE2B 0aee6ae2281032f87a418a3447a9ce53365d7c77d92d632f7283afba8f77bc2a9a25f72bdc115b2a9d7d63b02bec467b828ca9ff9002184dec8c50c32c6c1a70 SHA512 6651750ae788cbf944eab85a543567de946144067be94ae671f1f232e9cfef03f8d65643b68c07eb99b3f4b5dd5b636ab431623c8ce493d352ec79375baa0cc4
+EBUILD frox-0.7.18-r6.ebuild 2013 BLAKE2B 9c2fe42c27b654496c210c602f92f60aac7365d52cc3315dd77c81fda5774266765db2c4c1f8fcdb3b9d24cfd7e5082a7e9c35a6966d6ff1fd8d84c916ccfe17 SHA512 b169215a9a56ce571ecea073d9d35e7c47c46975ba11a2e490e0206d67f3e8c178616d74477f30446b9de746885474673333b6afa7895f141b9d9b5ec1dc3071
 MISC metadata.xml 593 BLAKE2B 65aeb3bac2df8a84512c91c24632a9d4b744344c95afe91c1631d442bcef11d19f922eb61ad85052ec14e9908bbbbe43f57a20a89a4fa39e3b8591734fc09bd6 SHA512 eb6aa83ad2cafe20d5348ff946f4f8d9c8b24dea6c0cd43de4ca9cfb27cd134e595874f09576a156b0936add5dab9b3924bbee40605095da899f28ced299943f
diff --git a/net-ftp/frox/frox-0.7.18-r6.ebuild b/net-ftp/frox/frox-0.7.18-r6.ebuild
index 0f3521729e32..b05bce79d8c3 100644
--- a/net-ftp/frox/frox-0.7.18-r6.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://frox.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="clamav libressl ssl transparent"
 
 DEPEND="
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index c601e04ff35a..0e00ca3e20f5 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -3,21 +3,13 @@ AUX lftp-4.5.5-am_config_header.patch 306 BLAKE2B 6e4fc3b3940dbfa6745dae2e6abf82
 AUX lftp-4.7.0-gettext.patch 421 BLAKE2B 3d1583173e610983d93e44c8411729a0ed90f64c943e7005840308730325f05129001dac521c5149ace051035ea66cf70e526a5aab951f7c5343d30140baf20d SHA512 5b90dc5ae24c2b5e7ef630ecfb709c139ff176644c5a351d97ae78b4adc28266ed09ea17e1cfd875ec52eb15e719eb12d796eb02859875a5c099d99b04035a69
 AUX lftp-4.7.5-libdir-additional.patch 369 BLAKE2B 8a9c2bca001d4975ed8d08a2bae2bbcd1219345e307b953e635bd9833bab81b4b7c94d96955c4df84e20ea08b3c41f49914ae6e74b466018e60bcdb7da1db6e9 SHA512 97e81ecc2db5a71ae36393e2f3f7ba60466d5dc7e7979ebab3be3f36fef220ce927c9d6716dc380028b8e6436c490fb3c8771b0beb3a6e9c7ff8b6bf2e608ca1
 AUX lftp-4.7.5-libdir-expat.patch 356 BLAKE2B 62a89c02aa89ed746e28b13f08fb649804cdb81a31e4d20d12d049b16cf53f0bed3b36a8b2f85a8ff271d354498c0dc1ff778793d0dbafcf5aec220629508354 SHA512 ef748260275dacee08baff3b922e9e1e559fe2fedcc64e7c3125e57e16e04330b80bd1bca16d53ba7970ae5b20a396cd2de0ef1ba2c14320bf56111d4db6a8a9
-AUX lftp-4.7.5-libdir-readline.patch 424 BLAKE2B 323da25222e0dfc47ebcc123a243006927514ce77fbae1656e831d2c1e96c0d7bb1c55c92570d0d60f6bd004843b5ec89a6311b5c453f9d5e5f97da1c58cce8f SHA512 6b926598702d222dcb8cb0ed348f1c1f62ddbafd8b6b227dce8acca7ac5d6b1c1f5743d3c43e721a5ac36fe9bfd5725fdb7d0d2d16bde685e75ad9c9c760a86c
 AUX lftp-4.8.2-libdir-configure.patch 530 BLAKE2B b376a53130563d37329e701d77b5a9c0a98d37deba6cae4d1446d8cc38deec45e80e49407507b7556aaf165c6d8c74f9f4fb31d1c1057f3156b261bb3292f37a SHA512 dc97d62360079b525b1735faf1c5238e5f03661fca81445a3e3ad21826d6559cefa3cefa987eeb01bc76df65ff92243b9cecbf4585820fd51fddc55fbc3b322d
 AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd08dd5acc3b36bb487433612bc391527091e10ef22f522980f7b5fdb8966918aee49713848eb2af7e349834a398854340 SHA512 5476169b31d9704db9ae00834a8e8cdcbbaea13a88b2288ed8ea69300d8734af1bf80d994e42a9a47bf179c14fe9471d931cd9ca231fff0974ee206163801cd2
 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
-AUX lftp-4.9.0-ipv6.patch 496 BLAKE2B 66ea52d0f7d23b851de91b96753a76d9269c09de1666252c2120fb0c362f411703ddc8c748e642b6e57165fcd7132d5d8b6573539340eb6b542b1a73e80f04e5 SHA512 e9c58552f7491c1fb8a1834c535330f68ab325e79cd474ab259d6d3297c36342a350a21aba39df00b58daf37f175736485c285035b1c903ee8afa19e82e50dba
 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
-AUX lftp-9999-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
-DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
-DIST lftp-4.9.0.tar.xz 1642596 BLAKE2B 111e559c98e0572e1ca79f935a1db8c45c99275c8aa7b584be06d1738296b32808e97d696a02751575c5d1ea24a30a52f5d9f177a193f70addf1168e3208aa13 SHA512 8d83ea76390d38cb1f84f02eb7bf45780758afb9fe61f5b7278a48c9a5d216d03bc8b699c0f449a0036bdb441b4225af074da1b5e92a77ddb61aca704758211e
-DIST lftp-4.9.1.tar.xz 1648564 BLAKE2B 2f36dec3de01dd3f9e7316567912a04196732a1e71a4d1c3a5124471d2941673d7b58bc3182d73d3cf154def905f57d37667d33fedec6ea9434f74850aa64f4d SHA512 303e2354bd61a850403a02ac5b71e54719c12b026c7e36194a6382e9044f1fee93ea581ba0a55fea19981e07b896216e92c7d961c719350762eb0cfb51a2c506
+AUX lftp-4.9.2-libressl.patch 1393 BLAKE2B fb014efb50ceb0ad1b0f58c8ebc70c43b474552f3e9f084a8d40e178c4d5dbf2b830fa987ac52a7249b790dfe8f84ed39f7676eedc66612acb2a83e3599bf952 SHA512 f427059a2047d817a1b0eab03cc861d78538a5bde7686ff9bf6955f7965f27b15f6b8ff5299fe821298e716d440b16f0fb61b922badf233fa88ba725a0a48396
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.8.4-r1.ebuild 2612 BLAKE2B a776ff29cedc7c19669e310b534bc87f738853fcb6735c4627131d8a3dd630a44bd94a0bb178a5beb36cf4e01cf5f14f43ced074bc510bd958ba86671bd1f05a SHA512 14846e9298ae8ba723f6e842c763afa5378782c4def76fca23e650ce656dd7bb762545c055bb8111466f4a8cb397ea46a9f3dab547acc213a17d5c3615781788
-EBUILD lftp-4.9.0.ebuild 2657 BLAKE2B 7095bcdb0e05167dafa7830de785fddfeb07613b0ba3cadd49bb43e0d2660df5c78ce48d5c618edc2ee34f040f3bd57df85b0f839b326686f694f0aae9c18620 SHA512 6a821056ed70d3c4dc16b503133f8f648f7bb2119f98d13b0ecfbc5a9f296fe8c62eee7226b2328bdcdde970ae80830cdcd63c6b9a8ec59dd29f296ff7f21689
-EBUILD lftp-4.9.1.ebuild 2619 BLAKE2B 7759921cdf8e16fd6f0a3b72c17d194ef85fc0ce8ac3b5fbfc4de2ed30bf3506f8472c52e5b9ae2c88eee2672553dad275d631bb2181da839cca419685fd1b0e SHA512 4bd69847fe02d6e5810d94bb88b2f1d33d72190c9a6aab35ab24f37d47a76cde6facc1a2d276cf3410f744516b7b50b49d9a1e789e93938aa12cbe764807a5e3
-EBUILD lftp-4.9.2.ebuild 2619 BLAKE2B 7759921cdf8e16fd6f0a3b72c17d194ef85fc0ce8ac3b5fbfc4de2ed30bf3506f8472c52e5b9ae2c88eee2672553dad275d631bb2181da839cca419685fd1b0e SHA512 4bd69847fe02d6e5810d94bb88b2f1d33d72190c9a6aab35ab24f37d47a76cde6facc1a2d276cf3410f744516b7b50b49d9a1e789e93938aa12cbe764807a5e3
-EBUILD lftp-9999.ebuild 2437 BLAKE2B 231733a4f693e72104f2276cc254eae3ecc205738bccdd1efd3dd362caa6a3d08216a93dc2ceeb7a4ae001a6a5e0845a1e7a271d7d53b47426b59bf2d241d700 SHA512 5a51e8c3d1c1f3a435c405ed31417b902c2158dee815268f91c40acf5b0e8e29d3b6bbfc8068e41c501d4250812639f2137ad87b4d01da0d6b3fb62e359fceac
-MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
+EBUILD lftp-4.9.2.ebuild 2654 BLAKE2B b5f0ef3c1121ef5106717a9b03741ee52952c4c2fd388c222fda10c379c4437a253600c2862b39b31cfa457da1b621f5d8c355d1738c1bd9f55c301cc0a07050 SHA512 31ac9e54465f7f233e7292ffac7eccb18bd55948c8aa505c50611e52413bb7ddafba38eafa3cf208abaf5f36845e71c2d094f5c5c476f7cb3aa9932e3472515f
+EBUILD lftp-9999.ebuild 2438 BLAKE2B e96329335ad785af88182d486ba295a750c565136c41ebaa83f59b5430bf70de4f40f80d4abc79e68dd0b5b8d60e0ad8152c0e6ed6f119f687f95cfc6db783a1 SHA512 3b5a771d1be09c8b010ddc47cf2aa791a2924c464272feb7183a6f7da457fb0d6b7e2667828d41c405a47b93a5eb69b03616579cf0c501354719de5b35ad8f5a
+MISC metadata.xml 592 BLAKE2B 87ed7484a2723b3f46c358e839930919c22b296c86e44b492136c553150b040b903da2361a71eeecd8f4a7b077389988b9f185fa222f6559ebf65c44609514f4 SHA512 86dc525bb6734b4bf7995df33ef4f8027b01263afa9f827916224abeff84a04079dc50a62aa8c93c55c588d94669fcd6eee17984ef4b8913aa777e9f03a6e1ed
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
deleted file mode 100644
index 01c9371870c0..000000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/lftp_lib_readline.m4
-+++ b/m4/lftp_lib_readline.m4
-@@ -107,7 +107,7 @@
- 	if test -f "$readline_include_dir/readline/readline.h"; then
- 	    readline_include_dir="$readline_include_dir/readline"
- 	fi
--        readline_ld_flags="-L$readline_prefix/lib"
-+        readline_ld_flags="-L$libdir"
-         readline_lib_flags="-lreadline"
-         run_readline_test="yes"
-     elif test "$readline_requested" = "yes"; then
diff --git a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
deleted file mode 100644
index 2c02ce5e787b..000000000000
--- a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/ftpclass.cc
-+++ b/src/ftpclass.cc
-@@ -848,6 +848,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
-       conn->data_sa.in.sin_port=htons(port);
-       conn->data_sa.sa.sa_family=AF_INET;
-    }
-+#if INET6
-    // V6 / AF_INET6
-    else if (proto == 2)
-    {
-@@ -855,6 +856,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
-       conn->data_sa.in6.sin6_port=htons(port);
-       conn->data_sa.sa.sa_family=AF_INET6;
-    }
-+#endif
-    else
-    {
-       Disconnect("unsupported address family");
diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
new file mode 100644
index 000000000000..51de51f780dd
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -0,0 +1,40 @@
+https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch
+
+From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Thu, 20 Aug 2020 12:29:05 +0200
+Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898)
+
+---
+ src/lftp_ssl.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/lftp_ssl.cc
++++ b/src/lftp_ssl.cc
+@@ -34,7 +34,7 @@
+ #include "misc.h"
+ #include "network.h"
+ #include "buffer.h"
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+ #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
+ #endif
+ extern "C" {
+@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance()
+    ssl_ctx=SSL_CTX_new();
+    X509_set_default_verify_paths(ssl_ctx->cert);
+ #else
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+    SSLeay_add_ssl_algorithms();
+ #endif
+    ssl_ctx=SSL_CTX_new(SSLv23_client_method());
+@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lftp_ssl_openssl *o)
+ 
+ const char *lftp_ssl_openssl::strerror()
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+    SSL_load_error_strings();
+ #endif
+    int error=ERR_get_error();
diff --git a/net-ftp/lftp/files/lftp-9999-libdir-readline.patch b/net-ftp/lftp/files/lftp-9999-libdir-readline.patch
deleted file mode 100644
index fde1017f4bdc..000000000000
--- a/net-ftp/lftp/files/lftp-9999-libdir-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/lftp_lib_readline.m4
-+++ b/m4/lftp_lib_readline.m4
-@@ -107,7 +107,7 @@
- 	if test -f "$readline_include_dir/readline/readline.h"; then
- 	    readline_include_dir="$readline_include_dir/readline"
- 	fi
--        readline_ld_flags="-L$readline_prefix/lib"
-+        readline_ld_flags="-L$libdir"
-         if test -z "$readline_lib_flags"; then
-             readline_lib_flags="-lreadline"
-         fi
diff --git a/net-ftp/lftp/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
deleted file mode 100644
index b687dc9df2fe..000000000000
--- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools libtool xdg-utils
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:=
-	>=sys-libs/readline-5.1:=
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2:= )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		sys-libs/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
-	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
-	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with idn libidn2) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
-		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--with-readline="${EPREFIX}"/usr \
-		--without-included-regex
-}
-
-src_install() {
-	default
-
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-ftp/lftp/lftp-4.9.0.ebuild b/net-ftp/lftp/lftp-4.9.0.ebuild
deleted file mode 100644
index 91f68b2cd962..000000000000
--- a/net-ftp/lftp/lftp-4.9.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools libtool xdg-utils
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:=
-	>=sys-libs/readline-5.1:=
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2:= )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		sys-libs/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
-	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
-	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
-	"${FILESDIR}"/${PN}-4.9.0-ipv6.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with idn libidn2) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
-		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--with-readline="${EPREFIX}"/usr \
-		--without-included-regex
-}
-
-src_install() {
-	default
-
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-ftp/lftp/lftp-4.9.1.ebuild b/net-ftp/lftp/lftp-4.9.1.ebuild
deleted file mode 100644
index 8724b4d9622d..000000000000
--- a/net-ftp/lftp/lftp-4.9.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools libtool xdg-utils
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:=
-	>=sys-libs/readline-5.1:=
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2:= )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		sys-libs/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
-	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
-	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
-	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with idn libidn2) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
-		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--with-readline="${EPREFIX}"/usr \
-		--without-included-regex
-}
-
-src_install() {
-	default
-
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index 8724b4d9622d..121ccc94638b 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
 RESTRICT="test"
 
@@ -59,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.9.2-libressl.patch
 )
 
 src_prepare() {
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index b38775a32ae7..0f1f759f3377 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -57,7 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
-	"${FILESDIR}"/${PN}-9999-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
 )
 
 src_prepare() {
diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml
index 1c23e9e44b2d..de1ae65d712e 100644
--- a/net-ftp/lftp/metadata.xml
+++ b/net-ftp/lftp/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>jer@gentoo.org</email>
-  <name>Jeroen Roovers</name>
-</maintainer>
-<use>
-<flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag>
-<flag name="verify-file">Install the verify-file script and its run-time dependencies</flag>
-</use>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<use>
+		<flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag>
+		<flag name="verify-file">Install the verify-file script and its run-time dependencies</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index bbaca8c14d30..0982f548895f 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -4,4 +4,4 @@ DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc81
 EBUILD ncftp-3.2.6-r1.ebuild 975 BLAKE2B 30ff54992100b50c7b9a55300f324b369b8a5d6bc4e6084a00c5982648595211839262463d4f44b0474cfc86b63dbebb6ac650b2c7a9ab32c2cdb59fee3dc73b SHA512 9cf1333cd5ab061dabbc252df65598d0411a7a254596b35601a41dace0c713d0b0f503956f0fe26f2acfddfda1b8bde1d1d7da4fd0345ba8066d1b23263555a9
 EBUILD ncftp-3.2.6-r2.ebuild 1049 BLAKE2B 535236ffde13913cc12d4f9e150a42bb925ef4bdc33ab86c59897a840fd275d06f939ee1c0d6f6664ba3e2fb15deee038e5d97588f4059d5e02a19ab7d18dbde SHA512 19e6fe97256d71a2ec6b0560c7c2da9c1bca3fdab0ce6d54f29af39802590351cef99adef918531fe3ebc93aa6af994403f39b4eea6e21735a2f6766a8bb2f80
 EBUILD ncftp-3.2.6.ebuild 1043 BLAKE2B b5b30ecd0d33201c30a5ccfa13ddddbc9134b2176f4097be558659182538d5604d4ba9adf9ceb69a1c596695b4aad38e24e5184c9b389dfafb24f887cccbaa89 SHA512 e9912f780ccd6f0658a227d451934ba95ac0b29f27098300af44abaf8375a893992ef1aed4e13db43d59dadcbcb2dab3f60512383fcc4ece14d72eed612e0dfd
-MISC metadata.xml 738 BLAKE2B 98d564b3063dd25384758125efec702f385768f3f0c4066ef5b0e6748f9c27d0ef838c4a669e7113bbb70ff74882b1d4c3b0e09011f3ff5f01dad3eea56c6b16 SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3
+MISC metadata.xml 662 BLAKE2B e41a84c3553efba6d4425c73d7aefeabc235057178408f63a649a2580110f8e7af365b41bea7ec150091b2a57f871ad81476607bbfe73dc7d2ee123a9f175ada SHA512 a3a91d842e2865916280524c6d844c83133f136cf6f9fd59e6246026295f4fe9f5ab535944b79c7c5417b50672de5edc25b5dc34df069721a535342b30b6ab98
diff --git a/net-ftp/ncftp/metadata.xml b/net-ftp/ncftp/metadata.xml
index ea305f5d25b0..8d4445c39eaf 100644
--- a/net-ftp/ncftp/metadata.xml
+++ b/net-ftp/ncftp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>jer@gentoo.org</email>
-  <name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 NcFTP Client (also known as just NcFTP) is a set of FREE application 
 programs implementing the File Transfer Protocol (FTP).