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

(Portage version: 2.2_rc39/cvs/Linux x86_64)

5 files changed, 27 insertions, 59 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/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 )"