gentoo resync : 05.01.2018

4 files changed, 83 insertions, 5 deletions

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index a1873f27ec2d..01c2c4f620c8 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,5 +1,7 @@
 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
-EBUILD filezilla-3.25.2-r1.ebuild 1782 BLAKE2B 7bc563a728e775851208f1b35af2adda3c7e73373d60826affb756d9b45d656f70306a594a2d4c7c8286d21996ceb677b0fbd2d52ab0dcc8b74a7e58cac99773 SHA512 ca7850798b85a029c09feee2b528d3fe6bf470775eaf2335e21db62a593b95eecccb214f25edfb998ba010c859b9cd7eb7997d8de0df69df4065fc20b2e84d5f
-EBUILD filezilla-3.25.2.ebuild 1765 BLAKE2B 9dabcdb6b12a290533c45c802100034c84b2ce93bc9456256e976b71ea24c103fce931d0b5a0ff78e808de48fd9c5796363d768d60a72166e56917d747949612 SHA512 f285161a89138b5f5be8f138612408b133a87bc9b86afdf887282b6a5f285ac65253b7e52f3de87495df0a5a7e452462feb871062bf926446693cee84a4f5d7b
+DIST FileZilla_3.29.0_src.tar.bz2 4832040 BLAKE2B b956ac69d22c3ec5ef32827594ad70aaeeef8c9359f557162a95aba053fafbf13621ba34fd73201b0b15529e7379b77c18d808c304a6c398f8927f8f903e2e53 SHA512 d1906cb18cfebb0ac9f92b1b97e11ffe2f5bf1b70d9cf1454e627f141a0fe9b3d1ba473a0464d5727e8fccf992643a64cfb729d93187a010fcb4f59603589349
+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
 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 61eb63e204bc..a135befc759f 100644
--- a/net-ftp/filezilla/filezilla-3.25.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.25.2.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.9.1
+	=dev-libs/libfilezilla-0.9*
 	>=dev-libs/pugixml-1.7
 	net-dns/libidn
 	>=net-libs/gnutls-3.4.0
diff --git a/net-ftp/filezilla/filezilla-3.25.2-r1.ebuild b/net-ftp/filezilla/filezilla-3.29.0-r300.ebuild
index a39e198691d0..e8d4a166ca00 100644
--- a/net-ftp/filezilla/filezilla-3.25.2-r1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.29.0-r300.ebuild
@@ -23,11 +23,11 @@ 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.9.1
+	>=dev-libs/libfilezilla-0.10.0
 	>=dev-libs/pugixml-1.7
 	net-dns/libidn
 	>=net-libs/gnutls-3.4.0
-	>=x11-libs/wxGTK-3.0.2.0-r1:${WX_GTK_VER}[X]
+	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
diff --git a/net-ftp/filezilla/filezilla-3.29.0.ebuild b/net-ftp/filezilla/filezilla-3.29.0.ebuild
new file mode 100644
index 000000000000..85207f6b65be
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.29.0.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"
+
+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="http://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.10.0
+	>=dev-libs/pugixml-1.7
+	net-dns/libidn
+	>=net-libs/gnutls-3.4.0
+	>=x11-libs/wxGTK-3.0.3:${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 )"
+
+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
+}