Bump to fix a crash in new filters in 3.2.7. Also fix dependencies for gnutls, bug #282403

Package-Manager: portage-2.2_rc39/cvs/Linux x86_64

6 files changed, 32 insertions, 66 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 4a442a45676e..69598276b070 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.52 2009/08/20 09:55:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.53 2009/08/24 09:18:02 voyageur Exp $
+
+*filezilla-3.2.7.1 (24 Aug 2009)
+
+  24 Aug 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  filezilla-3.2.4.1-r1.ebuild, -filezilla-3.2.5.ebuild,
+  filezilla-3.2.6.1.ebuild, -filezilla-3.2.7.ebuild,
+  +filezilla-3.2.7.1.ebuild:
+  Bump to fix a crash in new filters in 3.2.7. Also fix dependencies for
+  gnutls, bug #282403
 
 *filezilla-3.2.7 (20 Aug 2009)
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 91f10fea8766..3219fb853b32 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,11 +1,9 @@
 AUX filezilla-3.2.4.1-gnutls-2.7.patch 390 RMD160 b96355a4048627b24556fd00032cb8da2c3c3286 SHA1 32d2986c03fc6b22fe96494f764b1ad53dc11c91 SHA256 fcf9431e82f892107e04490a858d2f178135e9e84f60f3698fe59fd811329ae4
 DIST FileZilla_3.2.4.1_src.tar.bz2 2912306 RMD160 f2dd07469a47e8e95f637c8405611f31078a861e SHA1 8435b905d6455175344fc47c957270788073e40b SHA256 bad112d3a63d08f179a87c75ae5be0a9c48e87a1fd5b22528cab29153f18ebc5
-DIST FileZilla_3.2.5_src.tar.bz2 2981396 RMD160 02021821bd04a546fc3e7d9f4033c32976adf7f2 SHA1 1ad41c660fd22050ba63a7a3f24302c8d4c9f9bc SHA256 533314a5d347ad5ca562c9676011d22d018d4cfa986b8c91d90c3f70279d2165
 DIST FileZilla_3.2.6.1_src.tar.bz2 3003048 RMD160 04b9aedf1b4cd2ab4f6e6fca4030814ee90da1cb SHA1 8ba53b3df645a29216582a8bdb36f34ea3683e55 SHA256 9c3b0441111c12a46b642997557084b992f6ef7f4470dacbb258fcc4c46bbe22
-DIST FileZilla_3.2.7_src.tar.bz2 3064605 RMD160 edbe3eda3f14201b542e5c265200a329ef837013 SHA1 0e40c49c96afab6e3f644afb95947c14ba1428fe SHA256 799330fb2bcb941c15dc03209743c36d246a0a67c41b13f6e424e03a7dde60fc
-EBUILD filezilla-3.2.4.1-r1.ebuild 1220 RMD160 cfa411f16856ac6bd87c134ce429def46e571cf6 SHA1 7a71c337f6886acc1aa8685f3bfd652f92d63d95 SHA256 db54e5a5ed2ee45df4e14fd7c169344c9f75b0374c99f6a152ab9418dc44bcae
-EBUILD filezilla-3.2.5.ebuild 1178 RMD160 dfd6f6ac72d2f25fae30c4fe0bbb17fb2b889c1a SHA1 c2749487bf3f3b96804e3c7e6d7c9c39859e9f01 SHA256 bb95277b621cca12e69fa400d1e2f9cae6a30696e6cd67ae38073426a5d24724
-EBUILD filezilla-3.2.6.1.ebuild 1180 RMD160 500b29b22bc9821811b8f52413f15e0474ca2afb SHA1 320076425f51cb2ed6894341a57359f4551a19da SHA256 369d110958d31ce56e2c97ef5e446fa848225d08876da14d7ef34eae8cddf279
-EBUILD filezilla-3.2.7.ebuild 1178 RMD160 7f84c50e1db370f4c79a975d980a202372dec899 SHA1 eead37840cb657ad84fc5d2693aa7eba9956b1d0 SHA256 da5be07d1e13cbd017e2646264387677a6dd0757c26d8ca8dff4fb01e6dcf669
-MISC ChangeLog 9503 RMD160 a560dcb0a316f93d581a601d3c49cb49f6c8ef6a SHA1 cc85ef72bab3e5fb02cfb81a6cbd11982f823c91 SHA256 506486a06da770f521902817aad6af50bbb496438129175b8e42e9b6090d85e1
+DIST FileZilla_3.2.7.1_src.tar.bz2 3063251 RMD160 f5e0e878eb68d411c4edd95e007edbf5cfc81b28 SHA1 8e1c2c1488ef320ccb5643bc9c74d95afe6d4187 SHA256 e8ec7d2dfddbb08c93e635914843b64f908eb5b8b76b1380c6f48a06ede47c92
+EBUILD filezilla-3.2.4.1-r1.ebuild 1243 RMD160 426331111828698470abf28b17240160ae04c457 SHA1 95d9bbcc6b8265611819fb73ac9a3246378d550c SHA256 5900e28d500c4073a815cc6654b07209aaf58cb9bbecd55701de899e8a7719e0
+EBUILD filezilla-3.2.6.1.ebuild 1201 RMD160 cf78e0b3ad1e7e06ec7af799057d8ff12a1f8b00 SHA1 b531cd066ddb4ff54090057309bb5137e5e1a6bc SHA256 48960472bd99ec6c7e7eeb28f4cec02021d2ba2504312f4b0fcb06cd9382efc1
+EBUILD filezilla-3.2.7.1.ebuild 1200 RMD160 1e8dd58816cb798748933079578ac57929974c2e SHA1 e8789382a3084b2955f0523cbedf02314ab9331c SHA256 73dffe5bebc6afa6b6185c9459b22fa9446c21cd76bd94753abf371db8df1159
+MISC ChangeLog 9826 RMD160 7cf2dcfb5755a7ad6324a62017ec57d281bc835a SHA1 ad4d7e9fdcbd46c98a29c707b1bd3b6263e251e4 SHA256 b8397b1949746013c5ef32073b7be0181f4ba18e5bb9791c176de85196d88567
 MISC metadata.xml 358 RMD160 847093b8297b203ca89664d66e195f763d50e751 SHA1 a61011a0ee29bdb9a156e297a414bc2902598156 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b
diff --git a/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild b/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild
index 85deb84bb7ac..a093467b4015 100644
--- a/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild,v 1.5 2009/08/01 16:56:34 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild,v 1.6 2009/08/24 09:18:02 voyageur Exp $
 
 EAPI=2
 
@@ -20,14 +20,16 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="dbus test"
 
-RDEPEND="net-dns/libidn
+RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
+	net-dns/libidn
+	>=net-libs/gnutls-2.0.4
 	>=x11-libs/wxGTK-2.8.9
-	>=app-admin/eselect-wxwidgets-0.7-r1
 	dbus? ( sys-apps/dbus )"
+
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	>=sys-devel/libtool-1.4
 	>=sys-devel/gettext-0.11
-	>=net-libs/gnutls-2.0.4
 	test? ( dev-util/cppunit )"
 
 S="${WORKDIR}"/${PN}-${MY_PV}
diff --git a/net-ftp/filezilla/filezilla-3.2.5.ebuild b/net-ftp/filezilla/filezilla-3.2.5.ebuild
deleted file mode 100644
index d0c3c67ac65a..000000000000
--- a/net-ftp/filezilla/filezilla-3.2.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.5.ebuild,v 1.2 2009/06/24 14:30:32 voyageur Exp $
-
-EAPI=2
-
-WX_GTK_VER="2.8"
-
-inherit eutils 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 ~ia64 ~ppc ~sparc ~x86"
-IUSE="dbus nls test"
-
-RDEPEND="net-dns/libidn
-	>=x11-libs/wxGTK-2.8.9
-	>=app-admin/eselect-wxwidgets-0.7-r1
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4
-	>=net-libs/gnutls-2.0.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--disable-autoupdatecheck || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	doicon src/interface/resources/48x48/${PN}.png || die "doicon failed"
-
-	dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/net-ftp/filezilla/filezilla-3.2.6.1.ebuild b/net-ftp/filezilla/filezilla-3.2.6.1.ebuild
index c253ce458b2a..59cef5a3c355 100644
--- a/net-ftp/filezilla/filezilla-3.2.6.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.6.1.ebuild,v 1.1 2009/07/02 14:54:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.6.1.ebuild,v 1.2 2009/08/24 09:18:02 voyageur Exp $
 
 EAPI=2
 
@@ -20,13 +20,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="dbus nls test"
 
-RDEPEND="net-dns/libidn
+RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
+	net-dns/libidn
+	>=net-libs/gnutls-2.0.4
 	>=x11-libs/wxGTK-2.8.9
-	>=app-admin/eselect-wxwidgets-0.7-r1
 	dbus? ( sys-apps/dbus )"
+
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	>=sys-devel/libtool-1.4
-	>=net-libs/gnutls-2.0.4
 	nls? ( >=sys-devel/gettext-0.11 )
 	test? ( dev-util/cppunit )"
 
diff --git a/net-ftp/filezilla/filezilla-3.2.7.ebuild b/net-ftp/filezilla/filezilla-3.2.7.1.ebuild
index d862ab0d9012..a7c5226e1637 100644
--- a/net-ftp/filezilla/filezilla-3.2.7.ebuild
+++ b/net-ftp/filezilla/filezilla-3.2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.7.ebuild,v 1.1 2009/08/20 09:55:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.7.1.ebuild,v 1.1 2009/08/24 09:18:02 voyageur Exp $
 
 EAPI=2
 
@@ -20,13 +20,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="dbus nls test"
 
-RDEPEND="net-dns/libidn
+RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
+	net-dns/libidn
+	>=net-libs/gnutls-2.8.3
 	>=x11-libs/wxGTK-2.8.9
-	>=app-admin/eselect-wxwidgets-0.7-r1
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	>=sys-devel/libtool-1.4
-	>=net-libs/gnutls-2.8.3
 	nls? ( >=sys-devel/gettext-0.11 )
 	test? ( dev-util/cppunit )"