Version bump, switch to system tinyxml, drop some versions

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

5 files changed, 18 insertions, 106 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index cfb8df8c2ed8..2ec2ab4fe1e3 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.75 2011/02/28 20:21:39 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.76 2011/03/28 09:59:27 voyageur Exp $
+
+*filezilla-3.4.0 (28 Mar 2011)
+
+  28 Mar 2011; Bernard Cafarelli <voyageur@gentoo.org> -filezilla-3.3.3.ebuild,
+  -filezilla-3.3.3-r1.ebuild, -filezilla-3.3.5.ebuild, +filezilla-3.4.0.ebuild:
+  Version bump, switch to system tinyxml, drop some versions
 
   28 Feb 2011; Sebastian Pipping <sping@gentoo.org> filezilla-3.3.5.1.ebuild,
   +files/filezilla-3.3.5.1-debug.patch:
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 6e69cb7b9d18..4a9911d03c13 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,14 +1,11 @@
 AUX filezilla-3.3.5.1-debug.patch 423 RMD160 52f27e41a509e27bb0d12e45c7dfe0be27980307 SHA1 4e567a5f431b3565c3d966a3d2b7a1a44d9b0bda SHA256 6093c67c850f33d23ed278b601e269f08f38cba0b49090f4b0ad58ddbc961e2e
 DIST FileZilla_3.3.0.1_src.tar.bz2 3113486 RMD160 1bfbc885773229c4c72ad8c82001fadd555b9b3d SHA1 51ecb7c79c53466595c5691945ad83b49415f1b4 SHA256 67abea4b429e759eabafc510d342e04d9da0bfd18ab52c5d8d5e58523b023caa
-DIST FileZilla_3.3.3_src.tar.bz2 3212044 RMD160 a2f5eada36253ef0d236c53c4101109ec13179ac SHA1 25b7ef7e48c7489e99b6b1b26bd3d7d56332bf4b SHA256 61f75564d04571573610406382733dcec2925b88d42a7a0b4e69a206fa482857
 DIST FileZilla_3.3.4.1_src.tar.bz2 3231505 RMD160 d863f90f8944a66c7d316470cd2affaec1e6b930 SHA1 0b6ce2b46480dc64d959dced54dcc1eaaa08e82a SHA256 2843ab4c89743cfecc5418f9ede1d20147f30cb38e97b148657a7f81c2147185
 DIST FileZilla_3.3.5.1_src.tar.bz2 3313867 RMD160 4acde75284ac7717f1088ac67e42bf25acfd8912 SHA1 47d0004a85b0d19bf513d00128a7d1d7eea01e36 SHA256 2668af3cab5fd716db04ea09bf1972903e02cd2347f7b17de702e489a0e81fb0
-DIST FileZilla_3.3.5_src.tar.bz2 3314299 RMD160 f473ee1b3b6452a121a4d4486dba0759ffe8474c SHA1 14ad311ce1e2352fe4ddba8b5fe73bc079b1e297 SHA256 a9a5f77949d9d2a04e9d5b2b1169084ab629060bc5841604e1b6c893ee4efed1
+DIST FileZilla_3.4.0_src.tar.bz2 3323200 RMD160 387e3e94513102d7575b1b91497b2fca6bc414ca SHA1 09f3ba8bf62d43c31cfb59e263d8f06550a63828 SHA256 b09add065c8382228722a943e30503748ee9466e4becccd9f4d9738962e127fc
 EBUILD filezilla-3.3.0.1.ebuild 1230 RMD160 168d65fdd758e17247ccdd507693d368422cdd3b SHA1 5d99aa99f904c6d95ba32cfc9fad2291a6609194 SHA256 0de412cbf6a685b3ec86e73f3e8b332a9f7f6f678ccda2a91d85a1da7bb13319
-EBUILD filezilla-3.3.3-r1.ebuild 1258 RMD160 b03a568a954599ef5796241b16911b33c448aa43 SHA1 f59249250424f2ec483e1906e2448e3942638f80 SHA256 862eac1de8a6ae1de29b0cc044ed57bcfc877448b593e27dabd82f3ea1f0bde4
-EBUILD filezilla-3.3.3.ebuild 1232 RMD160 32cbb604165468a7cf30b8abafebba0d526144d6 SHA1 eb73f6b9ebd0f6242ea35c9e8617d0b0b369fa1e SHA256 d9fb8891257c02c2afdf9606bca55c7284bfd96019788d064cf447092e55aa90
 EBUILD filezilla-3.3.4.1.ebuild 1230 RMD160 2567a39cec59add7469c3466dd0cfc2416c6ef49 SHA1 9e077f1ee6913af399bb21cfd63a23a9eb4e397c SHA256 92272167d385ec86aa657e389761ab9c9008019f43e94d3e21ff05149dc28628
 EBUILD filezilla-3.3.5.1.ebuild 1312 RMD160 ec4f775024fda7b1cc4282fff978d28e70f7f0fe SHA1 1fa6cea6f2d12af9273c61a9b85e20b248a4b84c SHA256 628d8bce4df303782a8311a77f8ce5a3aa5e5e0419f48b86ea9c8abb302f274a
-EBUILD filezilla-3.3.5.ebuild 1232 RMD160 e29efd1ffcdc87bd89db88594f4cb8dcfe4f7008 SHA1 217e368563daf89b63e62801213a9722a8f8ba44 SHA256 73bdfe0cb6209f12a547894bb22c908fc4713f049e273a18c53f5a3638213c79
-MISC ChangeLog 13836 RMD160 b708a144396bc2da3196af91c50596b050e61b71 SHA1 b61ea31b398add1ea154ccbd5afb607c258cec8b SHA256 65dbbef0108c88a67f328cd0020a8c3a72f1ea58aef843b9a410048dd5a7bdb0
+EBUILD filezilla-3.4.0.ebuild 1337 RMD160 b30d6b7e426ca5e40592f14617dc1d4318f4e0b8 SHA1 065671ad46dbbd328b2dbbd371c88e9e8323b23b SHA256 a0d5556f7c60c282eca400f33b7ed1df729618a8b45703f0520adcba069723c0
+MISC ChangeLog 14093 RMD160 b5183f40bf7f771445a797469ea92d57c7ec9794 SHA1 3b14397104b679a8173b3394a18be12f41e4d660 SHA256 fea6bf126beb906be3972f070f1280f8cd3df6d57fb11f69013a0c87642f2770
 MISC metadata.xml 358 RMD160 847093b8297b203ca89664d66e195f763d50e751 SHA1 a61011a0ee29bdb9a156e297a414bc2902598156 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b
diff --git a/net-ftp/filezilla/filezilla-3.3.3.ebuild b/net-ftp/filezilla/filezilla-3.3.3.ebuild
deleted file mode 100644
index a36708de3b09..000000000000
--- a/net-ftp/filezilla/filezilla-3.3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3.ebuild,v 1.3 2010/08/19 19:00:02 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=">=app-admin/eselect-wxwidgets-0.7-r1
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	>=x11-libs/wxGTK-2.8.9:2.8[X]
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.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) \
-		--with-tinyxml=builtin \
-		--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.3.5.ebuild b/net-ftp/filezilla/filezilla-3.3.5.ebuild
deleted file mode 100644
index 98697b4d3b5a..000000000000
--- a/net-ftp/filezilla/filezilla-3.3.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.5.ebuild,v 1.1 2010/11/15 10:31:58 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=">=app-admin/eselect-wxwidgets-0.7-r1
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	>=x11-libs/wxGTK-2.8.9:2.8[X]
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.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) \
-		--with-tinyxml=builtin \
-		--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.3.3-r1.ebuild b/net-ftp/filezilla/filezilla-3.4.0.ebuild
index f465bf6f6ecd..42de76c5e795 100644
--- a/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild,v 1.3 2010/08/19 19:00:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.4.0.ebuild,v 1.1 2011/03/28 09:59:27 voyageur Exp $
 
 EAPI=2
 
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="dbus nls test"
 
 RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
-	dev-libs/tinyxml[-stl]
+	>=dev-libs/tinyxml-2.6.1-r1[-stl]
 	net-dns/libidn
 	>=net-libs/gnutls-2.8.3
 	>=x11-libs/wxGTK-2.8.9:2.8[X]
@@ -34,6 +34,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${PN}-${MY_PV}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debug.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_with dbus) $(use_enable nls locales) \
 		--with-tinyxml=system \