gentoo resync : 08.08.2018

3 files changed, 2 insertions, 105 deletions

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 3149943a2488..d21a64921b25 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -13,10 +13,8 @@ AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd
 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
 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
-DIST lftp-4.8.2.tar.xz 1598920 BLAKE2B 2946a0ac3e915983e85f08f4c8a293cfd76b837dff007c60230522f4633dac9f9f198ee1d0e9e0d13217b83a55e46bd024d18d863e44bc17071561da6ec917a6 SHA512 582775c27f020a6864b960a06681698522842e147deee6dba18115738af56fc0094c2b21ed1eb4984626276472f707be795fcf4b23f451ba17a60e4bf8facd5e
-DIST lftp-4.8.3.tar.xz 1602324 BLAKE2B 196a9a08f97512952ea8c9e95b85c7222765a9df05d300d6c2cc3bd934b746d0c62a3d4c93a5c6eb3f1eca138495ae1c09edc31ad4f5516128c44fd3b8bbf2de SHA512 16d0ddc36ac00db009fd4e634a2eaa575bd1c690ea7e1af396317ccc677704d2a4dfa19ea0c46dab83450072714086ed2b15ac00ffe51ec5c9bb900e5e744583
+DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
 EBUILD lftp-4.7.5.ebuild 2552 BLAKE2B 3d99cfd051ade3491264a80c2640685720425faa4d783293b23ed6baa8699e82cc12e6a8259ddcacde5d8308efecfe1bc37f267b42735589b04f8b6614fcf98d SHA512 cfcb38856ceb7c195c64467fba134b8b744c3b35a4f411e3928e99df72bec286e70e0f877948bd10075e379b9efd3dce93cd3a3f21d8e6e316d7ef75b49a11c7
-EBUILD lftp-4.8.2.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
-EBUILD lftp-4.8.3.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
+EBUILD lftp-4.8.4.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
 EBUILD lftp-9999.ebuild 2351 BLAKE2B 252c1c026a5bad4adc8b37fb16819c53090be97e18a8df4befcde504ddfc56bf7f62ca32800250729499248319799c43dc4616aa93ca7c48137a670fae9bb0b2 SHA512 714b570e69f9978fce0fb3726187110e4c1f9733a3cf6b4ed7a06d1b536a248c5c7300ad43c45558a458350bff1695ba365c6e7d7c31d6accdc7796c40a47030
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
diff --git a/net-ftp/lftp/lftp-4.8.3.ebuild b/net-ftp/lftp/lftp-4.8.3.ebuild
deleted file mode 100644
index 3ea35f33f1da..000000000000
--- a/net-ftp/lftp/lftp-4.8.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool
-
-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
-}
diff --git a/net-ftp/lftp/lftp-4.8.2.ebuild b/net-ftp/lftp/lftp-4.8.4.ebuild
index 3ea35f33f1da..3ea35f33f1da 100644
--- a/net-ftp/lftp/lftp-4.8.2.ebuild
+++ b/net-ftp/lftp/lftp-4.8.4.ebuild