gentoo resync : 16.01.2020

3 files changed, 119 insertions, 0 deletions

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 6bd00e03098e..e8fc5bc038c0 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -9,9 +9,12 @@ 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
 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
 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
 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-4.9.1.ebuild 2647 BLAKE2B fa80daecd6dde52a240315ab5e962858437aaca2facef16b39fe04e81115c14d4826a974a7f3c77611e3ce27b9a0c4e4a1640ed219da4bbf1e8893caa53af061 SHA512 f11cc44daa678b17d4345adae1ebcde1a3d7eac2a7b987227d40a2ed3c54254688a106af3e1c431e51c89f5b5fafed74581b6f65d47369b67218c56f504ec40e
 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.1-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch
new file mode 100644
index 000000000000..fde1017f4bdc
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch
@@ -0,0 +1,11 @@
+--- 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.9.1.ebuild b/net-ftp/lftp/lftp-4.9.1.ebuild
new file mode 100644
index 000000000000..33630583e6bb
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.9.1.ebuild
@@ -0,0 +1,105 @@
+# 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 ~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.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
+}