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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9359115812D for ; Sat, 04 Jan 2025 23:25:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29F67E077C; Sat, 04 Jan 2025 23:25:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6E6DE076B for ; Sat, 04 Jan 2025 23:25:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2D1734027D for ; Sat, 04 Jan 2025 23:25:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FF441948 for ; Sat, 04 Jan 2025 23:25:43 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1736033129.75c1c12749f6a29e7a5da150113dc9210be6393f.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/lftp/lftp-9999.ebuild X-VCS-Directories: net-ftp/lftp/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 75c1c12749f6a29e7a5da150113dc9210be6393f X-VCS-Branch: master Date: Sat, 04 Jan 2025 23:25:43 +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: 02b82a08-0d5a-4fbd-bdcf-96465faec74c X-Archives-Hash: a39c625f456ce9a6a91b1522703c0cee commit: 75c1c12749f6a29e7a5da150113dc9210be6393f Author: Conrad Kostecki gentoo org> AuthorDate: Sat Jan 4 23:24:40 2025 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Jan 4 23:25:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c1c127 net-ftp/lftp: update live ebuild Signed-off-by: Conrad Kostecki gentoo.org> net-ftp/lftp/lftp-9999.ebuild | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild index 4eeb8cb7874b..a5e731f6531e 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools git-r3 libtool xdg-utils DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" @@ -10,7 +11,6 @@ EGIT_REPO_URI="https://github.com/lavv17/lftp" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" IUSE="convert-mozilla-cookies +gnutls idn nls socks5 +ssl verify-file" RDEPEND=" @@ -36,10 +36,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} - dev-libs/gnulib =dev-build/libtool-2* app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19 ) + nls? ( >=sys-devel/gettext-0.21 ) virtual/pkgconfig " @@ -47,14 +46,18 @@ DOCS=( BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels README.dnssec README.modules THANKS TODO ) + PATCHES=( - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch + "${FILESDIR}"/${PN}-4.0.2.91-lafile.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 + "${FILESDIR}"/${PN}-4.9.2-socks.patch + "${FILESDIR}"/${PN}-4.9.3-gnulib.patch ) # Gnulib false positive #900064 @@ -66,12 +69,12 @@ src_prepare() { # bug #875692 sed -e '/#include/s/cmath/math.h/' -i trio/*.c || die - gnulib-tool --update || die - - chmod +x build-aux/git-version-gen || die - eautoreconf + elibtoolize # for Darwin bundles + + # bug #536036 + printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die } src_configure() { @@ -81,7 +84,7 @@ src_configure() { $(use_with socks5 socksdante "${EPREFIX}"/usr) \ $(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \ $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ - --enable-ipv6 + --enable-ipv6 \ --enable-packager-mode \ --sysconfdir="${EPREFIX}"/etc/${PN} \ --with-modules \ @@ -90,8 +93,7 @@ src_configure() { } src_install() { - # FIXME: MKDIR_P is not getting picked up in po/Makefile - emake DESTDIR="${D}" mkdir_p="mkdir -p" install + default local script for script in {convert-mozilla-cookies,verify-file}; do