gentoo resync : 12.08.2018

8 files changed, 3 insertions, 236 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index bd50e0faf811..ef90d4140f7a 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index add3b0f86bda..c2e03bb9b50c 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,12 +1,8 @@
 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.34.0_src.tar.bz2 4869893 BLAKE2B 43f017a833191126526195636607b7ba4ebc73859f48745126ddd284940da90d692e0bf2373096f5262e6ebe2e6655d9cf2dbbf4b0aa6299730f47b1f04c63e8 SHA512 577118bd053c3aedbe77082b138c30abc6a759b20ea905abc4e9bef965cbca3cf73023186c389ded7d906b7cf76e4f3d4462c00fae62c7b1ae695ad171c88764
 DIST FileZilla_3.35.1_src.tar.bz2 4963273 BLAKE2B dd7a30bf6916d7b2a6db0733856c8241a5363f40e8d089975a06a683b13c32dbad6fd009a3ec526d9f0c7f4268e277576a5eac878b55f4f5ddd43ebb563d6632 SHA512 e039a00ac64b6d1b99f50a5f94268a7e11c839e75465f76ff865700071aa0ee7733c89a5f5b8e16ef5deb3cd1b30873b48c3c8a42a73ed9a6b6a05e3e35cf2a1
 DIST FileZilla_3.35.2_src.tar.bz2 4968449 BLAKE2B 1c06b0a67177fc2b91e037eef02c0835702f79d9a36f9af1eed27a4999986db2a351c073e866cb0359c6b415f737a07344619741018537c0e5a59c81c589c48c SHA512 dfd962cc1ed86b4198c339560482d722ca6fa81dfeaae47dbdb8867c7c4ce516cecff393e9bda7abf2148e32f6b423ed76296346e22570db1f292de06c5bc0b8
-EBUILD filezilla-3.25.2.ebuild 1766 BLAKE2B 7690f5ea4596731e6a5f308650049d8011cda2eb3d4e22319615719a984e7b8ac5e322990dce9faeb1b9dba3fe0c2563aa90cb4e4e12ce5e2d5f597ba848fe92 SHA512 9cdfbf62ff8e0356b91158e0b941fc8f2f72e4eb3c8a519cd3180186b6dce5c08c4204d42d6462d348de6b933161cce921a8920e3dec0b7f4e41f8036ca4f2dc
-EBUILD filezilla-3.34.0-r300.ebuild 1809 BLAKE2B bb41046d31abbaac3a395fc7724c007be8fb0c2b5e28983c54683cd55f4a83e0eae5e5bf275f371ec3bcfa4207b162c452282e73737c3da4feb9292015f10fdb SHA512 8806505fc306bf2b60bd9b48696d5848b7a6a77372a47e609a8ecaacb13b10f4287c8705b5eb7c2316c73fb7e524d42fba158aabb8aa8548bf70e6d43dc30621
 EBUILD filezilla-3.34.0.ebuild 1802 BLAKE2B 39823cc23b1c5f87eb471a840f5b2c8aeb852df31a09a8d235289f7d09e17ed5b4d498becdb1e0a976d79bc1d3137363df9f2310b0b9bc35eb97946d62c9b74a SHA512 2d0aa62a90acc2a38372745cf37248fb35dc43417476a357a2385799afea9e5e195c24533d631fa00a6324a245b0a234343ace012607e0496353a06052d3df7a
-EBUILD filezilla-3.35.1-r300.ebuild 1809 BLAKE2B 62a9792d3b3cd66c8a923d3d7b44f4b8c99f7228cb020a1dfe3fe0eedc1428b6ae68f12eca3447451e5a2b3705070dd4f2fe3c263f4ac38256a774cecfcc10b2 SHA512 665f1417d102418e22ec46d5514bb13d1fbb75748bd04417325167618d2d9e8f99f1da848b0502d19e6a42c562aa9c44cf855658b5317b658e44a30c94cb2983
 EBUILD filezilla-3.35.1.ebuild 1804 BLAKE2B 34c7834264555386a377d4a3443ab958425bed5c2619948f74480e3cddf8d69ae1a3a0c29682bbfc2765f37dbfc971aa266b0f9bd8986ed2e2d9493a7a4cdab0 SHA512 b80c6d4cd77c7a9ac67da322f78baba6ead2cc72217b1f368d431359c5dbc48db0388cae19f09e8f5ec268861275b4d5c99d4b2b14ad964505edbc7913766adb
-EBUILD filezilla-3.35.2.ebuild 1809 BLAKE2B 62a9792d3b3cd66c8a923d3d7b44f4b8c99f7228cb020a1dfe3fe0eedc1428b6ae68f12eca3447451e5a2b3705070dd4f2fe3c263f4ac38256a774cecfcc10b2 SHA512 665f1417d102418e22ec46d5514bb13d1fbb75748bd04417325167618d2d9e8f99f1da848b0502d19e6a42c562aa9c44cf855658b5317b658e44a30c94cb2983
+EBUILD filezilla-3.35.2-r1.ebuild 1791 BLAKE2B 7dd6ef129042ee75712576d6aafa8b3f0db6e07825446ccff9d9f5c9a75553455192f70bf5748c69f54682364ff9b465d23741f1a02a58eb3edcaf061ebac545 SHA512 5f9e63b9b1fb3ff85061cf624fb32b4c34ea05e4af45fa599ddd2cf999e31b79f7a5e9384a008bd7f6d0e3aa2af08b2a39db4c85529e73eae7b557fcf821680a
 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
deleted file mode 100644
index 072bfdc70053..000000000000
--- a/net-ftp/filezilla/filezilla-3.25.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	=dev-libs/libfilezilla-0.9*
-	>=dev-libs/pugixml-1.7
-	net-dns/libidn:=
-	>=net-libs/gnutls-3.4.0
-	>=x11-libs/wxGTK-3.0.2.0-r1:3.0[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
-		--disable-autoupdatecheck
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-ftp/filezilla/filezilla-3.34.0-r300.ebuild b/net-ftp/filezilla/filezilla-3.34.0-r300.ebuild
deleted file mode 100644
index 405a09b2ab67..000000000000
--- a/net-ftp/filezilla/filezilla-3.34.0-r300.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://dl2.cdn.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.12.3
-	>=dev-libs/pugixml-1.7
-	net-dns/libidn:=
-	>=net-libs/gnutls-3.4.15
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
-		--disable-autoupdatecheck
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-ftp/filezilla/filezilla-3.35.1-r300.ebuild b/net-ftp/filezilla/filezilla-3.35.2-r1.ebuild
index 46fa5c033976..83462d1db4c0 100644
--- a/net-ftp/filezilla/filezilla-3.35.1-r300.ebuild
+++ b/net-ftp/filezilla/filezilla-3.35.2-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.13.0
 	>=dev-libs/pugixml-1.7
-	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.35.2.ebuild b/net-ftp/filezilla/filezilla-3.35.2.ebuild
deleted file mode 100644
index 46fa5c033976..000000000000
--- a/net-ftp/filezilla/filezilla-3.35.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://dl2.cdn.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.13.0
-	>=dev-libs/pugixml-1.7
-	net-dns/libidn:=
-	>=net-libs/gnutls-3.4.15
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
-		--disable-autoupdatecheck
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index d21a64921b25..64cc7a5ef32d 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -15,6 +15,6 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8
 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
 EBUILD lftp-4.7.5.ebuild 2552 BLAKE2B 3d99cfd051ade3491264a80c2640685720425faa4d783293b23ed6baa8699e82cc12e6a8259ddcacde5d8308efecfe1bc37f267b42735589b04f8b6614fcf98d SHA512 cfcb38856ceb7c195c64467fba134b8b744c3b35a4f411e3928e99df72bec286e70e0f877948bd10075e379b9efd3dce93cd3a3f21d8e6e316d7ef75b49a11c7
-EBUILD lftp-4.8.4.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
+EBUILD lftp-4.8.4.ebuild 2566 BLAKE2B 8679fb70953dd288a4d4cf077f070edcf6b35e937a9251f88ca8ffe8532981725b3f8ae789c5231f55e49b3ecbd7cedf0438dcd62b260ba3370d5f2f5c37b066 SHA512 2375f4ad354e43d4606b31213864be9e018d08301ec2d889f653f7a9c7303e69026d86c598995d7572eebf35bbfd111c02afc22c66ff6dd020c74e5ee07ff624
 EBUILD lftp-9999.ebuild 2351 BLAKE2B 252c1c026a5bad4adc8b37fb16819c53090be97e18a8df4befcde504ddfc56bf7f62ca32800250729499248319799c43dc4616aa93ca7c48137a670fae9bb0b2 SHA512 714b570e69f9978fce0fb3726187110e4c1f9733a3cf6b4ed7a06d1b536a248c5c7300ad43c45558a458350bff1695ba365c6e7d7c31d6accdc7796c40a47030
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
diff --git a/net-ftp/lftp/lftp-4.8.4.ebuild b/net-ftp/lftp/lftp-4.8.4.ebuild
index 3ea35f33f1da..6f3e633cdb12 100644
--- a/net-ftp/lftp/lftp-4.8.4.ebuild
+++ b/net-ftp/lftp/lftp-4.8.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
 RESTRICT="test"