From 800629fbe1e806757c79537eaa1bf5b37b937174 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 14 Feb 2023 08:26:34 +0000 Subject: net-ftp/lftp: fix configure w/ clang 16 Signed-off-by: Sam James --- .../lftp/files/lftp-4.9.2-configure-clang16.patch | 22 +++++ net-ftp/lftp/lftp-4.9.2-r1.ebuild | 107 +++++++++++++++++++++ net-ftp/lftp/lftp-4.9.2.ebuild | 106 -------------------- 3 files changed, 129 insertions(+), 106 deletions(-) create mode 100644 net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch create mode 100644 net-ftp/lftp/lftp-4.9.2-r1.ebuild delete mode 100644 net-ftp/lftp/lftp-4.9.2.ebuild diff --git a/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch b/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch new file mode 100644 index 000000000000..d039390ffb80 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch @@ -0,0 +1,22 @@ +https://github.com/lavv17/lftp/commit/8af97cc255c3d2488adb107515bd1047dbedadfe + +From 8af97cc255c3d2488adb107515bd1047dbedadfe Mon Sep 17 00:00:00 2001 +From: DJ Delorie +Date: Wed, 8 Feb 2023 23:37:37 -0500 +Subject: [PATCH] Fix C99 compatibility issue + +Related to: + + + +--- a/m4/needtrio.m4 ++++ b/m4/needtrio.m4 +@@ -9,6 +9,7 @@ AC_DEFUN([LFTP_NEED_TRIO],[ + else + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ #include + int main() + { + unsigned long long x=0,x1; + diff --git a/net-ftp/lftp/lftp-4.9.2-r1.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild new file mode 100644 index 000000000000..9047ab306f17 --- /dev/null +++ b/net-ftp/lftp/lftp-4.9.2-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2023 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="http://lftp.yar.ru/" +SRC_URI="http://lftp.yar.ru/ftp/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="convert-mozilla-cookies +gnutls idn ipv6 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? ( dev-libs/openssl: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 + "${FILESDIR}"/${PN}-4.9.2-ac-270.patch + "${FILESDIR}"/${PN}-4.9.2-configure-clang16.patch +) + +src_prepare() { + default + + # bug #875692 + sed -e '/#include/s/cmath/math.h/' -i trio/*.c || 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() { + 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 +} diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild deleted file mode 100644 index 59f56239e17f..000000000000 --- a/net-ftp/lftp/lftp-4.9.2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 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="http://lftp.yar.ru/" -SRC_URI="http://lftp.yar.ru/ftp/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="convert-mozilla-cookies +gnutls idn ipv6 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? ( dev-libs/openssl: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 - "${FILESDIR}"/${PN}-4.9.2-ac-270.patch -) - -src_prepare() { - default - - # bug #875692 - sed -e '/#include/s/cmath/math.h/' -i trio/*.c || 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() { - 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 -} -- cgit v1.2.3-65-gdbad