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

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

7 files changed, 22 insertions, 59 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/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"
 }