gentoo resync : 08.08.2018

3 files changed, 80 insertions, 2 deletions

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 145b3a39cfe5..add3b0f86bda 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,9 +2,11 @@ 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.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 1804 BLAKE2B 1e5b14cccc8fd2f2bd0cadad29a2c90c4513610426fdb54c2d71a2dae3d2a19d5ee69ee9aa5bd1c8edbeffd2efb202e94ed5c01683199720262cabfd09b83222 SHA512 3f65c0b456c3500aad80877d618039cc75f7e899325af4c83705e0250de0fb8e23ab593376cd8e230c416786bfa6b159bf699460ef897e2bd6c176848d83bddb
+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
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.34.0.ebuild b/net-ftp/filezilla/filezilla-3.34.0.ebuild
index 944fc1ab7a7c..4d53279d037c 100644
--- a/net-ftp/filezilla/filezilla-3.34.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.34.0.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="dbus nls test"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
diff --git a/net-ftp/filezilla/filezilla-3.35.2.ebuild b/net-ftp/filezilla/filezilla-3.35.2.ebuild
new file mode 100644
index 000000000000..46fa5c033976
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.35.2.ebuild
@@ -0,0 +1,76 @@
+# 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
+}