commit:     74b9ddb6a09a6b6cfdbfb98d98e18a6db0220e51
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 06:34:34 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 06:46:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b9ddb6

net-ftp/lftp: Update live ebuild

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-ftp/lftp/files/lftp-9999-libdir-readline.patch | 11 +++++++++++
 net-ftp/lftp/lftp-9999.ebuild                      |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/net-ftp/lftp/files/lftp-9999-libdir-readline.patch 
b/net-ftp/lftp/files/lftp-9999-libdir-readline.patch
new file mode 100644
index 00000000000..fde1017f4bd
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-9999-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-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 44b55978713..b38775a32ae 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.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
@@ -53,11 +53,11 @@ DOCS=(
 PATCHES=(
        "${FILESDIR}"/${PN}-4.5.5-am_config_header.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}-9999-libdir-readline.patch
 )
 
 src_prepare() {

Reply via email to