From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D63861392A2 for ; Fri, 27 Mar 2020 06:46:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FDBDE0E7F; Fri, 27 Mar 2020 06:46:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 021DBE0D16 for ; Fri, 27 Mar 2020 06:46:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C020434F946 for ; Fri, 27 Mar 2020 06:46:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 548E319F for ; Fri, 27 Mar 2020 06:46:04 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1585291562.74b9ddb6a09a6b6cfdbfb98d98e18a6db0220e51.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/lftp/files/lftp-9999-libdir-readline.patch net-ftp/lftp/lftp-9999.ebuild X-VCS-Directories: net-ftp/lftp/ net-ftp/lftp/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 74b9ddb6a09a6b6cfdbfb98d98e18a6db0220e51 X-VCS-Branch: master Date: Fri, 27 Mar 2020 06:46:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c1212b2-4ec5-4910-bfcf-ea1353fb0a4b X-Archives-Hash: 34316c95158bf1338671ad3fa55af28a commit: 74b9ddb6a09a6b6cfdbfb98d98e18a6db0220e51 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Mar 27 06:34:34 2020 +0000 Commit: Jeroen Roovers gentoo 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 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() {