gentoo resync : 15.01.2020

10 files changed, 220 insertions, 39 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index b6d211421488..a606175ceba8 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 9e5295522568..e605d93e88a7 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -3,8 +3,10 @@ DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624
 DIST FileZilla_3.44.2_src.tar.bz2 4619337 BLAKE2B 11d61b14fcf464706dabe491fa8cbfa28fb516c3e1aafd887679ed6f1a80ba835dc43403c32b1344854f00f5b56f7e27c72bbca197cfadc92e69d92ebb0b1458 SHA512 9d4678a3a06f0ecac5ecfbae33f83df5f07e26da4f4a7e922fe5b00a5e59d5728af028667f6fa56210a23ecaa1c2a661d1874b218c2511a783644ed2b03e36ad
 DIST FileZilla_3.45.1_src.tar.bz2 4649083 BLAKE2B 8d3113e5ce96d2115a6ec02109f2617d3d58109464c527284baecacea733d2f564206779cd32be4060171d7fcd8768b0296b445842b8c2964b173ca360983082 SHA512 feb267b85ad2843baea0c6df66ed86866121f33e2295fcb9003a8bc2603ad684f4fe801ea842cb291e3fb5cd7195ccb2d21bfa95711a61be6b4debfd4e1c7822
 DIST FileZilla_3.46.0_src.tar.bz2 4661100 BLAKE2B ccda60b590e85afd7de0edd064ee7b993e663e43643f262378db6d26a019730ec493518e0e2b39bce0710acafe888f47f84ecb098e35d3b32061f089a99a6a30 SHA512 26ffb039b4a6d51d6d1011ee452f3690f74514c91a9e58c79880dbf778296cfc81283fade52f65f81654b828449e2b7e703b1d6c1e2e84c08f54681d2aa92674
+DIST FileZilla_3.46.3_src.tar.bz2 4720329 BLAKE2B 92369d2fb3b8c9eded37f912bbd25a0e995a5fc1ab86ef6aa746a8eb239f17e8fafa78de00529b0f3af102fe268b51a60ce40ac967cf9b2fbbd6fa7900898ffc SHA512 35b61c3bfd1d40848e7846b4533da8844df0e4873cb89286b90330cbc29dffeff96fcab10aec908a08d9129198bb2d80df8f223d8ebc1a0863a4083cb06abffc
 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
+EBUILD filezilla-3.46.3.ebuild 1888 BLAKE2B 5e2f24d76263547e37ad666135d1d0bf0008c1c05d358392a3a3b5dc0fd361179b2c0b3db57ec1d2bdf1f29673934182119143ffcbefb163954e41c1f2219e9a SHA512 d1dba5262e94143141cb224e3034e883941f4012a80349a17dead8d492a675153fb756f1b315488c6dc63bcbe96c8ef3af3965c0bcf1e416711e9fbe81109ab5
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.46.3.ebuild b/net-ftp/filezilla/filezilla-3.46.3.ebuild
new file mode 100644
index 000000000000..cd36d5e5cd86
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.46.3.ebuild
@@ -0,0 +1,86 @@
+# 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.19.3:=
+	<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]
+	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
+)
+
+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/lftp/Manifest b/net-ftp/lftp/Manifest
index 043c6c69f26e..6bd00e03098e 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -8,7 +8,10 @@ AUX lftp-4.8.2-libdir-configure.patch 530 BLAKE2B b376a53130563d37329e701d77b5a9
 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
 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
-EBUILD lftp-4.8.4-r1.ebuild 2634 BLAKE2B 98da9f84fb59f04c4f3bb17a0a1e611a28ae376ac36d764386e9380a8390f478f13fe5f01cbccfc6273027008396683c0824e7b16504eca6e8d81e405008a15c SHA512 c02de1c806a914dfaeeec002eacad48e3f1fc23ab00d8ac80464ebb7498dae227a2b4cab3197b80dffa261ecc0de26a74c35c72ba69be0939c027b3962b887e2
+DIST lftp-4.9.0.tar.xz 1642596 BLAKE2B 111e559c98e0572e1ca79f935a1db8c45c99275c8aa7b584be06d1738296b32808e97d696a02751575c5d1ea24a30a52f5d9f177a193f70addf1168e3208aa13 SHA512 8d83ea76390d38cb1f84f02eb7bf45780758afb9fe61f5b7278a48c9a5d216d03bc8b699c0f449a0036bdb441b4225af074da1b5e92a77ddb61aca704758211e
+EBUILD lftp-4.8.4-r1.ebuild 2638 BLAKE2B 080f74b4e0f85ce80ec41d0d3ab9d973e29687d403b39c6b13c1a651ed38acc589c318d8da0d8f7a58dc7568c13a1934c0f63622f01407a1280c088cc6184c1f SHA512 fdfe756c3bb98b24a60db5bdab8eda92313e30d27ce3bbc374ad47ba083f7af383dc8c8ce8fe5c885f3302eeec869b019e0d776171351cb9e8483cd024aadf01
+EBUILD lftp-4.9.0.ebuild 2685 BLAKE2B 7a87acb519d1d28651e637746feab44b9035147eb3a45b2b600bf3aff939e0ba051a8d06b7211114fd671ea7b78b461459ceb6ead7116bb9ec0d9ff50839b23d SHA512 e2f203ba0f6017882724e7c4902126c7af33a3ad9d5706fdd4a753808eb3a28b21559d01afbc0ba77e3949a7394b2900285885668f61e385461fd027df1ff6b0
 EBUILD lftp-9999.ebuild 2438 BLAKE2B 4061f2513e9a5695288c66590604fafd4641280e9a72a4be1a60d5c9a6337088d082734291f9d54d35083cbff0c634b18495bcd7b963b09abc82a22d6f841a72 SHA512 71a5ab649e24cb8f49d686830bb3a0a56a0cd4cd15d5a563a2fed2592c46ae71f0d3630d3479bf5ac7a8c22e70214523354e054872d0be5145e13ac6efb40e38
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
diff --git a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
new file mode 100644
index 000000000000..2c02ce5e787b
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
@@ -0,0 +1,18 @@
+--- 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/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
index 239987fda9a7..8fb8b288d1d8 100644
--- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
@@ -6,9 +6,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
-"
+SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-ftp/lftp/lftp-4.9.0.ebuild b/net-ftp/lftp/lftp-4.9.0.ebuild
new file mode 100644
index 000000000000..5492c31e378d
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.9.0.ebuild
@@ -0,0 +1,106 @@
+# 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="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 ~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
+		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/uftpd/Manifest b/net-ftp/uftpd/Manifest
index 3decd6d42ad1..455b106aafcf 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,7 +1,5 @@
 DIST uftpd-2.10.tar.xz 161948 BLAKE2B 9a6c72758e12cf8190b9aaea72c337997bd544c4fbee1f6de44de178e698ccf2eb1ddfcb0b48de23ebe669aa2d0d0d74ae0510b48e8e3f2b4d50d3f39f4e9901 SHA512 d9fbeca46b7bf8cbc258e501591e1e1af26ed380578276eacc2fdf0331cb66bbee6e715ee3d2021366b7884022f2e733b6d676f72649e97acff7d8dc3045be9e
-DIST uftpd-2.7.tar.xz 161608 BLAKE2B fb759cb4e3f0495ac28bd84c36f46a7ff54565d729602427b2b44d0fea5b42f97df5397e095d4c3c428bbe87d97dced470f93129c8bf84c348a6e15bb226329c SHA512 0cdf7ba82fec53d067baf15c7ad84bbdfeb9dfbba4459c9eca497915f987d44573db0c47db451abd2b5936fd3135e7644ce0c734c6efe2c8e3ad5c172f5137ac
-DIST uftpd-2.8.tar.xz 160920 BLAKE2B 53816a12e23fa5ebf80590c51ac5d713f84ef452248da3849116236cdf26e84b2aed91c92df49dc2346593f3b9b3536a681b869cbbb6ada60419fc233c54bd71 SHA512 d6668729f572fc62cd4060b9fbff26bdcd4055d6faf2f733e4f54c160783d573e808e4ad09341b25571ebc983aa19ada11a5513ab986742cbd12883cc495329c
+DIST uftpd-2.11.tar.xz 182000 BLAKE2B 75c9a564a90b10f2efdbfaaab67572adefda160d7b5df8fd303cfd970153ee24bdfbfb25dca1764d7b747a27779a2863a1b32a0ec489fbc2e4f3f991bc3436ee SHA512 bce9fe3d763d61030e883bba7988d206630f2124991ce0c11613744813f66ed8bf215a555e0061d0083d32b90ac5c9b583adf08520fb691617adeac759d50546
 EBUILD uftpd-2.10.ebuild 454 BLAKE2B c69bf9e3e15ce56b12991305dc30a77185ce80fcbe9a6101f4105c6975143bfbedbed20723abb2c21057d543dbb1cc7c8725b1ffad04a231c17e4d85fe68586e SHA512 1115d7ab9a907c509efdc5c5ea19fb31f4f5684226e4d9805e7e8f5053cc0f6fd2082db5371882f684502f88f1c68da87f25a54970b5d85ad1329a5854f9d81f
-EBUILD uftpd-2.7.ebuild 522 BLAKE2B 7838d70f6397faed4708105708d8cc6917ffa512bf64630f724e07bb4c34e3bf3356afb01fcc600ba684ac35945e520d40a3e3839e490bfba0d4d267fbf5b03b SHA512 4e91bf8b5b6ce5c6b84ecf16be508c43c60b9ae2d8a6ba18faee2c96eee697da280528c6619129f7205fbd20410258e162aadc1ef85db51620bed510dacfd803
-EBUILD uftpd-2.8.ebuild 522 BLAKE2B 7838d70f6397faed4708105708d8cc6917ffa512bf64630f724e07bb4c34e3bf3356afb01fcc600ba684ac35945e520d40a3e3839e490bfba0d4d267fbf5b03b SHA512 4e91bf8b5b6ce5c6b84ecf16be508c43c60b9ae2d8a6ba18faee2c96eee697da280528c6619129f7205fbd20410258e162aadc1ef85db51620bed510dacfd803
+EBUILD uftpd-2.11.ebuild 454 BLAKE2B c72336d1ad331c59c67f40167cb966dc9d9ffe4bf51b58bc567c0ae775c650df75b55cc6926744515f73918422c0489bd7b7c32180a2e951472d587c80bcecd7 SHA512 bc3c6f1b80b80e975f659ea52514c3485f1103d1ebdea2e868ba88e7f6388643072985bf96eb06e92abd9003fe48fe90668df8b61c8f87d7ce5692fb6edebc3c
 MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.7.ebuild b/net-ftp/uftpd/uftpd-2.11.ebuild
index 1a96f19931f6..fc8503685308 100644
--- a/net-ftp/uftpd/uftpd-2.7.ebuild
+++ b/net-ftp/uftpd/uftpd-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,3 @@ RDEPEND="
 	${DEPEND}
 	!net-misc/uftp
 	!net-ftp/atftp"
-
-src_install() {
-	emake DESTDIR="${D}" install doc_DATA=README.md
-}
diff --git a/net-ftp/uftpd/uftpd-2.8.ebuild b/net-ftp/uftpd/uftpd-2.8.ebuild
deleted file mode 100644
index 1a96f19931f6..000000000000
--- a/net-ftp/uftpd/uftpd-2.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The no nonsense TFTP/FTP server"
-HOMEPAGE="https://github.com/troglobit/uftpd"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/libite-1.5
-	>=dev-libs/libuev-2.2"
-
-RDEPEND="
-	${DEPEND}
-	!net-misc/uftp
-	!net-ftp/atftp"
-
-src_install() {
-	emake DESTDIR="${D}" install doc_DATA=README.md
-}