Old.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 9 insertions, 119 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 8aec179aa85b..e6fff3e7d594 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.506 2014/12/08 10:58:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.507 2014/12/08 14:40:21 jer Exp $
+
+  08 Dec 2014; Jeroen Roovers <jer@gentoo.org> -lftp-4.5.5.ebuild,
+  -files/lftp-4.5.5-no_ssl.patch:
+  Old.
 
   08 Dec 2014; Agostino Sarubbo <ago@gentoo.org> lftp-4.6.0.ebuild:
   Stable for ppc64, wrt bug #529918
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 637dc496acf6..b9a9637eb053 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -5,30 +5,17 @@ AUX lftp-4.0.2.91-lafile.patch 976 SHA256 b54aac35c297657290a2d9571c38bdc4bf5154
 AUX lftp-4.3.8-gets.patch 430 SHA256 20f3f931132aae70c6dc8b03368419951bb4ec9f0d4cfcaf5966db3c6689da35 SHA512 24e61ec6784fdf95b5df75ed29680465e9fac87f9b79eaf4a9156a32c66afd4db5b905c7e29789a8a0e0d7c6b4c782b1f749e52d4c9547c96c1b79834c2a750a WHIRLPOOL 399f1a0714ada86a47a567d49a1d093b4900847fb38994e9adbc95c82d879e061d057945d66a0f26a6015c3737f586e6b83da8d1d5b30f7f103fc4d2e2ee523e
 AUX lftp-4.5.3-autopoint.patch 333 SHA256 36d84c281ecf244cfcd53231ace3085ee1ffccc28083d56c1bf0023d70ce3ac9 SHA512 33ce25fb283dd6d3e760166a718de16ee59a5190202e005f80a970cadc033e90dce5f2d0c848893304a9458c44f8a79bca3084a14db5484e1a739e52dd8aee3f WHIRLPOOL dcfee41610952d394cf8182417ce3abd215368f4f8c58704f381b87c1134e99c4b84279e9e47a47fec4a7550789287deb022ae9e103920d7965d5cf8fc407765
 AUX lftp-4.5.5-am_config_header.patch 306 SHA256 7ab090449f8c26624ebe853a0285954c414e31242fcd3db1026bd88d6ebbd6a0 SHA512 613c0942ec5c4b9de38b6020eddcfcbe91ad6febd176b2953503ee47c82a11a9ed661b442127b25383d1f6593df0ce6837229939ec48da5c36079b145ab488b9 WHIRLPOOL 3d2c0fccdf6f13ed9176bb99c9da13601fd6e8a04c46c6dc62a215334fa7531e684ffcdcbf769a6df7ab14f5e49e3bafecdcab09f990a3202cd1e079917f48ea
-AUX lftp-4.5.5-no_ssl.patch 220 SHA256 cc9c6a7e53a1719e8a901f0d1150c1729ab43d5819f33bef6a5666ec489fa0f8 SHA512 58ded48c131da0464f520b1a9e61ce9477f04f36be6ec19d68ec6b5b382518de081f84b255e17b1121574f7ff2be324930399812cfc98bdaa8f455dd6f79f81b WHIRLPOOL 06ba39bc63b5d458f0cf575dea1384b003759ed7f540b9516acac0178066a48f38db9b33c9435ca8b4bf41eda453670681882fef1adb02951979415ab7f08acb
 AUX lftp-4.6.0-gnutls-2-compat.patch 710 SHA256 caa4a5dc58aeffc5779d081f33b8a5f1ae16a61aa0effbb16682218729de2e40 SHA512 56388470c2e678085ac136393ca0579e12dcd65291a0d0b4363e8aa0106c3f1d5ab3d9a6d724a4cf887ad7dc21b9127593c9198116b20858199a20f045d64d63 WHIRLPOOL 1a68ae5d6d334d70d1b2545f89c8c7f8966f82805fe2fa3cfe815e710980caad139e124a245850b6e366ac592691f46defbea7e0ab2575a297b941b0859d7e4b
 AUX lftp-4.6.0-no-ssl.patch 849 SHA256 d73daa09b372718669c7d3ce61df015f8a7be6a5f0ee6047709337bf0349bbe1 SHA512 0b1f99cab85da6012941edb25843f3e7709d88e95c770435327d4ba147d342bf9a76b6aec57a5958f6e70bc6ecc58c2ccedab233b21a4bf0f43cdc493ca36cde WHIRLPOOL 634f874ba5cb5e64914f9a353d9d6b901b1de361880d2ff938dfcf988cc99f1f206dc1e0c74a19e10e964617fae21b05df0e2171d152f09d0308e26f02c48345
-DIST lftp-4.5.5.tar.xz 1495660 SHA256 a25d768aa78e0a8d0a2e89eeeae9185793d94ccd9e998a50f79ee8f9d69411d3 SHA512 3f107809e6b0947b1c2545f3fad46aff9d62b8a4dc39a7ea01d9af02b38472d967ba1952a00dbe1faf45649d11babcae2e395d35647bcd2a4b0eeb48d6b3deca WHIRLPOOL c8a48bbefd77e57127814bf2664894b667e36796d1d75ff17290d31ff9afaa65c93f7c0ab86f63c0ad6ac1103d98cc41bc9f8cd0ac1f44bf2eaa903273e5de5f
 DIST lftp-4.6.0.tar.xz 1499160 SHA256 3ad874cea247380d3037931fe60876a7d5e2c5be05e2faca9f22af7dfeca5b93 SHA512 5e92158334cd91b39f677467791ba7bfbe72aff7443a6ca2255c9e1daa85d8a284090d2286ad179fe2d54475dcf7cc35afce1cd8fab36db42f3c0a64efccf5a7 WHIRLPOOL 858e9ea99c53de17b52fac6aa7b02c148d02cd201fd76dce15648c018c47d9b600f16e9f575edaf5c1fa1e15d8a02eb8b53494b7a48b41cc6ef616101e885af9
-EBUILD lftp-4.5.5.ebuild 2282 SHA256 49e70c17a4faefa613f12873cc634541fecd2fd21fa48e0d89ef403a90a570bc SHA512 8762a88f7016c59136c4bbf09a5286ada00a20bdc0eccb541c091e41f13638acb5fb746c57f25d0e4b53ab4dc498f1923201650860bc3f280b6984fd9a67f0a5 WHIRLPOOL c73d14777895fb1dc4b38d0dd40aef4599c78dda208a72a6239de49c70273c27a1faf7b4c7d28a54f2ef1c9940f2c7484309a49f6b9685d43875630a249b7bf1
 EBUILD lftp-4.6.0.ebuild 2306 SHA256 b3b2b5f744a8a283f58b8960d3a659f582ff2c0565f446cda36cbad406fcc6a6 SHA512 673fc31696a830db7af628266ff715b01e0d39abf68ccfc06da2ccf87845804458fc52f0aefabe9bf1715afab2a18f4ed04514152c82ae209b0bb26d18bb0fb5 WHIRLPOOL 1b51ea3e12ea63a4cdcaf4498ccc4908b3bf36d418d34d00c2e4c11f0d487feea94c79b2978d36d52ea301e3e9f251fc1bf1b0e1b0cd57e5264d10ec65f75ae8
 EBUILD lftp-9999.ebuild 2021 SHA256 6cfc050800945aaf4d225427378922679f7b9cb7e87bad9cfde41cbe3457fd0a SHA512 7aab3d43c2af2d341fcdcdce7626fe1492010c14668cdfd9fa415b454184e65327a294832f0add04bddd05c4d3aa9be2991483887c499647b6a6833ed099d1dd WHIRLPOOL 8f31af012acac62c2444e362204b7bf7d097a82a2242cfcc1f718d391bd068c6fbe780732a173a02fc306639a51466a45c48233c0dbde147dfa20409784e1541
-MISC ChangeLog 63384 SHA256 17793cfb403aa97aa6848a3f3996b9e1ebdc44f6d9b39298f3f2bfedbf842177 SHA512 f654180577d0e067f55fbe24b8add462f831eed7226ab66d045a80af2befb09acdda9ec94c30c2139904e1f04b89d85781c6661597791952b5a292764cedb9e3 WHIRLPOOL 8e8c46a1000d6d7946fbd87cf0ea3f38279d02fc0e679133aa0312543e8718a5144766693e9f314bc0fcc25c522c82d2d26b7d3b2de77040c109ba355fb801f6
+MISC ChangeLog 63493 SHA256 e90c91d65eb368b3ebd8cb22933ab8774de31a590a83fc29504fd207bfe7d84c SHA512 193dcf237f23eb2db2c6c6b1dfb42f4407deff1e2a18e977d6598aa3108b1cee394b96e52230676f48fc7df537b20d11cc267ce1e38c9d02bf9bea1c581c2a6d WHIRLPOOL 306b7706fbdcd83c76e9001dcb398072d7d9fe7a58402f8ee4245cc361f5d248eede79e9f96bbbad77ff78e8c987cde116ce343192b43ddc44628e8952155f09
 MISC metadata.xml 531 SHA256 ce1a5e5ed227a35582fbc8cae768a0f6b7769ac49194197926882f47600b519f SHA512 6058e3d0fbf8032fc97c48d9742afea487ac89bbe88281e4a4fd392018a42c7ff5bab39b7f01b16c70bd24735cf3b6b9ea613f957f71075f095cf3b109516cd5 WHIRLPOOL cc07076f948d4cbd81a4bd799c8e5f4a06f5665a732034456778d51c7bdd8486c04cd55bfdbdf85f013379f231b535508e46572b191a7bd30d04f6692b0647c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUhYRzAAoJELp701BxlEWfNOkP+wdl2cl6htbLyCYjJ+HZQiO8
-lIlfZeiT7Wjfgn5Y5CJZF0bDnhJGrCuDmBpwQYK7WAFil/aSoOh9KyRV8yQqz6Aq
-Ts77h0917v1cSdfZ7O4kVoNdHijobul+DVkEpwsAPexLzwtqgvscMwawrQa/JlKH
-djxZxknDCsbgi9pKqG0ZB7s9Q92OXQDhWzlPsEYuprNH4gnOdBkXrcPKH2OSyQIf
-GaJSjWa62xWZrIzLNM8+JiBO2heNmRxS1q9HMPPUk9IrwLgyjBcdqIMzO4CZ0Ixp
-dVYZrvtXNvTs5jdqoGL4lVSLe1aiBUc33Lu+/zQkOwmbXptY8KG1NLN3fHqSFn2v
-yCykhjyIdBrpRDWbn7Whel/ho+NiQ7ZueGTQLIjvUZcKvj5+EMz8fw6RL5I8M3Cx
-gUXYhRjNMXgrN3bn5XAm5sI64FjCxURDIqmY00LJzre8eUEi0dnbmIhUujGhi7Sl
-sMWhRHPxnqrM5Xztn9wDHUlSBvDQG08cuXEQnj//+k3g9NB0eDmPU9ciKwjD0dAC
-gYWcLnwZUdS1cWx1dNdINkoRvz+LArsi6Cyhz4i7P1LOMraWGWwdxS7RDoLR88T4
-CIrb7E5fFX4+2GliCq0/7yrZGnKcjiZdhSb+EPNMBvu9eUjkKE5vobpOUNdJpjaS
-1QeOMRK14wIXoYHR1cbt
-=Z4R0
+iEYEAREIAAYFAlSFuJIACgkQVWmRsqeSphO0vQCdHW17r2YOtaAlBIrF10ifyDgr
+n9kAnRvHc74smBwGx0zTgn45CieIrUaw
+=E6A8
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/lftp-4.5.5-no_ssl.patch b/net-ftp/lftp/files/lftp-4.5.5-no_ssl.patch
deleted file mode 100644
index 8a96e1baab80..000000000000
--- a/net-ftp/lftp/files/lftp-4.5.5-no_ssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/ftpclass.cc
-+++ b/src/ftpclass.cc
-@@ -1071,7 +1071,9 @@
- 
-    control_send=0;
-    control_recv=0;
-+#if USE_SSL
-    control_ssl=0; // ssl should be freed after send/recv
-+#endif
- 
-    if(control_sock!=-1)
-    {
diff --git a/net-ftp/lftp/lftp-4.5.5.ebuild b/net-ftp/lftp/lftp-4.5.5.ebuild
deleted file mode 100644
index 30ad936ee819..000000000000
--- a/net-ftp/lftp/lftp-4.5.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.5.5.ebuild,v 1.12 2014/11/02 08:59:58 ago Exp $
-
-EAPI=5
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://${PN}.yar.ru/ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="convert-mozilla-cookies +gnutls idn nls openssl socks5 +ssl verify-file"
-LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
-IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	ssl? ( ^^ ( openssl gnutls ) )
-"
-
-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 )
-		openssl? ( >=dev-libs/openssl-0.9.6 )
-	)
-	verify-file? (
-		dev-perl/string-crc32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
-		"${FILESDIR}/${PN}-4.3.8-gets.patch" \
-		"${FILESDIR}/${PN}-4.5.3-autopoint.patch" \
-		"${FILESDIR}/${PN}-4.5.5-no_ssl.patch"
-
-	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-	elibtoolize # for Darwin bundles
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gnutls) \
-		$(use_with idn libidn) \
-		$(use_with openssl openssl "${EPREFIX}"/usr) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--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
-}