Revision bump for >=net-libs/gnutls-2.7 support, switch to EAPI 2, closes bug #268583

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

4 files changed, 72 insertions, 2 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 1b6dd9e1e8b3..476ad03706a1 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,13 @@
 # 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.42 2009/05/04 12:03:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.43 2009/05/07 14:11:18 voyageur Exp $
+
+*filezilla-3.2.4.1-r1 (07 May 2009)
+
+  07 May 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +filezilla-3.2.4.1-r1.ebuild, +files/filezilla-3.2.4.1-gnutls-2.7.patch:
+  Revision bump for >=net-libs/gnutls-2.7 support, switch to EAPI 2, closes
+  bug #268583
 
   04 May 2009; Bernard Cafarelli <voyageur@gentoo.org>
   -filezilla-3.1.3.1.ebuild, -filezilla-3.1.4.1.ebuild,
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 890660d9782c..eb894b0757fc 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,3 +1,4 @@
+AUX filezilla-3.2.4.1-gnutls-2.7.patch 390 RMD160 b96355a4048627b24556fd00032cb8da2c3c3286 SHA1 32d2986c03fc6b22fe96494f764b1ad53dc11c91 SHA256 fcf9431e82f892107e04490a858d2f178135e9e84f60f3698fe59fd811329ae4
 DIST FileZilla_3.2.0_src.tar.bz2 2789823 RMD160 932c53fba17092881cbbc5015cf36bdba8d18147 SHA1 ca8a358eb13c6b14fbff57fb87226e79131553aa SHA256 26ac3dc2cf1792373de76b11ced1eacd83786999fc3516af6c6d7e3339c44fdc
 DIST FileZilla_3.2.2.1_src.tar.bz2 2878230 RMD160 43dc4475b5f6e27844fa6744cc022f0a464566be SHA1 6e14c2ded0dc103678d9399171e3ed9c515debce SHA256 af916c6f99cd76d9da6f2a0237e0579fe51cde013a16f2a4cb66b6b7da56a7f9
 DIST FileZilla_3.2.3.1_src.tar.bz2 2912030 RMD160 f4342adc8930117c93416ab758f2e39e07262899 SHA1 7638645a5ea262d11a1bc32ffba0b71151aefd54 SHA256 9f969602ea8446c3ccde9dfad69b02b572d12c875a3cf5893674ded16820349b
@@ -5,6 +6,7 @@ DIST FileZilla_3.2.4.1_src.tar.bz2 2912306 RMD160 f2dd07469a47e8e95f637c8405611f
 EBUILD filezilla-3.2.0.ebuild 1092 RMD160 46db1fa0f3c606722fd6e91159708f18f085c2b8 SHA1 5ce50289adbbcc0c9f622c1b9760fd0f2f6bb128 SHA256 40e0fc8dc23015350cf67c987b6873d6429ca88230348ec9dc1ad6702ddb5753
 EBUILD filezilla-3.2.2.1.ebuild 1156 RMD160 339d6bbda5e0e440ad4422873d4e6a14a1056223 SHA1 538ceb32c8e1d17a39cd64a0e5db8b6a5b6d4864 SHA256 4d037becc967f95141bc45cee8e8f1d35c5cf72497a082f467a0add2dc6999c7
 EBUILD filezilla-3.2.3.1.ebuild 1156 RMD160 a0e757c5f2f024ace5b9890b8d026bb90d3cbd4e SHA1 7f5eb558627d3813a063d7d83b71a3f08a2766db SHA256 069361dde577fa58485fdf7e0fadb6dbd1cd9c8b984fa96134863c54c5c79c9b
+EBUILD filezilla-3.2.4.1-r1.ebuild 1226 RMD160 4e7edc4a4271eecb6087bc9860a3853ee41db69b SHA1 6cdf5d1bcb71ceef86d7ad50045a6f36b1001a7f SHA256 ece379a2da2eb7fc547d315a77841b6bf9a940d8a460b4952b250465b7cb1d00
 EBUILD filezilla-3.2.4.1.ebuild 1156 RMD160 96f03da68f55e8ca469fed7f46661c021b8845f3 SHA1 410f4bb15b53197243bf4c13e7cef0954b3b0d5c SHA256 a88fc5d900bd427bdc05662d17ad0c5a3b6299e0c78b25d7785938ddf11b8b13
-MISC ChangeLog 7522 RMD160 0216e114ec2a5bf347087a5e43f32c6a3399c113 SHA1 d4d383b7278ccae7ac2428e658f7bd44fe01e30e SHA256 22e48a8bd2d951a460ccc1181066d249a18e733c56404e1802b4e1e26709557b
+MISC ChangeLog 7780 RMD160 35999a1c4f2fd377ad4002c3366da20c573749c4 SHA1 29095410f0a5d0f1f7828172aa76f09decb66253 SHA256 6189d701611fc8c97c00c80393f72f98c332ffd8ef42986ba7ea8cafcba5669c
 MISC metadata.xml 358 RMD160 847093b8297b203ca89664d66e195f763d50e751 SHA1 a61011a0ee29bdb9a156e297a414bc2902598156 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b
diff --git a/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch b/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch
new file mode 100644
index 000000000000..7e9dbfa260b5
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2009-05-07 15:27:48.000000000 +0200
++++ configure.in	2009-05-07 15:33:53.000000000 +0200
+@@ -319,7 +319,7 @@
+   # GnuTLS
+   # ------
+ 
+-  AM_PATH_LIBGNUTLS(2.0.4,, AC_MSG_ERROR([[
++  PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 2.0.4,, AC_MSG_ERROR([[
+ ***
+ *** libgnutls 2.0.4 or greater was not found. You may want to get it from
+ *** ftp://ftp.gnutls.org/pub/gnutls/]]))
diff --git a/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild b/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild
new file mode 100644
index 000000000000..4fdad7b47a45
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild
@@ -0,0 +1,50 @@
+# 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.1 2009/05/07 14:11:18 voyageur Exp $
+
+EAPI=2
+
+WX_GTK_VER="2.8"
+
+inherit autotools 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 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
+	>=sys-devel/gettext-0.11
+	>=net-libs/gnutls-2.0.4
+	test? ( dev-util/cppunit )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gnutls-2.7.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) --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
+}