3 files changed, 119 insertions, 3 deletions
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index f1bc05ba5774..ddea65e2b550 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -15,6 +15,7 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8
 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
 EBUILD lftp-4.7.5.ebuild 2551 BLAKE2B 090ebc91da6dbdeae35271ddd823c68a23fe61fb980a3b575454a652c13c5237a742c264e141b0ba07f08dc18f8dbbfea54053df9f21787a1b1bbdd11c05addb SHA512 bacc149a37e2e96c1f65472689ed8454a553ab714ce301934d21451d9b8452106f66dee3d6b1466b3b236df06b1c9800578555960dcd047a31c4c5a83fd2f30f
+EBUILD lftp-4.8.4-r1.ebuild 2652 BLAKE2B 59a8f1c0a5d58e9fac3e8f10e047b83d2dec7aec9b7470eff7e58d6fabaedcab220d480e5cae1fffd3979dae585112cdd2704ffd61d9cb9db47737850e68ca4c SHA512 ec03eab5113484b503d601ec1829b745ad30dc2c9d5a1fb6cc087ce3b5e59c102b23554d16da846a69e1265fd6549607449c7ebca5b467d9f6c7b83cc41108bd
 EBUILD lftp-4.8.4.ebuild 2564 BLAKE2B c7c7f0082a43d4ae98a41a324b32e1ca283ef5424bd574eb9f29b2f667f1fe1b5ac362879a74ea91cc9e604d9e7d8b261975ad293cdccbed93bc78d0fcffb7a0 SHA512 89141dcecc69fec441b682d0ca980659784a64599a2b0c1338ddb279bb9c84e03042b7b282d474b0bb208b36d8e4618223abc55619d2dd6559b40f81b6a235a0
-EBUILD lftp-9999.ebuild 2350 BLAKE2B 895452ffb4638806c8cbaf58c4fad9e45d470eda21a5db1fa477565e2512bab2e6255d141fcc57edcbafcd5235e8ae0eedf8e642bbf22d050063487e74b87597 SHA512 602953e3e74bebd9e3eb1ce25b410142e2c59fba0c177909f4481e67f720a246bd393b6e8798b944177269e3bdd59922230f3e9406e6cbe6342da232450ee824
+EBUILD lftp-9999.ebuild 2437 BLAKE2B 9acf0cd0125d59d96feeb9268f519e56dd5746704ffb9f10c8c77c1c4ca88db53b1c4c862513d71eb483765e3c724f68d51b25144402bcad721ee8c4886f420d SHA512 05ef650aa2470f8a3b00249d552892415f54b5279016db303226133a7ac03e2aaf269116d7da67bde001590a875e8fe4234f1e101cb29e23e7ed3b437b9d8f25
 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
new file mode 100644
index 000000000000..5faea52009eb
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 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="
+	${HOMEPAGE}ftp/${P}.tar.xz
+"
+
+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"
+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
+		virtual/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-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 4f73a82a139b..ae490e6c7f39 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils git-r3 libtool
+EAPI=7
+inherit autotools git-r3 libtool xdg-utils
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -95,3 +95,11 @@ src_install() {
 		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
 	done
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}