gentoo resync : 19.03.2019

10 files changed, 167 insertions, 106 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index d0587e7fdcfd..782330075ef9 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 1ea1ad736a9a..08bc071399be 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,12 +1,10 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
-DIST FileZilla_3.34.0_src.tar.bz2 4869893 BLAKE2B 43f017a833191126526195636607b7ba4ebc73859f48745126ddd284940da90d692e0bf2373096f5262e6ebe2e6655d9cf2dbbf4b0aa6299730f47b1f04c63e8 SHA512 577118bd053c3aedbe77082b138c30abc6a759b20ea905abc4e9bef965cbca3cf73023186c389ded7d906b7cf76e4f3d4462c00fae62c7b1ae695ad171c88764
-DIST FileZilla_3.37.4_src.tar.bz2 4983335 BLAKE2B 16929caca3aabfdea406469a4128878f3cc48b347084d5d362ad206a7549be129195e8f111324b259e64d8e9324d9decd4bb51d088367fcaa560ec1feeb03570 SHA512 3f6697fd411b898f0db375bba7e6a34157c73274ee463832c38a4897240d990654c447baad8b0024492cb882106e7e63757d54401c487cfad96038d1f5eabfea
-DIST FileZilla_3.38.1_src.tar.bz2 4983087 BLAKE2B a19b80b35535485fd1c03aa36a85aa1f894b106d09d1b78ab7e02fec6cec3e78e0612c343694e5fabaa2202802d2ba2cd2aa4e4d0840342f17c60c06c0c8bcf8 SHA512 a224c6f65253ceeef1f3049fd6304533a7efb427707c73481d3973d06e3b887f2511bc705e718a1018b287940c3d682794c6cf3d0e8d9e3c403a1e2f14ed01fc
 DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
 DIST FileZilla_3.40.0_src.tar.bz2 4997647 BLAKE2B 88ff2461d33369c435645f1dd5afa98c566141bf825e74898f870bd4c09cc7b47a70f605afbaf7be28855385812a28ea24303b6ec7f0ba605a793160c3b76027 SHA512 7aeb0c340111a47c435e8d8cbf379e83d2fc6c0a94038e085664df34c2fe1f8ef8496ea894f5e4cfd576d034e8935fe29661bb9eff9f22416032f45f5a66db2f
-EBUILD filezilla-3.34.0.ebuild 1803 BLAKE2B c04510be956992888544049b5b6c837c377f72b695fb5800471c6f727b1a9c2926aef3db754846bcff850e7cfb3ea5a4c505272b76aaa35be19ec940cbf13561 SHA512 fd8e85a7b5d9755bab0379ed38a79750d0b9baf4b0a244779e0c49f72df566cefb14bea83eb00c20ff1bb9ad3f318c680b94c73fc5222025e25c6f1a40e5ec7e
-EBUILD filezilla-3.37.4.ebuild 1773 BLAKE2B f4047b62f61357055ef3dd02bb1c86c73e8813ba9fd1af34dc605b9925aeaff810d61c920672ce614174cae80ba3366b0d6cc8db3872227f3d2b0ae4c34211b3 SHA512 99bbd32e2a1c4f2944dbbe15b21b0ca6e572614e536270763de8b1bb863bafd333c7865df4282171b15adfe5e4e8421e8ce59dfd63e36d3bdba65d8799674265
-EBUILD filezilla-3.38.1.ebuild 1773 BLAKE2B 237c7d4f03842a478d3fbcacc77dd851f682b4ff8e5743f5a85f4275dbb73507d45d77a2ea39138076f3137435c8fd63063720d9469e1e0b6a006937220c1f4d SHA512 6de6bf7356480bcbfc8e9123fc9def256710c0335357aa401b958425e9532617e286574e041b39b2ff8260fa1fc13d23de4beb3bc8007e28e8112f6bf454787a
+DIST FileZilla_3.41.1_src.tar.bz2 4994973 BLAKE2B 9aa8ad78125e69347055872790a13d46599415977d0f9064488efbdfc8cc052ac9e8ac4c03fe813f5947cb0b978db0872e45bf905bf02cd7d800fd52ca09b5f2 SHA512 6407ae883d10308529227a33ab4bfd36c564a68b322e896751ea21d106d04b0b8e095f1cb864063f59e0c64d0943f48a82cd63ae50c4be4561210659ba2f8ca0
+DIST FileZilla_3.41.2_src.tar.bz2 4994803 BLAKE2B 34f8331d3dfe3bdf483d234a0473074e17954b7d16abb7276ee6276221091f085c802d8cb0d397e00159b408d2737f5e23f2e50ad19d344c82472c09eea4dcd1 SHA512 c4b8284896942ba46f8f88fc5d60c6893c719e28ab94463848060850b6f9b2f4d3d13f580551dc3b21ab25ffc0cb1f43a2750500b5be2117952e14512a7ee40c
 EBUILD filezilla-3.39.0.ebuild 1771 BLAKE2B 05145bb2d43f0a6d24142732d4d1247a9073d53085b043e7ccc64c53933d3d77c3835e0ca226e363ed8f2b8739d674a1ee8d53b134251deb8c28745e0770ac53 SHA512 06fd729193fb6d0d130bc18b3f6a1a6d323a823d5eb34ce4e65e0f9151162186430fdbc960f6d0ebbe7c06115d33d0222e5a722fea100dd27c6a4faa2400b2fc
 EBUILD filezilla-3.40.0.ebuild 1773 BLAKE2B f3d7b9724a434a96c8a084cbee5039b6275b4855c38547a43bcae0575e6b1a1b51350ee52564c956514763b2805848d668e93c23b779d268a14f730b4e03024c SHA512 51a72bd06eb89c7e1e72d11ff526e31d5869efa55d9fda2e81a64d8b8cdd964dcc9ce1bbe1f49875188fed14ae6b534842a73a510be00c8a8c30f6ec52d637c2
+EBUILD filezilla-3.41.1.ebuild 1826 BLAKE2B efa0925d3551644ad2aef5d02a34fe9743362e354201f7417a654e6c80bc08464dd4cc78275e993b02eb9ff1fa4d4aec741af9fadd04d84a5cf6ce1bd755491f SHA512 91c1b0a634835392dc289eb4071d9cbc1c24514a8e5e5949fa441c4e0c9cb2475d750008e6fabca03c61cb9ae8a020f459da4e780a85224565000f0b92b295b1
+EBUILD filezilla-3.41.2.ebuild 1826 BLAKE2B efa0925d3551644ad2aef5d02a34fe9743362e354201f7417a654e6c80bc08464dd4cc78275e993b02eb9ff1fa4d4aec741af9fadd04d84a5cf6ce1bd755491f SHA512 91c1b0a634835392dc289eb4071d9cbc1c24514a8e5e5949fa441c4e0c9cb2475d750008e6fabca03c61cb9ae8a020f459da4e780a85224565000f0b92b295b1
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.34.0.ebuild b/net-ftp/filezilla/filezilla-3.34.0.ebuild
deleted file mode 100644
index a30171cc2a66..000000000000
--- a/net-ftp/filezilla/filezilla-3.34.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
-
-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.12.3
-	>=dev-libs/pugixml-1.7
-	net-dns/libidn:=
-	>=net-libs/gnutls-3.4.15
-	>=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() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
-		--disable-autoupdatecheck
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-ftp/filezilla/filezilla-3.37.4.ebuild b/net-ftp/filezilla/filezilla-3.41.1.ebuild
index 85ff00f6e5bd..2cdd971b5a38 100644
--- a/net-ftp/filezilla/filezilla-3.37.4.ebuild
+++ b/net-ftp/filezilla/filezilla-3.41.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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 gnome2-utils wxwidgets
+inherit autotools flag-o-matic wxwidgets xdg
 
 MY_PV=${PV/_/-}
 MY_P="FileZilla_${MY_PV}"
@@ -23,7 +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.14.0
+	>=dev-libs/libfilezilla-0.15.1
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.4.15
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
@@ -61,15 +61,23 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
+	local myeconfargs=(
 		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }
diff --git a/net-ftp/filezilla/filezilla-3.38.1.ebuild b/net-ftp/filezilla/filezilla-3.41.2.ebuild
index 1f2606a52b39..2cdd971b5a38 100644
--- a/net-ftp/filezilla/filezilla-3.38.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.41.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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 gnome2-utils wxwidgets
+inherit autotools flag-o-matic wxwidgets xdg
 
 MY_PV=${PV/_/-}
 MY_P="FileZilla_${MY_PV}"
@@ -23,7 +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.15.0
+	>=dev-libs/libfilezilla-0.15.1
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.4.15
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
@@ -61,15 +61,23 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
+	local myeconfargs=(
 		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }
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
+}
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index 3a42a23c716b..dc2c81d6598e 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,8 +1,9 @@
 DIST uftpd-2.4.tar.xz 173132 BLAKE2B 5bb1d90a2353e34d1a2346fa09c9843e598827875cc2c09beabf3916e34693dca17bc0d1f00773ce823cb79685204a20fa16d7abc8d4c88085dd1bdafc7e5acc SHA512 1ed9ed4429a3e7a08ac902ebac95610e58164f3528a8fc00a745c0545aae4e13d3bcbf597bcae6ba045b24ee9ba3c39ec0617068920bcc4bbc3f5ef246d4c404
 DIST uftpd-2.5.tar.xz 178652 BLAKE2B 888f6a6be9752d36470de0aa0dd3ec5ffeca335099897fb9a03a0573752257b88d5662f53cfb8c078f2b8efe3dd384b12833def2bea38c5440915b60b3832e78 SHA512 7f7f80f0a291cf57d68570de62c663804af0fa0fa4f0e5e199280c97d0d662881a05d1e0cc908f33e85cc8e07d825813e63271a94a69cd2e6bb974820566ccac
 DIST uftpd-2.6.tar.xz 93532 BLAKE2B 472b6dec74d5df50a93c27f85cff1ceff9bac8bcf3343d7ca7842e2bd51813ba8c0b5b679062eba5dccca0d5ec586302ad7889dd69273b4e08fe6330d70b7dbd SHA512 56e893cda1e807b01021130a763d6409a0e480f7dfb03e3ac9378d76d459a38c9c602d7fac523c3cf353fe972a61e2f8c131003e7dd0c07e5588f3a18b3e3c4d
+DIST uftpd-2.7.tar.xz 161608 BLAKE2B fb759cb4e3f0495ac28bd84c36f46a7ff54565d729602427b2b44d0fea5b42f97df5397e095d4c3c428bbe87d97dced470f93129c8bf84c348a6e15bb226329c SHA512 0cdf7ba82fec53d067baf15c7ad84bbdfeb9dfbba4459c9eca497915f987d44573db0c47db451abd2b5936fd3135e7644ce0c734c6efe2c8e3ad5c172f5137ac
 EBUILD uftpd-2.4-r1.ebuild 457 BLAKE2B 33c4de8d31cbf9d7c14efd8173fda8136afc8c3fa4f43d964220c9c7c05cd6ac95d1dfe2556b1887e6a3545b05dc4c45be537ce034f423cab6fab714406c061f SHA512 f0451976a5643cc09a4e185c4c01b8a3ffdb7ade01609f68b849af1697db1cfe45b1ed2709b18934e847f02bce3b061cddb221788184a5b57a202398f84bfedc
-EBUILD uftpd-2.4.ebuild 428 BLAKE2B b047cc73d1822a2f401074c34aaf804b3fbf7a3b87b3d7e217c96f8f7f000f7dbfbb0fd695b8e69021910d23e49c388ea39c404c4f514e1bf19bb14f663d57b1 SHA512 94172f2592ca4164e8eaecbae9fcc12d972b4ab2703968cc80eee7a034f557d60840db8ee2c4546956a200c3b98d48b8efdbd02b8c852fd6ec89da4f7be40634
 EBUILD uftpd-2.5.ebuild 511 BLAKE2B b3a02f0678a9dc91cec8ecaa10ed8836b0d59ea616705195afe880490c960ff48bdbffe6b70f35c66b075bc5ac6cb9188bbc163eaeb37c7ba7d5bd9ca9337e9a SHA512 99fde323bbaf3da57bc17f65e55556f8a87c8528c1fcc4cc57ce7c084bd41c21a29049a38c6273d7273f61f35ef4dcbd9483edb6328fc1d0f350446e5caf0eb1
 EBUILD uftpd-2.6.ebuild 513 BLAKE2B 40927218cccbe80700c23723d4f96e2134e76039bbe2dc6887e9b743f4397f7af5ebd7b2afb37e12f5731be4d7b6217e0f02c24c7a731cd9f52bef4859c4a31a SHA512 b836ceee94a9b610c50ae864b320830cb2855093e4fa922caf5fbd7c8767f63a1b4fce0db196d1a2d20df5cbe88da12d78f16561aaa670c16169b5e32056327b
+EBUILD uftpd-2.7.ebuild 522 BLAKE2B 7838d70f6397faed4708105708d8cc6917ffa512bf64630f724e07bb4c34e3bf3356afb01fcc600ba684ac35945e520d40a3e3839e490bfba0d4d267fbf5b03b SHA512 4e91bf8b5b6ce5c6b84ecf16be508c43c60b9ae2d8a6ba18faee2c96eee697da280528c6619129f7205fbd20410258e162aadc1ef85db51620bed510dacfd803
 MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.4.ebuild b/net-ftp/uftpd/uftpd-2.7.ebuild
index e741e5bc2068..1a96f19931f6 100644
--- a/net-ftp/uftpd/uftpd-2.4.ebuild
+++ b/net-ftp/uftpd/uftpd-2.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="The no nonsense TFTP/FTP server"
 HOMEPAGE="https://github.com/troglobit/uftpd"
@@ -13,8 +13,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	dev-libs/libite
-	dev-libs/libuev
-	!!net-misc/uftp"
+	>=dev-libs/libite-1.5
+	>=dev-libs/libuev-2.2"
 
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	!net-misc/uftp
+	!net-ftp/atftp"
+
+src_install() {
+	emake DESTDIR="${D}" install doc_DATA=README.md
+}