gentoo resync : 17.05.2018

10 files changed, 14 insertions, 12 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index ff12c5d8fb19..6f7c913bf10a 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 0a51441fb0db..476afe9494ab 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -12,6 +12,6 @@ AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa09
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
 DIST atftp-0.7.tar.gz 202234 BLAKE2B 65ff486b6ef2b42b2a4737f121c2c36e8ff73838f3c10592c11020acdf2afdf0883fda8b39613e1cc35b47141fd29543a7ef2c3e2ead857033ad4f7181c91d04 SHA512 81c51b613a640f7db4d26da0fb891bda345d11d3f39e0af37f393d2abf619094c1de83f92f04ac75367f546cc70e37d7d47c1535c241c941036fd4df7863a440
 DIST atftp_0.7-11.diff.gz 26055 BLAKE2B c9be58836b5a7e3943dd28dd4661abab5e86b1941c9a2b58786eebe702ab515cf1bc08bf44c8ab4157584a437e861e24eb0c833c1fa1bc774f7f8a2134b6cd27 SHA512 28747f8f3ef2fc3b122361f682fe26ba93acf09b190f61efb3cfcbb6bdeef78cfe1348aeaf1699003a7e02586579be670d85b65baad1b1165a4bec9a9279adb5
-EBUILD atftp-0.7-r3.ebuild 1834 BLAKE2B f590f3ac300dc6852b8476c3db6bc545c429edf1e6ce61ba9b2a09816c3b699f609dae3f0327f0799724c9ba00816d129c8f1b18807e04c0315541e782a9d372 SHA512 a2cd6c88e1cabfbdfcc0829e8152132002a8f1695f11fbc80f576022470455a9f847316c79379e6e571fcec048c9f38e896f340a1945b0e45a0794c7968a51a2
-EBUILD atftp-0.7-r5.ebuild 1752 BLAKE2B 2d559d0c2aa1422fd6d05875f6f85611a30119693ce99f10e118db23e8e6baecbd9cfb105b070a1f7a18c160daae3ce3b7cddf845b7b63886506e1f0e66b2365 SHA512 02813b38b258795a361c3cc69e57637c67e35867117fcdd1cf0442de13c240de7bcb1bb34e810dcff46ea796cb2ea53e8a6002d945f5c8849bd811d4d4e905a2
+EBUILD atftp-0.7-r3.ebuild 1850 BLAKE2B 532cf664672143ffb7ba4a6ead87201ee4d3061afb5a4fc9a15eb1763cf8988a38f5bb7df18a626a1f1418187a6494181c3925684c6c2927179ee33e7ea51065 SHA512 794f4787698f65a5801cff0fd7f18504376064d0c8397f855f837c5eefe9e8f24b14fe42a8afd06802cdddd989f5d5f313ec2724c069566a3bd63b937bb94464
+EBUILD atftp-0.7-r5.ebuild 1768 BLAKE2B 052c826507b9b79edea36b2817e2e6e066e1cc8c2d196f232855fdaac1b05e5628b77cd70c33aa06a290a7d84a8e4b202967cb920fa1be14d29b468f53d49de2 SHA512 7c82f1c78379147739054075ea0402b702a2f8b5574131e52cbbba1243feba8646aa70d41667b1be369d759c343c6d364142ca7f0f7507abfc70faf3b34db466
 MISC metadata.xml 215 BLAKE2B 8f7aa1a33da6c92db40f6122e500209464b76f7520190c109e697a9aa6f9a4447581098bd3eeb775c306855401f6b419b501c69dd0b37c9d55d083d3df316487 SHA512 dfbc3b8198f877d6f858c9228f92e82926664db8f0f19cd6ba97ce06b52d93a998e78c44fd502f20bf249cd70d612f1c0bdc01c9d66ea8495c54dab399b62116
diff --git a/net-ftp/atftp/atftp-0.7-r3.ebuild b/net-ftp/atftp/atftp-0.7-r3.ebuild
index 839def958f8e..785ff81f7e82 100644
--- a/net-ftp/atftp/atftp-0.7-r3.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r3.ebuild
@@ -23,6 +23,7 @@ DEPEND="tcpd? ( sys-apps/tcp-wrappers )
 RDEPEND="${DEPEND}
 	!net-ftp/netkit-tftp
 	!net-ftp/tftp-hpa
+	!net-ftp/uftpd
 	selinux? ( sec-policy/selinux-tftp )"
 
 src_prepare() {
diff --git a/net-ftp/atftp/atftp-0.7-r5.ebuild b/net-ftp/atftp/atftp-0.7-r5.ebuild
index dae8d5d1d6d0..98408a1a5019 100644
--- a/net-ftp/atftp/atftp-0.7-r5.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r5.ebuild
@@ -23,6 +23,7 @@ DEPEND="tcpd? ( sys-apps/tcp-wrappers )
 RDEPEND="${DEPEND}
 	!net-ftp/netkit-tftp
 	!net-ftp/tftp-hpa
+	!net-ftp/uftpd
 	selinux? ( sec-policy/selinux-tftp )"
 
 PATCHES=(
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 2d7c86736596..098f5aadcda0 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,9 +2,9 @@ AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a
 DIST FileZilla_3.25.2_src.tar.bz2 4712781 BLAKE2B c4e346442596eb2c1c7f5b541dc1386be5be13a3564187d5d7f275b5e1223cf1c95e11e27120c98276ea550d0b1c65122ffd62b5471a886faf1ebea0ab217522 SHA512 6c6feeec0b1bd15ff2c3fecbec22bca9c79f4263e0d1855c6d27a3df54128cfd837f0a546d1540b87b4645e620b57961b8ac0f01bd52748832f5625139c39764
 DIST FileZilla_3.31.0_src.tar.bz2 4861886 BLAKE2B 675dc6263c68e00433ec81eb45ce13ae124ba020cbacd4d1ee06f703bf8579000f7d97506d24fc705cff45345a66f137bb5fadf2aef83b3c1c95f5c3a8e0fae6 SHA512 fefb1217a39214dfd1441fa45b37a461b2dab3cc80eeb82b8c1eb88b74e8be3ef6c436cbe5dba705feeb938bb2fc970863f28502d16097d01fdbf8c400b5e901
 DIST FileZilla_3.33.0_src.tar.bz2 4862360 BLAKE2B c0a5b4c1f749eacd95fe3769daa222f60e916a41430260a8816aca60c7ffe07e46c0fb1594d7fe84406185260d937290a0f736b0f408e9132b1a525ed8e7c58e SHA512 9499ea28aa1cdc29d5dcb81fe328b288bed76c4f9fdd5e4bdb7824f6328b9d58ba9274401de7d8321abab4642839c70cdbb9995d86acaed0c4f6a6b582f99ff0
-EBUILD filezilla-3.25.2.ebuild 1764 BLAKE2B ef1a42063903ebe5c1022a183627a3377a41aed5c683c30b56d29611b6ddf0dc2a86aa03385697e8bd65b9b44b72deeafbb7bc085bf05618d56c7c58cd19a367 SHA512 b7aec2a4a8f455330dccb6a1b409c718194463e762e129358fa04febd68f5cca6cc990c96284c7fc61448d7f1509037d44f4325e77cb8a563b789ab2d5961403
-EBUILD filezilla-3.31.0-r300.ebuild 1779 BLAKE2B cd5bf9d1474d09809bd28e2c24fe085b0ebf1e32644abb9f7e92af10a0233e6d1ce0f081530db9fc80665c739dad5335c384e224fcae47610c45113b0649a6ae SHA512 99851297b2efb27a085e6aadf8eca2fcfad97e7a6891f1c008cdde8a6fa53d41a5acc325453854ee877200f020068e6a8092555a982985b61d58a654d2e7248f
-EBUILD filezilla-3.31.0.ebuild 1774 BLAKE2B a3361899775cc8f5ece3230ad9de70b34474fbc9209cbfa05db12f890df4d056c556ed29283e135a6d98a23d8e2651bee5cb02e2e3844c9622e3a9796bc40aec SHA512 b7ab34827077922e3dbaea323a4a78960468d7bd90fcce4c1e9d64e5d778271379a27e7cf9f9f39426a3786d65526c60950348706bf32c174b94a57eac1e487b
-EBUILD filezilla-3.33.0-r300.ebuild 1807 BLAKE2B 9ff4a90b5d0c673f2f93bb51cf35fbc26eb8ee82637403b9e5b237a7a7bfdd23587fce50ce7a00aa0c28e2d86ea1e7a62b2a268623fb020204ae59caf87eac1e SHA512 e12932431d79358175c58e2d58f1f0b283126dd2a213a5a45754e2d8c2e9587ffd4d1d2cd55d3f240ab1824c1fee49623337e5605867ceaf0f2d40dbdeabca10
-EBUILD filezilla-3.33.0.ebuild 1802 BLAKE2B 70910aa8282d8f1a625f27ae330793f90c891a61aadec98e76a192994af131df372310c15282d85b09cecb2b4d7a4ee62cf50e33a0ab9d168e75257ce72c81dd SHA512 a80cedd12782d54d96eaf7692f79d5a5680658ae588394cfa53830a39a7b139e41b0f081180a6482557b84ac166a31b5d572262d49dda6065d1286c766627af7
+EBUILD filezilla-3.25.2.ebuild 1766 BLAKE2B 7690f5ea4596731e6a5f308650049d8011cda2eb3d4e22319615719a984e7b8ac5e322990dce9faeb1b9dba3fe0c2563aa90cb4e4e12ce5e2d5f597ba848fe92 SHA512 9cdfbf62ff8e0356b91158e0b941fc8f2f72e4eb3c8a519cd3180186b6dce5c08c4204d42d6462d348de6b933161cce921a8920e3dec0b7f4e41f8036ca4f2dc
+EBUILD filezilla-3.31.0-r300.ebuild 1781 BLAKE2B 4d8310ec7bcb8848b5acfb219fed926525c558edf03967da42eadcbc2c61c99f6944894aec4be81a1bcae3df3ae853885f700262107d6051dfefe476318552bf SHA512 c971078a270d0a425baaeef5c046e0bbe4a7bf7299c8d5146aa391f73fd35e1fb0bd5129a5c65284dce590cb19861a112c7379adc1496b4fbd82f6c5db09aafd
+EBUILD filezilla-3.31.0.ebuild 1776 BLAKE2B 002c7b9adebdec20d2b64541c4995d8bd38698f598c5bec8e47e221d9ab678a8d43ce179b69e23760d9501e84dcd600b461c93b1005d5a6e13331c2629dc7675 SHA512 c34a66850fcee9f4cd78f750ab3b996dc1561fe72b444956418a026e9988acc672441975d31c420213477cc0d7ef765da6c98b92c06315d67ca6b41f19ba25d1
+EBUILD filezilla-3.33.0-r300.ebuild 1809 BLAKE2B b6dfb2f403b29a4ae8fc053719d2d5c3b3745dc8c690071d0cf25cd7f016b3c236d253be614956cb56dc06f6b1566da88bcd456243ec7396ace692a67eb31bfb SHA512 25082747776d447dd7bc020d27a40ca34e36522c9b462606ceb2f0b755e14878571d4f702ec835c4f5f5a1535a7487d0e02b87a4bece1cf68b87185c1bda73b3
+EBUILD filezilla-3.33.0.ebuild 1804 BLAKE2B bea760d313f8857ebc0df7e374ccaf13ced6a282750f0ada846e17a958b1d2d143e809451626059f8b20eb619b1554f0d6015a35fadc076ae445e04badfc3403 SHA512 d07cd3327d58ff51f639b60e57580f58b74cb1193dbd40e647822790e518c90f6c1ab42d4df48e04e9078984df3b18a01dcab417ad69cf887537c2e314dc7532
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.25.2.ebuild b/net-ftp/filezilla/filezilla-3.25.2.ebuild
index e16e202da40c..072bfdc70053 100644
--- a/net-ftp/filezilla/filezilla-3.25.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.25.2.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-db/sqlite-3.7
 	=dev-libs/libfilezilla-0.9*
 	>=dev-libs/pugixml-1.7
-	net-dns/libidn
+	net-dns/libidn:=
 	>=net-libs/gnutls-3.4.0
 	>=x11-libs/wxGTK-3.0.2.0-r1:3.0[X]
 	x11-misc/xdg-utils
diff --git a/net-ftp/filezilla/filezilla-3.31.0-r300.ebuild b/net-ftp/filezilla/filezilla-3.31.0-r300.ebuild
index a27b19798542..ea8be1a27f34 100644
--- a/net-ftp/filezilla/filezilla-3.31.0-r300.ebuild
+++ b/net-ftp/filezilla/filezilla-3.31.0-r300.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.12.1
 	>=dev-libs/pugixml-1.7
-	net-dns/libidn
+	net-dns/libidn:=
 	>=net-libs/gnutls-3.4.0
 	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils
diff --git a/net-ftp/filezilla/filezilla-3.31.0.ebuild b/net-ftp/filezilla/filezilla-3.31.0.ebuild
index e0d7eeec245a..73f5a7517ef1 100644
--- a/net-ftp/filezilla/filezilla-3.31.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.31.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.12.1
 	>=dev-libs/pugixml-1.7
-	net-dns/libidn
+	net-dns/libidn:=
 	>=net-libs/gnutls-3.4.0
 	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils
diff --git a/net-ftp/filezilla/filezilla-3.33.0-r300.ebuild b/net-ftp/filezilla/filezilla-3.33.0-r300.ebuild
index 7895c9ff9fcb..2d9c499662c5 100644
--- a/net-ftp/filezilla/filezilla-3.33.0-r300.ebuild
+++ b/net-ftp/filezilla/filezilla-3.33.0-r300.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.12.2
 	>=dev-libs/pugixml-1.7
-	net-dns/libidn
+	net-dns/libidn:=
 	>=net-libs/gnutls-3.4.15
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils
diff --git a/net-ftp/filezilla/filezilla-3.33.0.ebuild b/net-ftp/filezilla/filezilla-3.33.0.ebuild
index 506fc6d9f961..606eecdfcf81 100644
--- a/net-ftp/filezilla/filezilla-3.33.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.33.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.12.2
 	>=dev-libs/pugixml-1.7
-	net-dns/libidn
+	net-dns/libidn:=
 	>=net-libs/gnutls-3.4.15
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils