Fix building with USE=-ssl. Replace net-libs/gnutls-2 compatibility patch with upstream patch. Remove patch that no longer applies -9999.

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

6 files changed, 71 insertions, 25 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index a10c3e62e724..11d59f12f4d7 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -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 <jer@gentoo.org> 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 <jer@gentoo.org> lftp-4.6.0.ebuild,
   +files/lftp-4.6.0-gnutls-2-compat.patch:
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 5c10664a13a2..c225f2713ce9 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -7,7 +7,8 @@ AUX lftp-4.3.8-gets.patch 430 SHA256 20f3f931132aae70c6dc8b03368419951bb4ec9f0d4
 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 567 SHA256 7529b67b2f59256aefc5a6e2e5e13a923904b4e240c3b22fcc290c8b8e0bd117 SHA512 688aac23b11d19b2ea4f9d682185339d7874594915d7f875e7cc2e058a9b5c6d8397b35f1b90a5b2c4e0b398bfbf4abdc61890170417f5fe4b426288e9dfce59 WHIRLPOOL 1eb6808f5ef5df1cb57821f4570ff491ee36b393f356ba712a88ecff6eaf52f2f0fd58cd51dedde1df4bac61780a4d2011bf581918c13b42233f70dcd2f5e040
+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.4.15.tar.xz 1460568 SHA256 75f40b7ab438a7b295410eb3e1ec8460e36ad2d48785383a6fc9201905db6868 SHA512 1d828a7b2ff808a0ee78f51c265d58df677e67cec9b4744cbd3a34816aba324199202094fa4144665e8d64385df7e76a54c6dc415e9ff33e97adab2eb0edaf4e WHIRLPOOL 3bf4d220b5581d87fb34d72f6129c2d660f80e3142560543c238dfaafd8cde5834f57884247c75e583ab6a9d4c12766b28c90e2b49889e44759d663591bbc7e0
 DIST lftp-4.5.3.tar.xz 1493124 SHA256 62e87621d86b4feb810a1385769f1ae905da545c0939b0a4ba49a70962945d8c SHA512 cff9d5dae7317fa83fc72f7a547ca18c23413912c45d381577c2324a7431fad82f26fbb04f6663c55dd2005a5c9ec1a6abf7c933e3ff003bfa3e73259aaed8e7 WHIRLPOOL 88f5d98e3daebd0ae252b81d17eec4cf37ab4344afa7214ba68ce68b073077d8abee98d1b445473af417aad53ee1b8479b1bed8dc05a632f696f0ccb2450a40e
 DIST lftp-4.5.4.tar.xz 1494160 SHA256 3f60f5a97a3a12fce6c06afcb1a47e6c474a24b6d97d41c2f17c0e9a5c650c4f SHA512 3220ff29004c0d9869fe86fc9be24fa049f3aeab608b44663e516ce037977dc17954ec47f8d0b0f2f4bdfde1a3c9027344ff38a4be6703e3dea045781d0450a1 WHIRLPOOL 08dcd884395c723e165b6759e88661a8c4b010837a9f19c913dbde2278aa07be85dbd059208cef2d634ac49857077b896249d7039e995c41c56fd9a6896055db
@@ -17,14 +18,14 @@ EBUILD lftp-4.4.15.ebuild 2180 SHA256 86fd77a33d87445b33a18ffc617871080a4f40d6d3
 EBUILD lftp-4.5.3.ebuild 2195 SHA256 8d38ff227c74fa4904b4db91a5ca0ca114497bcca6934efb3dab8cbe3418f720 SHA512 5667a9fd746045c32e49a65058f5b7913afbcb9261b77e5d7f1d9002217f0685dc6a291ffe06ea033f5b6b5a18ae75dc34144f44a84b015960461ec3bab273e8 WHIRLPOOL 0911507170699fa2649a66dcf23a97b85afa7eb28f215ab082e661604e0eb77d4338e32bca7732ea9c9ef5a68857cdc89eb3888628e50a86d33bdb372d21e52f
 EBUILD lftp-4.5.4.ebuild 2191 SHA256 18582df426805c857399c1c78f9cf334370f8cd1f153279c2d74e003ad7b5d51 SHA512 718c6bfed90d7a3b376221f5ade17878d3141b5ff4e3e4ff24539245df5d45a2ebe7bbea6815a36e674943bf0cd3e6a93beffa3f8a2fc816497bd46ac2f57ece WHIRLPOOL df6f8e54f3efc76c065bc8dafefd086fecbcaae7f2fab39dfbcea892785994771eee77aa96661007858400a38e7771268ab2222fa1c2a33c2a3b044dddcdc616
 EBUILD lftp-4.5.5.ebuild 2286 SHA256 044203ffea7da53e0e54d7b5261b84cf0e12a1fd9fa72f32f94bbc60c69644dd SHA512 20d86944a1271cc163fed2a607ed4b1f1226d2637f782fbb78afd9552a068594c9d3121eb99e6550e022071e79f8a5e70ef57cdcc1fda080d1b9307391482088 WHIRLPOOL 2676d8d29e4476c1f88f60e8ec7b4658d5c65875758d3424ef555a71dc4787c8d74525b2c83b4987d0e4fc22443c5b79369de0a1272ee47b4f68876ca2189874
-EBUILD lftp-4.6.0.ebuild 2271 SHA256 801a821084a1137e24e24d06e6f26dce267370425c9570bead796d32b061f246 SHA512 764a3776f54577885a3fa27eef8431c2840b6f3e3b705c6e5add19cdb92d3864686273329e2d8e9cf3f352429a40c2f95172ab61af9b64d39278850a07af1e26 WHIRLPOOL 4d9714d366a40147fd6d34a4f063b0c7ab2430811b47ba2c88e21c61eb1dd9d7be4b2c7851d2902b76100f68a3f28c9e81cce96999664aaf87287a40906c7fa6
-EBUILD lftp-9999.ebuild 2067 SHA256 2a3fdc29a5c74aee3b0300c36b66f1c6c5f2b9e541860677089c16795b33e477 SHA512 af3a208755c3e91168e40b5b8bcfa57b68786914a2047e945dee7763bcfa6a912bb8c69e16143de6791bc129383c19f923f383051d59aec66bd388ab20e40f8a WHIRLPOOL 71bfe917ed36e23e657c4380698e05c93848d777e0c26f3108ce5e3dce2bea04d07bfe29f0dc816fd32153db2164178fbc10afc742f97167967f1a0f19cdb682
-MISC ChangeLog 61429 SHA256 5bcc79d69c578f63083c1ee29f5ed0acb1270d698e0c77cfd8262ac3b47a0f1e SHA512 c18eb46f4a5a5965a038f8f786556a791df9900ed67ccaaa9e744ede9e05eb0d58fe758786814ba03427872d37bd85ff3c51ddcebf639823150c248fac38fbe6 WHIRLPOOL a5e7ed8999a4728a292411279b5b17ebf7c3712fb47ec5397d980003e29de883a5a5b48c113011cd96acdd2a4452af2a2cdc5d7686ec27ee4dbdb87c9f1027d3
+EBUILD lftp-4.6.0.ebuild 2314 SHA256 cd8cdc5b07d7dec9431dfaf24c9fef5f04197826ed833f81d0195c60d7a75302 SHA512 75139475fc8cc1e69abef4db0517cf35a7a68ed160b5aa7f5e63fe63c166a09aca5f76e29deade42df86567f416a09de0b82c6b4d6514038809570838b9cceb9 WHIRLPOOL 894dbe41e553381108725a8a1c966313ccce63bd24dd839a1980cbf2dbf093ac5b7c234766aa00f074d07c04895cdf41597c894959c239c90fea988c465b21bd
+EBUILD lftp-9999.ebuild 2021 SHA256 6cfc050800945aaf4d225427378922679f7b9cb7e87bad9cfde41cbe3457fd0a SHA512 7aab3d43c2af2d341fcdcdce7626fe1492010c14668cdfd9fa415b454184e65327a294832f0add04bddd05c4d3aa9be2991483887c499647b6a6833ed099d1dd WHIRLPOOL 8f31af012acac62c2444e362204b7bf7d097a82a2242cfcc1f718d391bd068c6fbe780732a173a02fc306639a51466a45c48233c0dbde147dfa20409784e1541
+MISC ChangeLog 61732 SHA256 2bcc504064817e7257fbcc5d0bf6aa133576f7ee4dec701c5fe1e96d2ea96dfc SHA512 0995aa03aeda1a97cc0ab25ca356855d66d9ccb4ff49427580ff5021d9fcc6d9348b39a906badb6eab45287a26bc98ba70915ee7afcb6d29a9d1311df91b3d50 WHIRLPOOL 4024aa8027091fc1432dcc299240d1dfa3a32b7d3b175bf76bd6766869650ee7ff04e8511dfe091d19c1afd64e73cc613dee55cbe6f61416b64ddfa30c7f3423
 MISC metadata.xml 531 SHA256 ce1a5e5ed227a35582fbc8cae768a0f6b7769ac49194197926882f47600b519f SHA512 6058e3d0fbf8032fc97c48d9742afea487ac89bbe88281e4a4fd392018a42c7ff5bab39b7f01b16c70bd24735cf3b6b9ea613f957f71075f095cf3b109516cd5 WHIRLPOOL cc07076f948d4cbd81a4bd799c8e5f4a06f5665a732034456778d51c7bdd8486c04cd55bfdbdf85f013379f231b535508e46572b191a7bd30d04f6692b0647c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ85VsACgkQVWmRsqeSphPqiACdGY+yWgETtJqY4npUfaslsLjw
-XLAAn3u7QUCTYblsexDnwD+aRZTCS71b
-=ee7Z
+iEYEAREIAAYFAlQ+hJYACgkQVWmRsqeSphNYHgCfYjKfkEqYgVNiMQV3aqlvNYqs
+YtAAniiWkXlQrnzc6YxQEyLJSJkgQquM
+=wKYh
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch b/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch
index 3fe6a9db21d9..4382be08f711 100644
--- a/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch
+++ b/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch
@@ -1,15 +1,25 @@
+From 21823aa2b496509a7bc9bed2141d06df35d25b63 Mon Sep 17 00:00:00 2001
+From: "Alexander V. Lukyanov" <lavv17f@gmail.com>
+Date: Wed, 15 Oct 2014 08:50:19 +0400
+Subject: [PATCH] lftp_ssl.cc: fixed compilation with gnutls version < 3.0
+
+---
+ src/lftp_ssl.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
+index 100b90b..8ef8a8d 100644
 --- a/src/lftp_ssl.cc
 +++ b/src/lftp_ssl.cc
-@@ -560,7 +560,11 @@
-    {
-       if(res==GNUTLS_E_AGAIN || res==GNUTLS_E_INTERRUPTED)
- 	 return RETRY;
--      else if(res==GNUTLS_E_UNEXPECTED_PACKET_LENGTH || res==GNUTLS_E_PREMATURE_TERMINATION)
-+      else if(res==GNUTLS_E_UNEXPECTED_PACKET_LENGTH
-+#if LFTP_LIBGNUTLS_VERSION_CODE >= 0x030000
-+                 || res==GNUTLS_E_PREMATURE_TERMINATION
-+#endif /* LFTP_LIBGNUTLS_VERSION_CODE */
-+             )
-       {
- 	 Log::global->Format(7,"gnutls_record_recv: %s Assuming EOF.\n",gnutls_strerror(res));
- 	 return 0;
+@@ -547,6 +547,11 @@ int lftp_ssl_gnutls::do_handshake()
+ 
+    return DONE;
+ }
++
++#ifndef GNUTLS_E_PREMATURE_TERMINATION // for gnutls < 3.0
++# define GNUTLS_E_PREMATURE_TERMINATION GNUTLS_E_UNEXPECTED_PACKET_LENGTH
++#endif
++
+ int lftp_ssl_gnutls::read(char *buf,int size)
+ {
+    if(error)
diff --git a/net-ftp/lftp/files/lftp-4.6.0-no-ssl.patch b/net-ftp/lftp/files/lftp-4.6.0-no-ssl.patch
new file mode 100644
index 000000000000..885733315c15
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.6.0-no-ssl.patch
@@ -0,0 +1,29 @@
+From db25961b46c591aecaa18e824e57a2af3d379d08 Mon Sep 17 00:00:00 2001
+From: "Alexander V. Lukyanov" <lavv17f@gmail.com>
+Date: Wed, 15 Oct 2014 08:46:09 +0400
+Subject: [PATCH] ftpclass.cc: fixed compilation without SSL (again).
+
+---
+ src/ftpclass.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ftpclass.cc b/src/ftpclass.cc
+index 130704d..bc148bc 100644
+--- a/src/ftpclass.cc
++++ b/src/ftpclass.cc
+@@ -1610,12 +1610,12 @@ int   Ftp::Do()
+ 
+       if(expect->Has(Expect::FEAT)
+       || expect->Has(Expect::OPTS_UTF8)
+-      || expect->Has(Expect::LANG)
+-      || expect->Has(Expect::PROT))
++      || expect->Has(Expect::LANG))
+ 	 goto usual_return;
+ 
+ #if USE_SSL
+-      if(expect->Has(Expect::CCC))
++      if(expect->Has(Expect::CCC)
++      || expect->Has(Expect::PROT))
+ 	 goto usual_return;
+ #endif // USE_SSL
+ 
diff --git a/net-ftp/lftp/lftp-4.6.0.ebuild b/net-ftp/lftp/lftp-4.6.0.ebuild
index 0c2b74cf97f9..37ef6a387065 100644
--- a/net-ftp/lftp/lftp-4.6.0.ebuild
+++ b/net-ftp/lftp/lftp-4.6.0.ebuild
@@ -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 @@ src_prepare() {
 		"${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
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index f57824ed66b8..6eed6f3097a2 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -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 @@ DOCS=(
 
 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