Prepare for system tinxyml in -r1, use builtin version in the meantime, bug #314669

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

8 files changed, 28 insertions, 68 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index ee1c80bab435..3ae5c8d36eca 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.64 2010/03/22 14:26:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.65 2010/04/12 15:32:44 voyageur Exp $
+
+*filezilla-3.3.2.1-r1 (12 Apr 2010)
+
+  12 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -filezilla-3.2.4.1-r1.ebuild, -filezilla-3.3.0.ebuild,
+  filezilla-3.3.0.1.ebuild, filezilla-3.3.1.ebuild, filezilla-3.3.2.ebuild,
+  filezilla-3.3.2.1.ebuild, +filezilla-3.3.2.1-r1.ebuild:
+  Prepare for system tinxyml in -r1, use builtin version in the meantime,
+  bug #314669
 
 *filezilla-3.3.2.1 (22 Mar 2010)
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index b18c4a646a04..fbd184fbd69c 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,15 +1,12 @@
 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.3.0.1_src.tar.bz2 3113486 RMD160 1bfbc885773229c4c72ad8c82001fadd555b9b3d SHA1 51ecb7c79c53466595c5691945ad83b49415f1b4 SHA256 67abea4b429e759eabafc510d342e04d9da0bfd18ab52c5d8d5e58523b023caa
-DIST FileZilla_3.3.0_src.tar.bz2 3110131 RMD160 26dff24af2261c282dc6964b5614e88615d6fe04 SHA1 d2263367dd823513e231fda265bd5f4a7cea4bbc SHA256 a72022c55f6dbe5d98d9b4cbc21240998d7ebd662f16dd6396c988fcf552b6f1
 DIST FileZilla_3.3.1_src.tar.bz2 3129864 RMD160 72ade8ebc1d8e26b21900814aa168e834d3b9155 SHA1 aa0c42e0fed93e7068376b63213ff7c164fd078e SHA256 2c4e8e37c63517404967efd2740d5ebeff6dae1c52b29a31a209766a90204178
 DIST FileZilla_3.3.2.1_src.tar.bz2 3164447 RMD160 09cdc5e67181e5f04d17400d162734fa379b459b SHA1 a4a17497ea0515b781593c03c2f3da58cb02fbf4 SHA256 04768d0bb300562d30a3a7c0e8ec461dd8307c7830daa86fc68a527f0590577e
 DIST FileZilla_3.3.2_src.tar.bz2 3186595 RMD160 5d74132747aa6345ab8bc19aff06cf034412c597 SHA1 80c5357eea6ec9ce74d9e85789680eb289abc354 SHA256 e25758cf0523f9d09df0522a666f108bd415356abf0137877c42d6c5470b2afe
-EBUILD filezilla-3.2.4.1-r1.ebuild 1243 RMD160 426331111828698470abf28b17240160ae04c457 SHA1 95d9bbcc6b8265611819fb73ac9a3246378d550c SHA256 5900e28d500c4073a815cc6654b07209aaf58cb9bbecd55701de899e8a7719e0
-EBUILD filezilla-3.3.0.1.ebuild 1195 RMD160 bbc9568f7c4667ee6b0787209916408d01af4db7 SHA1 1b56fec272595db0501d2fdbfb3d68ccaf26ef6a SHA256 4a3b84db2c5e22237097283b6a8ef9d2e2eca917e1e6dd7a9736db2650a75c5c
-EBUILD filezilla-3.3.0.ebuild 1198 RMD160 0d484ee8685ee2269bfda2ef5a320c8dd948396d SHA1 c398ee1039c394aa3142304654789bdf7c2b19fd SHA256 f5c11c4afd6d3826284ed7c6ea40abc4ddeec98c07f9a3485726fa899ab2fb99
-EBUILD filezilla-3.3.1.ebuild 1198 RMD160 b0cea76341ad75408a13f8b8601286d230278a1b SHA1 baefd069fa1017bf2d5c9dbd11fa37c69daf4606 SHA256 d9964a32e72d184731898700d1932a2817086cf97555b37a454c4bff84111959
-EBUILD filezilla-3.3.2.1.ebuild 1200 RMD160 ff843d3fe302e6578c8e1d918d91c39704665021 SHA1 704aacea853f2260bc505c59ac5cce9193ed0986 SHA256 21f9f046d165021063958740e4c5a93914cc3bdd7f77f37088de111e5a48cc9d
-EBUILD filezilla-3.3.2.ebuild 1198 RMD160 e35e777cf569bee40a597227478d41ddef635689 SHA1 58472d583621486144336b94acf13af7e4f37222 SHA256 5c22c9f17b3bd75694197c908499e5a2d3d52ff60a10db0dc2c4379c78cd5112
-MISC ChangeLog 11565 RMD160 86b412179f5b2a7ab44cdd660483c50f2d874cab SHA1 475c17ec058960636cf11db28ddf80cb75dde8f9 SHA256 cad77922500b19c78e0284218597747d7044f3f7c4dc6f4a2071005fb8d59964
+EBUILD filezilla-3.3.0.1.ebuild 1223 RMD160 fe0b2655b11f6721e095155b4866c2cd3d0d232c SHA1 9d5de11f5851d20f3713624e18ef9d059588dbe6 SHA256 aa326c5809227dea3fbaaea6d79686051c32abc3910e0a6fa99b84575e04973e
+EBUILD filezilla-3.3.1.ebuild 1225 RMD160 4459bc9c4914b24e22001154becb86c6046750e5 SHA1 053e3b070e3f9bd5ca40ab80cb1d2d89f5e45927 SHA256 77e8473fd1d2c22952aa8e986c5e42bbd15b122699a3083d84a0ada3312eac8e
+EBUILD filezilla-3.3.2.1-r1.ebuild 1253 RMD160 2fad743a1d30ce9957b427972400846387fe410b SHA1 8446fe82e037c96c43064d55f38504680ce250c9 SHA256 232cb34bb3b6074cc7ccf6d6a17d5cab4e047045da206dde47e34bc6a76ce887
+EBUILD filezilla-3.3.2.1.ebuild 1227 RMD160 a06a6fbe59e0a455cbef33186beb29bb09e88330 SHA1 271abcdcca7b7be95562948390315f3fc343bf25 SHA256 cbdde76c9248eff7caa60455301c45ca1674849d618f5f7f08b38004f74842b0
+EBUILD filezilla-3.3.2.ebuild 1225 RMD160 6f3802cdc6e922deed5af7af5114740ecca35bfc SHA1 561713dd29ba194ca4d021b9603e9c33fa20db0d SHA256 3666d6b957de331b201065fcdf0895395c22cedff737d5a64e1340358a95b423
+MISC ChangeLog 11937 RMD160 69e043dd91aee0b631c15b487bd8926cf94094f0 SHA1 2f924439ad84b83ce0d50443714be81cfdf8d46e SHA256 5f002a551649b3b9ce858dca4e14c7a32db4a27117234d6912ac6c129b24350f
 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
deleted file mode 100644
index a093467b4015..000000000000
--- a/net-ftp/filezilla/filezilla-3.2.4.1-r1.ebuild
+++ /dev/null
@@ -1,52 +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.4.1-r1.ebuild,v 1.6 2009/08/24 09:18:02 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=">=app-admin/eselect-wxwidgets-0.7-r1
-	net-dns/libidn
-	>=net-libs/gnutls-2.0.4
-	>=x11-libs/wxGTK-2.8.9
-	dbus? ( sys-apps/dbus )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4
-	>=sys-devel/gettext-0.11
-	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
-}
diff --git a/net-ftp/filezilla/filezilla-3.3.0.1.ebuild b/net-ftp/filezilla/filezilla-3.3.0.1.ebuild
index 54c482d37236..5aaa2bfa35e2 100644
--- a/net-ftp/filezilla/filezilla-3.3.0.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.3.0.1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.1.ebuild,v 1.5 2010/01/30 18:18:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.0.1.ebuild,v 1.6 2010/04/12 15:32:44 voyageur Exp $
 
 EAPI=2
 
@@ -35,6 +35,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_configure() {
 	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=builtin \
 		--disable-autoupdatecheck || die "econf failed"
 }
 
diff --git a/net-ftp/filezilla/filezilla-3.3.1.ebuild b/net-ftp/filezilla/filezilla-3.3.1.ebuild
index b4a1d7603711..e00df18fc734 100644
--- a/net-ftp/filezilla/filezilla-3.3.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2010/01/05 10:04:56 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.1.ebuild,v 1.2 2010/04/12 15:32:44 voyageur Exp $
 
 EAPI=2
 
@@ -35,6 +35,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_configure() {
 	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=builtin \
 		--disable-autoupdatecheck || die "econf failed"
 }
 
diff --git a/net-ftp/filezilla/filezilla-3.3.0.ebuild b/net-ftp/filezilla/filezilla-3.3.2.1-r1.ebuild
index 00562232ef08..12c78d82b6cc 100644
--- a/net-ftp/filezilla/filezilla-3.3.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2009/11/09 15:57:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.2.1-r1.ebuild,v 1.1 2010/04/12 15:32:44 voyageur Exp $
 
 EAPI=2
 
@@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="dbus nls test"
 
 RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
+	dev-libs/tinyxml[-stl]
 	net-dns/libidn
 	>=net-libs/gnutls-2.8.3
 	>=x11-libs/wxGTK-2.8.9
@@ -35,6 +36,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_configure() {
 	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=system \
 		--disable-autoupdatecheck || die "econf failed"
 }
 
diff --git a/net-ftp/filezilla/filezilla-3.3.2.1.ebuild b/net-ftp/filezilla/filezilla-3.3.2.1.ebuild
index ce5caf3cd90d..603a73a4753b 100644
--- a/net-ftp/filezilla/filezilla-3.3.2.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.3.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.1 2010/03/22 14:26:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.2.1.ebuild,v 1.2 2010/04/12 15:32:44 voyageur Exp $
 
 EAPI=2
 
@@ -35,6 +35,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_configure() {
 	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=builtin \
 		--disable-autoupdatecheck || die "econf failed"
 }
 
diff --git a/net-ftp/filezilla/filezilla-3.3.2.ebuild b/net-ftp/filezilla/filezilla-3.3.2.ebuild
index c41049ff7a02..72267096f4f9 100644
--- a/net-ftp/filezilla/filezilla-3.3.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2010/02/21 19:19:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.2.ebuild,v 1.2 2010/04/12 15:32:44 voyageur Exp $
 
 EAPI=2
 
@@ -35,6 +35,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_configure() {
 	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=builtin \
 		--disable-autoupdatecheck || die "econf failed"
 }