jer 14/10/15 14:28:25 Modified: lftp-9999.ebuild lftp-4.6.0.ebuild ChangeLog Log: Fix building with USE=-ssl. Replace net-libs/gnutls-2 compatibility patch with upstream patch. Remove patch that no longer applies -9999. (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.3 net-ftp/lftp/lftp-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild?r1=1.2&r2=1.3 Index: lftp-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lftp-9999.ebuild 13 Oct 2014 19:28:18 -0000 1.2 +++ lftp-9999.ebuild 15 Oct 2014 14:28:25 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild,v 1.2 2014/10/13 19:28:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild,v 1.3 2014/10/15 14:28:25 jer Exp $ EAPI=5 inherit autotools eutils git-r3 libtool @@ -58,7 +58,6 @@ src_prepare() { epatch \ - "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \ "${FILESDIR}"/${PN}-4.5.3-autopoint.patch \ "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch 1.3 net-ftp/lftp/lftp-4.6.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild?r1=1.2&r2=1.3 Index: lftp-4.6.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lftp-4.6.0.ebuild 14 Oct 2014 08:56:58 -0000 1.2 +++ lftp-4.6.0.ebuild 15 Oct 2014 14:28:25 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild,v 1.2 2014/10/14 08:56:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild,v 1.3 2014/10/15 14:28:25 jer Exp $ EAPI=5 inherit autotools eutils libtool @@ -61,7 +61,8 @@ "${FILESDIR}"/${PN}-4.3.8-gets.patch \ "${FILESDIR}"/${PN}-4.5.3-autopoint.patch \ "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch \ - "${FILESDIR}"/${PN}-4.6.0-gnutls-2-compat.patch + "${FILESDIR}"/${PN}-4.6.0-gnutls-2-compat.patch \ + "${FILESDIR}"/${PN}-4.6.0-no-ssl.patch eautoreconf elibtoolize # for Darwin bundles 1.490 net-ftp/lftp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/ChangeLog?rev=1.490&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/ChangeLog?rev=1.490&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/ChangeLog?r1=1.489&r2=1.490 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v retrieving revision 1.489 retrieving revision 1.490 diff -u -r1.489 -r1.490 --- ChangeLog 14 Oct 2014 08:56:58 -0000 1.489 +++ ChangeLog 15 Oct 2014 14:28:25 -0000 1.490 @@ -1,6 +1,12 @@ # ChangeLog for net-ftp/lftp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.489 2014/10/14 08:56:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.490 2014/10/15 14:28:25 jer Exp $ + + 15 Oct 2014; Jeroen Roovers <[email protected]> lftp-4.6.0.ebuild, + lftp-9999.ebuild, files/lftp-4.6.0-gnutls-2-compat.patch, + +files/lftp-4.6.0-no-ssl.patch: + Fix building with USE=-ssl. Replace net-libs/gnutls-2 compatibility patch + with upstream patch. Remove patch that no longer applies -9999. 14 Oct 2014; Jeroen Roovers <[email protected]> lftp-4.6.0.ebuild, +files/lftp-4.6.0-gnutls-2-compat.patch:
