gentoo resync : 24.02.2018

6 files changed, 16 insertions, 6 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 14e4a3f5da80..dfdf085e04a4 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 4816dcbb7e3a..cbc3fbd41950 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,10 +1,10 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 DIST FileZilla_3.25.2_src.tar.bz2 4712781 BLAKE2B c4e346442596eb2c1c7f5b541dc1386be5be13a3564187d5d7f275b5e1223cf1c95e11e27120c98276ea550d0b1c65122ffd62b5471a886faf1ebea0ab217522 SHA512 6c6feeec0b1bd15ff2c3fecbec22bca9c79f4263e0d1855c6d27a3df54128cfd837f0a546d1540b87b4645e620b57961b8ac0f01bd52748832f5625139c39764
-DIST FileZilla_3.29.0_src.tar.bz2 4832040 BLAKE2B b956ac69d22c3ec5ef32827594ad70aaeeef8c9359f557162a95aba053fafbf13621ba34fd73201b0b15529e7379b77c18d808c304a6c398f8927f8f903e2e53 SHA512 d1906cb18cfebb0ac9f92b1b97e11ffe2f5bf1b70d9cf1454e627f141a0fe9b3d1ba473a0464d5727e8fccf992643a64cfb729d93187a010fcb4f59603589349
 DIST FileZilla_3.30.0_src.tar.bz2 4855577 BLAKE2B fb146c05eccdb6bfee1fb8abebbe164440bf4bd2a2a54769218ec2b2d988dc8d32ebb711de878dfd5448befeec9858953157977aab10a6b936c5ec5d42cfae96 SHA512 e045ed07d3ca550881238935d80a9f6e972d67a40449a2bab72b29519240785e89c573af53fad702ab066cc26b7077452868bb50bfc76d371c29c86f908060fe
+DIST FileZilla_3.31.0_src.tar.bz2 4861886 BLAKE2B 675dc6263c68e00433ec81eb45ce13ae124ba020cbacd4d1ee06f703bf8579000f7d97506d24fc705cff45345a66f137bb5fadf2aef83b3c1c95f5c3a8e0fae6 SHA512 fefb1217a39214dfd1441fa45b37a461b2dab3cc80eeb82b8c1eb88b74e8be3ef6c436cbe5dba705feeb938bb2fc970863f28502d16097d01fdbf8c400b5e901
 EBUILD filezilla-3.25.2.ebuild 1763 BLAKE2B 10561c18f24e8e61b578958230e3e3c0abd9e20bdcf2613c27b15fd39510bab96eabe89b55f7458e1dbd546f57f0652961da0a6f1290cda6eb114221094206dc SHA512 2887aff49281fb97ca2d3c203b2b963469427b39bc3368c6b577f4d5ad72ec8dc18cde3e3ff38c119a88d587e35f3f139e3865cc39811d8967eb9f87b388a02c
-EBUILD filezilla-3.29.0-r300.ebuild 1778 BLAKE2B 8b58db3424613e944c18a268f572385c0efb24682648a40a5a55de4b7044f3d65ea0e01a7b7ad2d48f03624100dfc5f5c751b9adff70aa867f16e98b8f31548d SHA512 66dc78b9e34125e9b813f9208c40011a6a2bea9d347cf073a607cc03aace48bccab2eb5a7966d919577e4d20b69911b67246fa4d3257772582f035bf0a2e825b
-EBUILD filezilla-3.29.0.ebuild 1773 BLAKE2B 17e13fcd425bf647c26a708e404a70788cf3b1588748dc8c6c0ae01796a0cbebbd8153b0273e3ed472df7fd0d70d8c6169269e9ecc568137d38fa9c531189722 SHA512 3fb00ada211c68961ed5ce1acefe52736ac0ba6f445fd70e2fab06e3f44a12c65052f890ee850955c029c3b3cfe455aa9cad778828c08ce6ab3b030092829699
 EBUILD filezilla-3.30.0-r300.ebuild 1778 BLAKE2B 8b58db3424613e944c18a268f572385c0efb24682648a40a5a55de4b7044f3d65ea0e01a7b7ad2d48f03624100dfc5f5c751b9adff70aa867f16e98b8f31548d SHA512 66dc78b9e34125e9b813f9208c40011a6a2bea9d347cf073a607cc03aace48bccab2eb5a7966d919577e4d20b69911b67246fa4d3257772582f035bf0a2e825b
 EBUILD filezilla-3.30.0.ebuild 1773 BLAKE2B 17e13fcd425bf647c26a708e404a70788cf3b1588748dc8c6c0ae01796a0cbebbd8153b0273e3ed472df7fd0d70d8c6169269e9ecc568137d38fa9c531189722 SHA512 3fb00ada211c68961ed5ce1acefe52736ac0ba6f445fd70e2fab06e3f44a12c65052f890ee850955c029c3b3cfe455aa9cad778828c08ce6ab3b030092829699
+EBUILD filezilla-3.31.0-r300.ebuild 1778 BLAKE2B 8a24155569f5e3f33dc4d64665a9a8de15c3be9df921deb343bcedd33a26b8c028eb44ca940b83a01c9c5c82699c3594488c9e02cf3ccdaa27c1fc052b2e8d4e SHA512 b6519e15f9ea4ac1195fa31069374c051628d654242b2228456d24a8e361d93f245e7584a06fefbde8227ecd65973b7e8eefc9d02b00d8cb94e2a0315bcbae9d
+EBUILD filezilla-3.31.0.ebuild 1773 BLAKE2B 598e90f4618349f75a20569a9e79c5bf0173ec67417904e2d5d8597b4a502a7bac361d02e8042abe9cec5c781d615ff94f50dd2c5b08c4a217934ce3029fca06 SHA512 f7a8a6c1a23fd594405902d00ae072629c10905ab44775066d34c88a304d34efc33e7e38e43a186852788e3e429edc9341a613c236ebea265eb035c30013d2df
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.29.0-r300.ebuild b/net-ftp/filezilla/filezilla-3.31.0-r300.ebuild
index e8d4a166ca00..8e99d0bb5ade 100644
--- a/net-ftp/filezilla/filezilla-3.29.0-r300.ebuild
+++ b/net-ftp/filezilla/filezilla-3.31.0-r300.ebuild
@@ -23,7 +23,7 @@ IUSE="dbus nls test"
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.10.0
+	>=dev-libs/libfilezilla-0.12.1
 	>=dev-libs/pugixml-1.7
 	net-dns/libidn
 	>=net-libs/gnutls-3.4.0
diff --git a/net-ftp/filezilla/filezilla-3.29.0.ebuild b/net-ftp/filezilla/filezilla-3.31.0.ebuild
index 85207f6b65be..81ededccddde 100644
--- a/net-ftp/filezilla/filezilla-3.29.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.31.0.ebuild
@@ -23,7 +23,7 @@ IUSE="dbus nls test"
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.10.0
+	>=dev-libs/libfilezilla-0.12.1
 	>=dev-libs/pugixml-1.7
 	net-dns/libidn
 	>=net-libs/gnutls-3.4.0
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 116669c55e63..3149943a2488 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -7,7 +7,7 @@ AUX lftp-4.7.5-libdir-expat.patch 356 BLAKE2B 62a89c02aa89ed746e28b13f08fb649804
 AUX lftp-4.7.5-libdir-libidn.patch 309 BLAKE2B 588964ff572985759925d2a3355dd3606e2a3cf36de5843f716438398833ddeb1dbc37c208d02d656705d0278d09506d58f148e8e1c633fbc32f3796d280f99b SHA512 282dfd90b6edbff1af1c74b4a8fdcd63c8082529583e942d677a20ee58e53b535012614820a12e3ae272b7a5dbdc193da4c1b1b1cbc8c72819505fb13621d337
 AUX lftp-4.7.5-libdir-openssl.patch 624 BLAKE2B 78f024327f635daf9f5f0cba3f4d88b42ee787470dc27acbd3a753b8dd2974e8c32862018a86983700f206f4d16b372d4f830d88b2bbc22f88804b4c0ef8d391 SHA512 fb1314e41800d53d637fc3431190608b9f5be140835c6828b2cce30575b16b49539dd8e732e67df72d634a2b9a5c07f734be0ec3ddbd82ffb51db3d746728654
 AUX lftp-4.7.5-libdir-readline.patch 424 BLAKE2B 323da25222e0dfc47ebcc123a243006927514ce77fbae1656e831d2c1e96c0d7bb1c55c92570d0d60f6bd004843b5ec89a6311b5c453f9d5e5f97da1c58cce8f SHA512 6b926598702d222dcb8cb0ed348f1c1f62ddbafd8b6b227dce8acca7ac5d6b1c1f5743d3c43e721a5ac36fe9bfd5725fdb7d0d2d16bde685e75ad9c9c760a86c
-AUX lftp-4.7.5-libdir-zlib.patch 606 BLAKE2B f3356f3abcc0cdda356dde48f17fb9d15f835eca87fd99e6aaece7c03f437c65def0268841695e11058de001bfc6b497b44090d4bc0a853338ea5e6daa65eb75 SHA512 efbfd9a8bdeb14be2a417c441a9bf7c2bdcb5c9bd704cf818bebddb0bb44d710eb492af15f98ad4eec4ed71a1feea8996a7d234b59f8a263356aaf26448ce3ed
+AUX lftp-4.7.5-libdir-zlib.patch 896 BLAKE2B 5015047f3a92098e320d4ca6942426f49a6d220b8e8eacffb54a69cd4df22b2cfc959964d88955e5c1e011c679c4d4213c2e038bb3a774245556c350fc80366d SHA512 ebeabeda18aab710b9988722988d39db5b1c6f01ceb4d1778000be6971420205b8065eefc4bc8a09a9c8e7a9536d58b4341dabe23fde3634d5301c5dfbd90281
 AUX lftp-4.8.2-libdir-configure.patch 530 BLAKE2B b376a53130563d37329e701d77b5a9c0a98d37deba6cae4d1446d8cc38deec45e80e49407507b7556aaf165c6d8c74f9f4fb31d1c1057f3156b261bb3292f37a SHA512 dc97d62360079b525b1735faf1c5238e5f03661fca81445a3e3ad21826d6559cefa3cefa987eeb01bc76df65ff92243b9cecbf4585820fd51fddc55fbc3b322d
 AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd08dd5acc3b36bb487433612bc391527091e10ef22f522980f7b5fdb8966918aee49713848eb2af7e349834a398854340 SHA512 5476169b31d9704db9ae00834a8e8cdcbbaea13a88b2288ed8ea69300d8734af1bf80d994e42a9a47bf179c14fe9471d931cd9ca231fff0974ee206163801cd2
 AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1fc12afedf9eae52e5aaa34aad518cbee5ab225fca3a524e21efc583ab9e103bb8dafa6c9154da18962d4b03400a939d0 SHA512 a48e46873d9134693452cc55c2562d1a7d7b6bb7124dba061db029e6e1c611ed9787518c86043213629683727cf0fff07afc8ce7298a30fd237941300a1aeae0
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
index 9ec7c1b0dd17..791bd2c5a3b9 100644
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
@@ -1,3 +1,13 @@
+--- 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 @@