commit: 93ce6a29b012ae8e10039e4f9a02c71bc8745e39 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri May 3 08:26:24 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri May 3 08:26:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ce6a29
net-ftp/lftp: Old Package-Manager: Portage-2.3.66, Repoman-2.3.12 Bug: https://bugs.gentoo.org/show_bug.cgi?id=662882 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-ftp/lftp/Manifest | 1 - .../lftp/files/lftp-4.7.5-libdir-configure.patch | 10 -- net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch | 10 -- net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch | 18 ---- net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch | 28 ------ net-ftp/lftp/lftp-4.7.5.ebuild | 98 -------------------- net-ftp/lftp/lftp-4.8.4.ebuild | 101 --------------------- 7 files changed, 266 deletions(-) diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index eeccc3697da..7fc73c4df9c 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -1,2 +1 @@ -DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1 diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch deleted file mode 100644 index e855ac19432..00000000000 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,6 @@ - esac - - if test x$socks_loc != x; then -- LDFLAGS="$LDFLAGS -L$socks_loc/lib" - CPPFLAGS="$CPPFLAGS -I$socks_loc/include" - fi - diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch deleted file mode 100644 index 890138013da..00000000000 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/m4/lftp.m4 -+++ b/m4/lftp.m4 -@@ -319,7 +319,6 @@ - libidn=$withval, libidn=yes) - if test "$libidn" != "no"; then - if test "$libidn" != "yes"; then -- LDFLAGS="${LDFLAGS} -L$libidn/lib" - CPPFLAGS="${CPPFLAGS} -I$libidn/include" - fi - AC_CHECK_HEADER(idna.h, diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch deleted file mode 100644 index 44c5239ae03..00000000000 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/m4/ssl.m4 -+++ b/m4/ssl.m4 -@@ -10,7 +10,6 @@ - old_CPPFLAGS="$CPPFLAGS" - LIBS="$LIBS -lssl -lcrypto" - if test $loc != default; then -- LDFLAGS="$LDFLAGS -L$loc/lib" - CPPFLAGS="$CPPFLAGS -I$loc/include" - fi - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h> -@@ -21,7 +20,6 @@ - if test $found_loc != "none"; then - lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\"" - if test $found_loc != default; then -- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\"" - lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include" - fi - break; diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch deleted file mode 100644 index 791bd2c5a3b..00000000000 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -305,7 +305,6 @@ - - AX_CHECK_ZLIB([ - AC_SUBST([ZLIB],[-lz]) -- AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib"]) - AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"]) - ],[ - AC_MSG_ERROR([cannot find -lz library, install zlib-devel package]) ---- a/m4/ax_check_zlib.m4 -+++ b/m4/ax_check_zlib.m4 -@@ -105,7 +105,6 @@ - ZLIB_OLD_LDFLAGS=$LDFLAGS - ZLIB_OLD_CPPFLAGS=$CPPFLAGS - if test -n "${ZLIB_HOME}"; then -- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" - CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" - fi - AC_LANG_SAVE -@@ -120,7 +119,6 @@ - # - m4_ifblank([$1],[ - CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" -- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" - LIBS="-lz $LIBS" - AC_DEFINE([HAVE_LIBZ], [1], - [Define to 1 if you have `z' library (-lz)]) diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild deleted file mode 100644 index 6dac748590d..00000000000 --- a/net-ftp/lftp/lftp-4.7.5.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils libtool - -DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" -HOMEPAGE="https://lftp.tech/"; -SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~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/libidn:= ) - socks5? ( - >=net-proxy/dante-1.1.12 - virtual/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-configure.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-libidn.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-openssl.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-zlib.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 libidn) \ - $(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 -} diff --git a/net-ftp/lftp/lftp-4.8.4.ebuild b/net-ftp/lftp/lftp-4.8.4.ebuild deleted file mode 100644 index 2fe153fc40d..00000000000 --- a/net-ftp/lftp/lftp-4.8.4.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils libtool - -DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" -HOMEPAGE="https://lftp.tech/"; -SRC_URI=" - ${HOMEPAGE}ftp/${P}.tar.xz -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~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 - virtual/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.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 -) - -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 -}
