Version bump, adds SOCKS4 support

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 97 insertions, 7 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 5b74e05ea3e7..f63ee3eb5682 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/filezilla
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.112 2013/09/21 16:18:46 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.113 2014/02/10 00:06:52 voyageur Exp $
+
+*filezilla-3.7.4 (10 Feb 2014)
+
+  10 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> +filezilla-3.7.4.ebuild,
+  +files/filezilla-3.7.4-debug.patch:
+  Version bump, adds SOCKS4 support
 
   21 Sep 2013; Fabian Groffen <grobian@gentoo.org> filezilla-3.7.3.ebuild:
   Fix doins call, .app is bundle (directory)
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 319b66753179..d4a6d7d05b6c 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX filezilla-3.3.5.1-debug.patch 423 SHA256 6093c67c850f33d23ed278b601e269f08f38cba0b49090f4b0ad58ddbc961e2e SHA512 06ca4ba2c0fef72dc649324fd7045c7f353c17f4d8e87a885dfc70596fdbdb8b7dd56e4c87f0f4ed2b7a48f026bc710f8631e6dfa5d8325b6f0aabe8a8ba5745 WHIRLPOOL ce891e0c098e0a9b49167d8b135eee9c08c20b75c1f1af0bac20331a538166d7ef0fdec3d919fc3012fa5a95bb74422247bce6746e0ca6ecb56bbdbc2e5cdcaa
+AUX filezilla-3.7.4-debug.patch 404 SHA256 11ff65c718b4dce0b80a8263a7342d7ff2956150be20ba5947d9219738d7d01d SHA512 4f5ef17d9ead1066960e9b3f90e5395e5228b8672f759f87bbd8a5b4e40c0d874349380416b6fc0421f22fdcc259b980e0e3778ca35a5dcce692946b27bb3dcd WHIRLPOOL 402841fb82588662e8d999071e9bc47ad7c76feea80958fd1e2dee325bb51457851675963dd6909eac7c7d7cd449e015429ef49fd443d714bfd8592e2d6a5aea
 DIST FileZilla_3.7.3_src.tar.bz2 3682494 SHA256 2b012970a6033d8ffd4629b1d57b50ace62cd3750efad70001109f25e520c042 SHA512 b20ec013110e643dd0afca960b4577dd4f17ae744caf63be64e0c8435b8812064aebb4167d0efb186ba171b26967bbc61b6b22a8866b2460530f5793d7d5ecfb WHIRLPOOL acfceb3976f53abcce8da25ea1358761ee6e1a5f556e335067ed665b710fb4a873cce4f62916a19ec784a542db367bed9380a17df37c6ae200fa52e5cd7cc910
+DIST FileZilla_3.7.4_src.tar.bz2 3707985 SHA256 20a6d5ce737a8cbb38786b53365547e5e71dd9086259bf0b4eb264e8dbbc11ce SHA512 22c92d7b154f265d08c840d5107f596e8398a7ae91e99615bc278eeaf69e70b653906e80be6cddf3125946765c3934e1b86212f6ae76925c8967e7032508aa2f WHIRLPOOL 12db80b9d651e84426c1359f31e0ee53b37e545f393bfddc234863d762e5d48f2d5ac973b14c06f078947eb66e8ebda8462cecf760dbdc35370705580903d461
 EBUILD filezilla-3.7.3.ebuild 1717 SHA256 b025df49825eb732896b5523bbf80f84662cbdd6687c4a10e2e1a1107dfcf7b3 SHA512 3d631d88e81d2d4029238ec2ef41326df3d2db6143f177e839a02da5efab9ece9015135ff129a3dcfbe300e276d143431cae0c8438ea9c864fc7c866c841978a WHIRLPOOL 4fe6afe4a0659735101884d8ed4039ff91b4b04a118947eefad11b568d494ac0e42464241b4bc16b8064e90bbd738d56776f739eb67a4f50ed77b022f2c86e28
-MISC ChangeLog 19700 SHA256 a96b38e309fa0d6210fcb4e7d33a1fdbb3085185082c64cbe9161a6e05ba3cab SHA512 34aa92caeea4c8b18861d9812593e12c31ced4abc03da020a8c46768a88f1ab334e3b19efa9936b9b648000e25c8e92b11e3cbb898a8279751c07a26cd7653c8 WHIRLPOOL 0f4297bf945cc60e9e1286a8acfcc6be2b452da14f894ca6e3f742e70967648f1b673e97783c31bc7dfa5318145c88b374da48dc6a92b7fd90671f5939fc424f
+EBUILD filezilla-3.7.4.ebuild 1720 SHA256 f63908c87aef1e77904f401438f782b9a459d3e26466e9e830819ba7c7d5e4fc SHA512 c893d10262adf1f704b92c4a3a0f9452215a8b94c69a113e6ea00cec15936632404b9b68612883ba88b3bcc2c9263ea10aca6be5bdee9f3f32e98dbac8eebae5 WHIRLPOOL c0e0c8a67d0865b85504ec3cea43c6116aeef9756bfb3f8c6cdf6be67d254e9e5865e534919dfc8628836e21d5d60382560f3a678d2076382e30f1c332385ecc
+MISC ChangeLog 19888 SHA256 704948205f42ff4abc5231ba6b47c2e3715f0cc5cddf4f9252d9906be98ad1c3 SHA512 578361800c01da9a686982c782571664b427ac7c805b2bb582e3a458d9fdf89718114f57911e5c27a83dbdae62cc1c100a8c544a102a35ff2858fd18ac7bfe9e WHIRLPOOL e7f02e08705d3c4001c64554cf442ca88c48376f09870cbe09b367413f4083eb91e8e8411fc019b5fcef7335ebf1b9262bb8c00a55b3886655300a621a7b4109
 MISC metadata.xml 358 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b SHA512 8008462bcccc0b22ea71170427d3318b3f403ad324bd3d2207b35b2344a5822b2b1c82c7cb379b99a08707853477a0887c65684c0b5de93b6782ae863569c373 WHIRLPOOL 5dac2fceebc89a40318fbc2ef5c3501c7726228afe431b455d6e6d485b9f3d51f2f8496abe91d2364733b82372a68e678d23e319ba7986830448ce7bd3e9cbbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (SunOS)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlI9xvAACgkQX3X2B8XHTomvzQCePnhgC0OpqR3S0qB9ef/a4AGz
-yM0AoJz+QT3AWm4+Kv8sLVZ7n6XUEjiD
-=OUXj
+iF4EAREIAAYFAlL4GCIACgkQFYEBGcdFJfIr8wD/f8oBbYlhRlnyHgbrMEAEJ7YW
+44P2/86tAu5VE15S2uoA/iMPPSemiAwr1RXlaHJePmL0N7hlDt0baZ/MElI7Lo+n
+=89bG
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch b/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch
new file mode 100644
index 000000000000..3f4a4dbc4e28
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2014-02-10 00:55:32.716237174 +0100
++++ configure.ac	2014-02-10 00:58:37.390508206 +0100
+@@ -44,8 +44,8 @@
+ if ! test "$localesonly" = "yes"; then
+ 
+   if test "X$GCC" = Xyes; then
+-    CFLAGS="$CFLAGS -Wall -g -fexceptions"
+-    CXXFLAGS="$CXXFLAGS -Wall -g -fexceptions"
++    CFLAGS="$CFLAGS -Wall -fexceptions"
++    CXXFLAGS="$CXXFLAGS -Wall -fexceptions"
+   fi
+ 
+   CHECK_CXX0X
diff --git a/net-ftp/filezilla/filezilla-3.7.4.ebuild b/net-ftp/filezilla/filezilla-3.7.4.ebuild
new file mode 100644
index 000000000000..854b3c000676
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.7.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.7.4.ebuild,v 1.1 2014/02/10 00:06:52 voyageur Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+
+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-admin/eselect-wxwidgets-0.7-r1
+	>=dev-db/sqlite-3.7
+	>=dev-libs/tinyxml-2.6.1-r1[stl]
+	net-dns/libidn
+	>=net-libs/gnutls-2.8.3
+	aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] )
+	!aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[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}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.7.4-debug.patch
+	append-cppflags -DTIXML_USE_STL
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=system \
+		--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
+}