net-ftp/filezilla: version bump, tinyxml to pugixml switch

Package-Manager: portage-2.2.20.1

3 files changed, 112 insertions, 0 deletions

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index f98832f066b1..567df92d41e9 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,6 +2,7 @@ DIST FileZilla_3.10.1.1_src.tar.bz2 4572160 SHA256 67dbd801b15edd446f35b8df093a2
 DIST FileZilla_3.11.0.1_src.tar.bz2 4434678 SHA256 0309d5fbb12988a615b7e57eaf5a1b3ffad23ea4cc0e932d9ddea185fdd44c72 SHA512 b0ac96fe29e219a6fe0cab63616980de6b5e89cbc489ffffa4d4843c1f9790e52e6bfc75cec55653ca77ba0474a1f7e5b20d79d6bfc2ea6ebc56232ed626ccea WHIRLPOOL d54e19da26d74e80bf5febcc9f1465f1ca79ad5e1990a7a97f9a4c4f1759eb49741ea4d43b9dbd59d146054496b80a8ac483c98d7db68cd50b546e7367041849
 DIST FileZilla_3.11.0.2_src.tar.bz2 4421399 SHA256 341ba02803c29bdd1f9c3ce524723fe9288433d22d286b5a4b7d7c2e0d6989d9 SHA512 7bc59b685a64c243e02db2078592044d94d38c61fc97b8167d2fa026f978a435177b0cc92b557d7804f4d0ff341a9cef426b390d69f078ee03b7a3350a91b19e WHIRLPOOL b0c968a7552d85b1b391d0486fc58e64a590f5bc8d7f9ca2aec4e1598a932c457177f958497432c4cc76dff5740c600d8ebd20d9eb18fd002fb660f4e412ed73
 DIST FileZilla_3.12.0.2_src.tar.bz2 4440836 SHA256 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d SHA512 163ab37d0b15ffd511c9237727b2a2879c2ff38f264853148633c87ec2d6e07cca1847104eb8c7190a0d27a6978ddb10b10dd8e1ef6e157051567b04d1ec5930 WHIRLPOOL 1b3c859f77ab1c10adcbbbdf6201adfd388d25af4ff91c4a96cba7ff57eadf66a181ddd421b01dc124b2a58ca96599d5cfd11e321dac76afc18a69698dd8d8e1
+DIST FileZilla_3.13.0_src.tar.bz2 4542742 SHA256 e6c21b41b1318d0d75273aca94cfda3039c9847bdb5adc4b9d480ecdcdfa4fc7 SHA512 f78b8387552fd829a3851bd358c1fbf78dfab3cea642734803220f4264029a898e7c65b0b82102373b27b981921d92143f2aaaf1163c20eed60a5727aca2ed12 WHIRLPOOL 21a8ba37b2fc96c8b047550c2c2634a81ec64c094d20c975a3ffdfafe0338c42f9e3f15e758f37bfb19bfa9f757ab877e52eb34d7b1e43901bd99d700bda26de
 DIST FileZilla_3.7.3_src.tar.bz2 3682494 SHA256 2b012970a6033d8ffd4629b1d57b50ace62cd3750efad70001109f25e520c042 SHA512 b20ec013110e643dd0afca960b4577dd4f17ae744caf63be64e0c8435b8812064aebb4167d0efb186ba171b26967bbc61b6b22a8866b2460530f5793d7d5ecfb WHIRLPOOL acfceb3976f53abcce8da25ea1358761ee6e1a5f556e335067ed665b710fb4a873cce4f62916a19ec784a542db367bed9380a17df37c6ae200fa52e5cd7cc910
 DIST FileZilla_3.8.1_src.tar.bz2 4089186 SHA256 66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f SHA512 abe4b653ac0627f1dda8ae7b6bb3d1a92454b98ce69f6eb6fcced2e63b5d35edba578ba24f06b16218fcfd23edff21cc7c76fe1c7056efb129b081fddbd83101 WHIRLPOOL 94db8545244d1cd4bf0c3f4ed1daaabf150df262334c2311196b916a1d84d06026aa34707ce7d4e74a575a7eda18cb2da4c5e326d591bdc4bf71b69a6935fff9
 DIST FileZilla_3.9.0.6_src.tar.bz2 4181121 SHA256 ce7f56b383fa59dc55b16d8695e9f03b6e86d59a04dce44a16b5d02b2391b0b7 SHA512 750bb9afc12d0015cab7f775878def5bbbc0d16eed7ab3d876888ebc1f72480e338acfd16cd2bbe9520c26d491a996c85f712f47d6cd7e05d083c189cd23899c WHIRLPOOL 4bdbbd570b2a0290e2c4dff1e02aec2484891f5100fc7829e75b3ccf4ff004a1cfacc328b85efbb60be9d058499d0b4b4e1e28927c345a9450e7204cd25746b2
diff --git a/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h b/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h
new file mode 100644
index 000000000000..b72d47005f01
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h
@@ -0,0 +1,40 @@
+#ifndef FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
+#define FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
+
+#include <wx/process.h>
+
+class CFZPuttyGenInterface
+{
+public:
+	CFZPuttyGenInterface(wxWindow* parent);
+	virtual ~CFZPuttyGenInterface();
+	bool LoadKeyFile(wxString& keyFile, bool silent, wxString& comment, wxString& data);
+
+	void EndProcess();
+	void DeleteProcess();
+	bool IsProcessCreated();
+	bool IsProcessStarted();
+
+protected:
+	// return -1 on error
+	int NeedsConversion(wxString keyFile, bool silent);
+
+	// return -1 on error
+	int IsKeyFileEncrypted(wxString keyFile, bool silent);
+
+	wxProcess* m_pProcess{};
+	bool m_initialized{};
+	wxWindow* m_parent;
+	
+	enum ReplyCode {
+		success,
+		error,
+		failure
+	};
+
+	bool LoadProcess(bool silent);
+	bool Send(const wxString& cmd);
+	ReplyCode GetReply(wxString& reply);
+};
+
+#endif /* FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER */
diff --git a/net-ftp/filezilla/filezilla-3.13.0.ebuild b/net-ftp/filezilla/filezilla-3.13.0.ebuild
new file mode 100644
index 000000000000..51f25926c61b
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.13.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit autotools eutils flag-o-matic 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 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="aqua dbus nls test"
+
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-db/sqlite-3.7
+	net-dns/libidn
+	>=net-libs/gnutls-3.1.12
+	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
+	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
+	dbus? ( sys-apps/dbus )"
+#	>=dev-libs/pugixml-1.5
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( dev-util/cppunit )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+src_prepare() {
+	# Missing in tarball
+	cp -a "${FILESDIR}"/${P}-fzputtygen_interface.h \
+		src/interface/fzputtygen_interface.h || die
+	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
+	eautoreconf
+}
+
+src_configure() {
+	# Does not build with system pugixml, use builtin for now
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=builtin \
+		--disable-autoupdatecheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doicon src/interface/resources/48x48/${PN}.png
+
+	dodoc AUTHORS ChangeLog NEWS
+
+	if use aqua ; then
+		cat > "${T}/${PN}" <<-EOF
+			#!${EPREFIX}/bin/bash
+			open "${EPREFIX}"/Applications/FileZilla.app
+		EOF
+		rm "${ED}/usr/bin/${PN}" || die
+		dobin "${T}/${PN}"
+		insinto /Applications
+		doins -r "${S}"/FileZilla.app
+	fi
+}